[BACK]Return to udp_usrreq.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/udp_usrreq.c between version 1.183.6.2 and 1.184

version 1.183.6.2, 2012/04/05 21:33:44 version 1.184, 2011/12/19 11:59:57
Line 129  __KERNEL_RCSID(0, "$NetBSD$");
Line 129  __KERNEL_RCSID(0, "$NetBSD$");
 #endif  #endif
 #endif  /* FAST_IPSEC */  #endif  /* FAST_IPSEC */
   
   #ifdef KAME_IPSEC
   #include <netinet6/ipsec.h>
   #include <netinet6/ipsec_private.h>
   #include <netinet6/esp.h>
   #include <netkey/key.h>
   #endif /* KAME_IPSEC */
   
 #ifdef COMPAT_50  #ifdef COMPAT_50
 #include <compat/sys/socket.h>  #include <compat/sys/socket.h>
 #endif  #endif
Line 627  udp4_sendup(struct mbuf *m, int off /* o
Line 634  udp4_sendup(struct mbuf *m, int off /* o
                 return;                  return;
         }          }
   
 #if defined(FAST_IPSEC)  #if defined(KAME_IPSEC) || defined(FAST_IPSEC)
         /* check AH/ESP integrity. */          /* check AH/ESP integrity. */
         if (so != NULL && ipsec4_in_reject_so(m, so)) {          if (so != NULL && ipsec4_in_reject_so(m, so)) {
                 IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);                  IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);
Line 677  udp6_sendup(struct mbuf *m, int off /* o
Line 684  udp6_sendup(struct mbuf *m, int off /* o
                 return;                  return;
         in6p = sotoin6pcb(so);          in6p = sotoin6pcb(so);
   
 #if defined(FAST_IPSEC)  #if defined(KAME_IPSEC) || defined(FAST_IPSEC)
         /* check AH/ESP integrity. */          /* check AH/ESP integrity. */
         if (so != NULL && ipsec6_in_reject_so(m, so)) {          if (so != NULL && ipsec6_in_reject_so(m, so)) {
                 IPSEC6_STATINC(IPSEC_STAT_IN_POLVIO);                  IPSEC6_STATINC(IPSEC_STAT_IN_POLVIO);
Line 1604  udp4_espinudp(struct mbuf **mp, int off,
Line 1611  udp4_espinudp(struct mbuf **mp, int off,
         esp4_input(n, iphdrlen);          esp4_input(n, iphdrlen);
 #endif  #endif
   
         /* We handled it, it shouldn't be handled by UDP */          /* We handled it, it shoudln't be handled by UDP */
         return 1;          return 1;
 }  }
 #endif  #endif

Legend:
Removed from v.1.183.6.2  
changed lines
  Added in v.1.184

CVSweb <webmaster@jp.NetBSD.org>