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

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

Diff for /src/sys/netinet6/ip6_input.c between version 1.129.4.2 and 1.134

version 1.129.4.2, 2011/06/12 00:24:30 version 1.134, 2011/12/19 11:59:58
Line 85  __KERNEL_RCSID(0, "$NetBSD$");
Line 85  __KERNEL_RCSID(0, "$NetBSD$");
 #include <sys/syslog.h>  #include <sys/syslog.h>
 #include <sys/proc.h>  #include <sys/proc.h>
 #include <sys/sysctl.h>  #include <sys/sysctl.h>
   #include <sys/cprng.h>
   
 #include <net/if.h>  #include <net/if.h>
 #include <net/if_types.h>  #include <net/if_types.h>
Line 111  __KERNEL_RCSID(0, "$NetBSD$");
Line 112  __KERNEL_RCSID(0, "$NetBSD$");
 #include <netinet6/in6_ifattach.h>  #include <netinet6/in6_ifattach.h>
 #include <netinet6/nd6.h>  #include <netinet6/nd6.h>
   
 #ifdef IPSEC  #ifdef KAME_IPSEC
 #include <netinet6/ipsec.h>  #include <netinet6/ipsec.h>
 #include <netinet6/ipsec_private.h>  #include <netinet6/ipsec_private.h>
 #endif  #endif
Line 190  ip6_init(void)
Line 191  ip6_init(void)
         addrsel_policy_init();          addrsel_policy_init();
         nd6_init();          nd6_init();
         frag6_init();          frag6_init();
         ip6_desync_factor = arc4random() % MAX_TEMP_DESYNC_FACTOR;          ip6_desync_factor = cprng_fast32() % MAX_TEMP_DESYNC_FACTOR;
   
         ip6_init2((void *)0);          ip6_init2((void *)0);
 #ifdef GATEWAY  #ifdef GATEWAY
Line 278  ip6_input(struct mbuf *m)
Line 279  ip6_input(struct mbuf *m)
         int s, error;          int s, error;
 #endif  #endif
   
 #ifdef IPSEC  #ifdef KAME_IPSEC
         /*          /*
          * should the inner packet be considered authentic?           * should the inner packet be considered authentic?
          * see comment in ah4_input().           * see comment in ah4_input().
Line 350  ip6_input(struct mbuf *m)
Line 351  ip6_input(struct mbuf *m)
                 goto bad;                  goto bad;
         }          }
   
 #if defined(IPSEC)  #if defined(KAME_IPSEC)
         /* IPv6 fast forwarding is not compatible with IPsec. */          /* IPv6 fast forwarding is not compatible with IPsec. */
         m->m_flags &= ~M_CANFASTFWD;          m->m_flags &= ~M_CANFASTFWD;
 #else  #else
Line 373  ip6_input(struct mbuf *m)
Line 374  ip6_input(struct mbuf *m)
          * let ipfilter look at packet on the wire,           * let ipfilter look at packet on the wire,
          * not the decapsulated packet.           * not the decapsulated packet.
          */           */
 #ifdef IPSEC  #ifdef KAME_IPSEC
         if (!ipsec_getnhist(m))          if (!ipsec_getnhist(m))
 #elif defined(FAST_IPSEC)  #elif defined(FAST_IPSEC)
         if (!ipsec_indone(m))          if (!ipsec_indone(m))
Line 784  ip6_input(struct mbuf *m)
Line 785  ip6_input(struct mbuf *m)
                         }                          }
                 }                  }
   
 #ifdef IPSEC  #ifdef KAME_IPSEC
                 /*                  /*
                  * enforce IPsec policy checking if we are seeing last header.                   * enforce IPsec policy checking if we are seeing last header.
                  * note that we do not visit this with protocols with pcb layer                   * note that we do not visit this with protocols with pcb layer
Legend:
Removed from v.1.129.4.2  
changed lines
  Added in v.1.134
CVSweb <webmaster@jp.NetBSD.org>