[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.2.2 and 1.134

version 1.133.2.2, 2012/04/05 21:33:46 version 1.134, 2011/12/19 11:59:58
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 KAME_IPSEC
   #include <netinet6/ipsec.h>
   #include <netinet6/ipsec_private.h>
   #endif
   
 #ifdef FAST_IPSEC  #ifdef FAST_IPSEC
 #include <netipsec/ipsec.h>  #include <netipsec/ipsec.h>
 #include <netipsec/ipsec6.h>  #include <netipsec/ipsec6.h>
Line 156  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_process_hopopts(struct mbuf *, u_int8_t *, int, u_int32_t *,  static int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *);
         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 189  ip6_init(void)
Line 193  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(NULL);          ip6_init2((void *)0);
 #ifdef GATEWAY  #ifdef GATEWAY
         ip6flow_init(ip6_hashsize);          ip6flow_init(ip6_hashsize);
 #endif  #endif
Line 275  ip6_input(struct mbuf *m)
Line 279  ip6_input(struct mbuf *m)
         int s, error;          int s, error;
 #endif  #endif
   
   #ifdef KAME_IPSEC
           /*
            * should the inner packet be considered authentic?
            * see comment in ah4_input().
            */
           m->m_flags &= ~M_AUTHIPHDR;
           m->m_flags &= ~M_AUTHIPDGM;
   #endif
   
         /*          /*
          * make sure we don't have onion peering information into m_tag.           * make sure we don't have onion peering information into m_tag.
          */           */
Line 338  ip6_input(struct mbuf *m)
Line 351  ip6_input(struct mbuf *m)
                 goto bad;                  goto bad;
         }          }
   
   #if defined(KAME_IPSEC)
           /* IPv6 fast forwarding is not compatible with IPsec. */
           m->m_flags &= ~M_CANFASTFWD;
   #else
         /*          /*
          * Assume that we can create a fast-forward IP flow entry           * Assume that we can create a fast-forward IP flow entry
          * based on this packet.           * based on this packet.
          */           */
         m->m_flags |= M_CANFASTFWD;          m->m_flags |= M_CANFASTFWD;
   #endif
   
 #ifdef PFIL_HOOKS  #ifdef PFIL_HOOKS
         /*          /*
Line 356  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.
          */           */
 #if defined(FAST_IPSEC)  #ifdef KAME_IPSEC
           if (!ipsec_getnhist(m))
   #elif defined(FAST_IPSEC)
         if (!ipsec_indone(m))          if (!ipsec_indone(m))
 #else  #else
         if (1)          if (1)
Line 765  ip6_input(struct mbuf *m)
Line 785  ip6_input(struct mbuf *m)
                         }                          }
                 }                  }
   
   #ifdef KAME_IPSEC
                   /*
                    * enforce IPsec policy checking if we are seeing last header.
                    * note that we do not visit this with protocols with pcb layer
                    * code - like udp/tcp/raw ip.
                    */
                   if ((inet6sw[ip6_protox[nxt]].pr_flags & PR_LASTHDR) != 0 &&
                       ipsec6_in_reject(m, NULL)) {
                           IPSEC6_STATINC(IPSEC_STAT_IN_POLVIO);
                           goto bad;
                   }
   #endif
 #ifdef FAST_IPSEC  #ifdef FAST_IPSEC
         /*          /*
          * enforce IPsec policy checking if we are seeing last header.           * enforce IPsec policy checking if we are seeing last header.
Line 850  ip6_getdstifaddr(struct mbuf *m)
Line 882  ip6_getdstifaddr(struct mbuf *m)
  *   *
  * rtalertp - XXX: should be stored more smart way   * rtalertp - XXX: should be stored more smart way
  */   */
 int  static 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 895  ip6_hopopts_input(u_int32_t *plenp, u_in
Line 927  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.
  */   */
 static int  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.2.2  
changed lines
  Added in v.1.134
CVSweb <webmaster@jp.NetBSD.org>