[BACK]Return to raw_ip.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / netinet

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/netinet/raw_ip.c between version 1.114 and 1.114.2.2

version 1.114, 2012/03/22 20:34:39 version 1.114.2.2, 2013/06/23 06:20:25
Line 94  __KERNEL_RCSID(0, "$NetBSD$");
Line 94  __KERNEL_RCSID(0, "$NetBSD$");
 #include <netinet/in_proto.h>  #include <netinet/in_proto.h>
 #include <netinet/in_var.h>  #include <netinet/in_var.h>
   
 #ifdef FAST_IPSEC  #ifdef IPSEC
 #include <netipsec/ipsec.h>  #include <netipsec/ipsec.h>
 #include <netipsec/ipsec_var.h>  #include <netipsec/ipsec_var.h>
 #include <netipsec/ipsec_private.h>  #include <netipsec/ipsec_private.h>
 #endif  /* FAST_IPSEC */  #endif  /* IPSEC */
   
 #ifdef COMPAT_50  #ifdef COMPAT_50
 #include <compat/sys/socket.h>  #include <compat/sys/socket.h>
Line 203  rip_input(struct mbuf *m, ...)
Line 203  rip_input(struct mbuf *m, ...)
                         continue;                          continue;
                 if (last == NULL)                  if (last == NULL)
                         ;                          ;
 #if defined(FAST_IPSEC)  #if defined(IPSEC)
                 /* check AH/ESP integrity. */                  /* check AH/ESP integrity. */
                 else if (ipsec4_in_reject_so(m, last->inp_socket)) {                  else if (ipsec4_in_reject_so(m, last->inp_socket)) {
                         IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);                          IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);
Line 217  rip_input(struct mbuf *m, ...)
Line 217  rip_input(struct mbuf *m, ...)
                 }                  }
                 last = inp;                  last = inp;
         }          }
 #if defined(FAST_IPSEC)  #if defined(IPSEC)
         /* check AH/ESP integrity. */          /* check AH/ESP integrity. */
         if (last != NULL && ipsec4_in_reject_so(m, last->inp_socket)) {          if (last != NULL && ipsec4_in_reject_so(m, last->inp_socket)) {
                 m_freem(m);                  m_freem(m);
Line 478  rip_bind(struct inpcb *inp, struct mbuf 
Line 478  rip_bind(struct inpcb *inp, struct mbuf 
                 return (EINVAL);                  return (EINVAL);
         if (TAILQ_FIRST(&ifnet) == 0)          if (TAILQ_FIRST(&ifnet) == 0)
                 return (EADDRNOTAVAIL);                  return (EADDRNOTAVAIL);
         if (addr->sin_family != AF_INET &&          if (addr->sin_family != AF_INET)
             addr->sin_family != AF_IMPLINK)  
                 return (EAFNOSUPPORT);                  return (EAFNOSUPPORT);
         if (!in_nullhost(addr->sin_addr) &&          if (!in_nullhost(addr->sin_addr) &&
             ifa_ifwithaddr(sintosa(addr)) == 0)              ifa_ifwithaddr(sintosa(addr)) == 0)
Line 497  rip_connect(struct inpcb *inp, struct mb
Line 496  rip_connect(struct inpcb *inp, struct mb
                 return (EINVAL);                  return (EINVAL);
         if (TAILQ_FIRST(&ifnet) == 0)          if (TAILQ_FIRST(&ifnet) == 0)
                 return (EADDRNOTAVAIL);                  return (EADDRNOTAVAIL);
         if (addr->sin_family != AF_INET &&          if (addr->sin_family != AF_INET)
             addr->sin_family != AF_IMPLINK)  
                 return (EAFNOSUPPORT);                  return (EAFNOSUPPORT);
         inp->inp_faddr = addr->sin_addr;          inp->inp_faddr = addr->sin_addr;
         return (0);          return (0);

Legend:
Removed from v.1.114  
changed lines
  Added in v.1.114.2.2

CVSweb <webmaster@jp.NetBSD.org>