[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.189 and 1.190

version 1.189, 2013/06/05 00:48:32 version 1.190, 2013/06/05 19:01:26
Line 118  __KERNEL_RCSID(0, "$NetBSD$");
Line 118  __KERNEL_RCSID(0, "$NetBSD$");
 #include <net/if_faith.h>  #include <net/if_faith.h>
 #endif  #endif
   
 #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>
Line 126  __KERNEL_RCSID(0, "$NetBSD$");
Line 126  __KERNEL_RCSID(0, "$NetBSD$");
 #ifdef INET6  #ifdef INET6
 #include <netipsec/ipsec6.h>  #include <netipsec/ipsec6.h>
 #endif  #endif
 #endif  /* FAST_IPSEC */  #endif  /* IPSEC */
   
 #ifdef COMPAT_50  #ifdef COMPAT_50
 #include <compat/sys/socket.h>  #include <compat/sys/socket.h>
Line 148  struct inpcbtable udbtable;
Line 148  struct inpcbtable udbtable;
 percpu_t *udpstat_percpu;  percpu_t *udpstat_percpu;
   
 #ifdef INET  #ifdef INET
 #ifdef FAST_IPSEC  #ifdef IPSEC
 static int udp4_espinudp (struct mbuf **, int, struct sockaddr *,  static int udp4_espinudp (struct mbuf **, int, struct sockaddr *,
         struct socket *);          struct socket *);
 #endif  #endif
Line 634  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(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 684  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(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 812  udp4_realinput(struct sockaddr_in *src, 
Line 812  udp4_realinput(struct sockaddr_in *src, 
                                 return rcvcnt;                                  return rcvcnt;
                 }                  }
   
 #ifdef FAST_IPSEC  #ifdef IPSEC
                 /* Handle ESP over UDP */                  /* Handle ESP over UDP */
                 if (inp->inp_flags & INP_ESPINUDP_ALL) {                  if (inp->inp_flags & INP_ESPINUDP_ALL) {
                         struct sockaddr *sa = (struct sockaddr *)src;                          struct sockaddr *sa = (struct sockaddr *)src;
Line 1443  udp_statinc(u_int stat)
Line 1443  udp_statinc(u_int stat)
         UDP_STATINC(stat);          UDP_STATINC(stat);
 }  }
   
 #if defined(INET) && defined(FAST_IPSEC)  #if defined(INET) && defined(IPSEC)
 /*  /*
  * Returns:   * Returns:
  * 1 if the packet was processed   * 1 if the packet was processed
Line 1567  udp4_espinudp(struct mbuf **mp, int off,
Line 1567  udp4_espinudp(struct mbuf **mp, int off,
         ((u_int16_t *)(tag + 1))[1] = dport;          ((u_int16_t *)(tag + 1))[1] = dport;
         m_tag_prepend(m, tag);          m_tag_prepend(m, tag);
   
 #ifdef FAST_IPSEC  #ifdef IPSEC
         ipsec4_common_input(m, iphdrlen, IPPROTO_ESP);          ipsec4_common_input(m, iphdrlen, IPPROTO_ESP);
 #else  #else
         esp4_input(m, iphdrlen);          esp4_input(m, iphdrlen);

Legend:
Removed from v.1.189  
changed lines
  Added in v.1.190

CVSweb <webmaster@jp.NetBSD.org>