[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.133 and 1.133.2.1

version 1.133, 2011/11/19 22:51:29 version 1.133.2.1, 2012/02/18 07:35:42
Line 112  __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 161  percpu_t *ip6stat_percpu;
Line 161  percpu_t *ip6stat_percpu;
 static void ip6_init2(void *);  static void ip6_init2(void *);
 static struct m_tag *ip6_setdstifaddr(struct mbuf *, const struct in6_ifaddr *);  static struct m_tag *ip6_setdstifaddr(struct mbuf *, const struct in6_ifaddr *);
   
 static int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *);  static int ip6_process_hopopts(struct mbuf *, u_int8_t *, int, u_int32_t *,
           u_int32_t *);
 static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int);  static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int);
 static void sysctl_net_inet6_ip6_setup(struct sysctllog **);  static void sysctl_net_inet6_ip6_setup(struct sysctllog **);
   
Line 193  ip6_init(void)
Line 194  ip6_init(void)
         frag6_init();          frag6_init();
         ip6_desync_factor = cprng_fast32() % MAX_TEMP_DESYNC_FACTOR;          ip6_desync_factor = cprng_fast32() % MAX_TEMP_DESYNC_FACTOR;
   
         ip6_init2((void *)0);          ip6_init2(NULL);
 #ifdef GATEWAY  #ifdef GATEWAY
         ip6flow_init(ip6_hashsize);          ip6flow_init(ip6_hashsize);
 #endif  #endif
Line 279  ip6_input(struct mbuf *m)
Line 280  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 351  ip6_input(struct mbuf *m)
Line 352  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 374  ip6_input(struct mbuf *m)
Line 375  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 785  ip6_input(struct mbuf *m)
Line 786  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
Line 882  ip6_getdstifaddr(struct mbuf *m)
Line 883  ip6_getdstifaddr(struct mbuf *m)
  *   *
  * rtalertp - XXX: should be stored more smart way   * rtalertp - XXX: should be stored more smart way
  */   */
 static int  int
 ip6_hopopts_input(u_int32_t *plenp, u_int32_t *rtalertp,  ip6_hopopts_input(u_int32_t *plenp, u_int32_t *rtalertp,
         struct mbuf **mp, int *offp)          struct mbuf **mp, int *offp)
 {  {
Line 927  ip6_hopopts_input(u_int32_t *plenp, u_in
Line 928  ip6_hopopts_input(u_int32_t *plenp, u_in
  * (RFC2460 p7), opthead is pointer into data content in m, and opthead to   * (RFC2460 p7), opthead is pointer into data content in m, and opthead to
  * opthead + hbhlen is located in continuous memory region.   * opthead + hbhlen is located in continuous memory region.
  */   */
 int  static int
 ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen,  ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen,
         u_int32_t *rtalertp, u_int32_t *plenp)          u_int32_t *rtalertp, u_int32_t *plenp)
 {  {
Legend:
Removed from v.1.133  
changed lines
  Added in v.1.133.2.1
CVSweb <webmaster@jp.NetBSD.org>