[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.132.2.4 and 1.133

version 1.132.2.4, 2014/05/22 11:41:10 version 1.133, 2011/11/19 22:51:29
Line 68  __KERNEL_RCSID(0, "$NetBSD$");
Line 68  __KERNEL_RCSID(0, "$NetBSD$");
 #include "opt_inet.h"  #include "opt_inet.h"
 #include "opt_inet6.h"  #include "opt_inet6.h"
 #include "opt_ipsec.h"  #include "opt_ipsec.h"
   #include "opt_pfil_hooks.h"
 #include "opt_compat_netbsd.h"  #include "opt_compat_netbsd.h"
   
 #include <sys/param.h>  #include <sys/param.h>
Line 91  __KERNEL_RCSID(0, "$NetBSD$");
Line 92  __KERNEL_RCSID(0, "$NetBSD$");
 #include <net/if_dl.h>  #include <net/if_dl.h>
 #include <net/route.h>  #include <net/route.h>
 #include <net/netisr.h>  #include <net/netisr.h>
   #ifdef PFIL_HOOKS
 #include <net/pfil.h>  #include <net/pfil.h>
   #endif
   
 #include <netinet/in.h>  #include <netinet/in.h>
 #include <netinet/in_systm.h>  #include <netinet/in_systm.h>
Line 100  __KERNEL_RCSID(0, "$NetBSD$");
Line 103  __KERNEL_RCSID(0, "$NetBSD$");
 #include <netinet/ip_icmp.h>  #include <netinet/ip_icmp.h>
 #endif /* INET */  #endif /* INET */
 #include <netinet/ip6.h>  #include <netinet/ip6.h>
 #include <netinet/portalgo.h>  
 #include <netinet6/in6_var.h>  #include <netinet6/in6_var.h>
 #include <netinet6/ip6_var.h>  #include <netinet6/ip6_var.h>
 #include <netinet6/ip6_private.h>  #include <netinet6/ip6_private.h>
Line 111  __KERNEL_RCSID(0, "$NetBSD$");
Line 113  __KERNEL_RCSID(0, "$NetBSD$");
 #include <netinet6/nd6.h>  #include <netinet6/nd6.h>
   
 #ifdef IPSEC  #ifdef IPSEC
   #include <netinet6/ipsec.h>
   #include <netinet6/ipsec_private.h>
   #endif
   
   #ifdef FAST_IPSEC
 #include <netipsec/ipsec.h>  #include <netipsec/ipsec.h>
 #include <netipsec/ipsec6.h>  #include <netipsec/ipsec6.h>
 #include <netipsec/key.h>  #include <netipsec/key.h>
 #endif /* IPSEC */  #endif /* FAST_IPSEC */
   
 #ifdef COMPAT_50  #ifdef COMPAT_50
 #include <compat/sys/time.h>  #include <compat/sys/time.h>
Line 145  int ip6_forward_srcrt;   /* XXX */
Line 152  int ip6_forward_srcrt;   /* XXX */
 int ip6_sourcecheck;                    /* XXX */  int ip6_sourcecheck;                    /* XXX */
 int ip6_sourcecheck_interval;           /* XXX */  int ip6_sourcecheck_interval;           /* XXX */
   
 pfil_head_t *inet6_pfil_hook;  #ifdef PFIL_HOOKS
   struct pfil_head inet6_pfil_hook;
   #endif
   
 percpu_t *ip6stat_percpu;  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 185  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
   
   #ifdef PFIL_HOOKS
         /* Register our Packet Filter hook. */          /* Register our Packet Filter hook. */
         inet6_pfil_hook = pfil_head_create(PFIL_TYPE_AF, (void *)AF_INET6);          inet6_pfil_hook.ph_type = PFIL_TYPE_AF;
         KASSERT(inet6_pfil_hook != NULL);          inet6_pfil_hook.ph_af   = AF_INET6;
           i = pfil_head_register(&inet6_pfil_hook);
           if (i != 0)
                   printf("ip6_init: WARNING: unable to register pfil hook, "
                       "error %d\n", i);
   #endif /* PFIL_HOOKS */
   
         ip6stat_percpu = percpu_alloc(sizeof(uint64_t) * IP6_NSTATS);          ip6stat_percpu = percpu_alloc(sizeof(uint64_t) * IP6_NSTATS);
 }  }
Line 257  ip6_input(struct mbuf *m)
Line 272  ip6_input(struct mbuf *m)
                 struct sockaddr         dst;                  struct sockaddr         dst;
                 struct sockaddr_in6     dst6;                  struct sockaddr_in6     dst6;
         } u;          } u;
 #ifdef IPSEC  #ifdef FAST_IPSEC
         struct m_tag *mtag;          struct m_tag *mtag;
         struct tdb_ident *tdbi;          struct tdb_ident *tdbi;
         struct secpolicy *sp;          struct secpolicy *sp;
         int s, error;          int s, error;
 #endif  #endif
   
   #ifdef 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 327  ip6_input(struct mbuf *m)
Line 351  ip6_input(struct mbuf *m)
                 goto bad;                  goto bad;
         }          }
   
   #if defined(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
         /*          /*
          * Run through list of hooks for input packets.  If there are any           * Run through list of hooks for input packets.  If there are any
          * filters which require that additional packets in the flow are           * filters which require that additional packets in the flow are
Line 344  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(IPSEC)  #ifdef IPSEC
           if (!ipsec_getnhist(m))
   #elif defined(FAST_IPSEC)
         if (!ipsec_indone(m))          if (!ipsec_indone(m))
 #else  #else
         if (1)          if (1)
Line 353  ip6_input(struct mbuf *m)
Line 385  ip6_input(struct mbuf *m)
                 struct in6_addr odst;                  struct in6_addr odst;
   
                 odst = ip6->ip6_dst;                  odst = ip6->ip6_dst;
                 if (pfil_run_hooks(inet6_pfil_hook, &m, m->m_pkthdr.rcvif,                  if (pfil_run_hooks(&inet6_pfil_hook, &m, m->m_pkthdr.rcvif,
                                    PFIL_IN) != 0)                                     PFIL_IN) != 0)
                         return;                          return;
                 if (m == NULL)                  if (m == NULL)
Line 361  ip6_input(struct mbuf *m)
Line 393  ip6_input(struct mbuf *m)
                 ip6 = mtod(m, struct ip6_hdr *);                  ip6 = mtod(m, struct ip6_hdr *);
                 srcrt = !IN6_ARE_ADDR_EQUAL(&odst, &ip6->ip6_dst);                  srcrt = !IN6_ARE_ADDR_EQUAL(&odst, &ip6->ip6_dst);
         }          }
   #endif /* PFIL_HOOKS */
   
         IP6_STATINC(IP6_STAT_NXTHIST + ip6->ip6_nxt);          IP6_STATINC(IP6_STAT_NXTHIST + ip6->ip6_nxt);
   
Line 753  ip6_input(struct mbuf *m)
Line 786  ip6_input(struct mbuf *m)
                 }                  }
   
 #ifdef IPSEC  #ifdef 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
         /*          /*
          * 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 789  ip6_input(struct mbuf *m)
Line 834  ip6_input(struct mbuf *m)
                 if (error)                  if (error)
                         goto bad;                          goto bad;
         }          }
 #endif /* IPSEC */  #endif /* FAST_IPSEC */
   
   
                 nxt = (*inet6sw[ip6_protox[nxt]].pr_input)(&m, &off, nxt);                  nxt = (*inet6sw[ip6_protox[nxt]].pr_input)(&m, &off, nxt);
Line 806  static struct m_tag *
Line 851  static struct m_tag *
 ip6_setdstifaddr(struct mbuf *m, const struct in6_ifaddr *ia)  ip6_setdstifaddr(struct mbuf *m, const struct in6_ifaddr *ia)
 {  {
         struct m_tag *mtag;          struct m_tag *mtag;
         struct ip6aux *ip6a;  
   
         mtag = ip6_addaux(m);          mtag = ip6_addaux(m);
         if (mtag == NULL)          if (mtag != NULL) {
                 return NULL;                  struct ip6aux *ip6a;
   
         ip6a = (struct ip6aux *)(mtag + 1);                  ip6a = (struct ip6aux *)(mtag + 1);
         if (in6_setscope(&ip6a->ip6a_src, ia->ia_ifp, &ip6a->ip6a_scope_id)) {                  in6_setscope(&ip6a->ip6a_src, ia->ia_ifp, &ip6a->ip6a_scope_id);
                 IP6_STATINC(IP6_STAT_BADSCOPE);                  ip6a->ip6a_src = ia->ia_addr.sin6_addr;
                 return NULL;                  ip6a->ip6a_flags = ia->ia6_flags;
         }          }
           return mtag;    /* NULL if failed to set */
         ip6a->ip6a_src = ia->ia_addr.sin6_addr;  
         ip6a->ip6a_flags = ia->ia6_flags;  
         return mtag;  
 }  }
   
 const struct ip6aux *  const struct ip6aux *
Line 841  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 886  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)
 {  {
Line 1657  sysctl_net_inet6_ip6_setup(struct sysctl
Line 1698  sysctl_net_inet6_ip6_setup(struct sysctl
   
         sysctl_createv(clog, 0, NULL, NULL,          sysctl_createv(clog, 0, NULL, NULL,
                        CTLFLAG_PERMANENT,                         CTLFLAG_PERMANENT,
                          CTLTYPE_NODE, "net", NULL,
                          NULL, 0, NULL, 0,
                          CTL_NET, CTL_EOL);
           sysctl_createv(clog, 0, NULL, NULL,
                          CTLFLAG_PERMANENT,
                        CTLTYPE_NODE, "inet6",                         CTLTYPE_NODE, "inet6",
                        SYSCTL_DESCR("PF_INET6 related settings"),                         SYSCTL_DESCR("PF_INET6 related settings"),
                        NULL, 0, NULL, 0,                         NULL, 0, NULL, 0,
Line 1942  sysctl_net_inet6_ip6_setup(struct sysctl
Line 1988  sysctl_net_inet6_ip6_setup(struct sysctl
                         CTL_NET, PF_INET6, IPPROTO_IPV6,                          CTL_NET, PF_INET6, IPPROTO_IPV6,
                         CTL_CREATE, CTL_EOL);                          CTL_CREATE, CTL_EOL);
 #endif  #endif
         /* anonportalgo RFC6056 subtree */  
         const struct sysctlnode *portalgo_node;  
         sysctl_createv(clog, 0, NULL, &portalgo_node,  
                        CTLFLAG_PERMANENT,  
                        CTLTYPE_NODE, "anonportalgo",  
                        SYSCTL_DESCR("Anonymous port algorithm selection (RFC 6056)"),  
                        NULL, 0, NULL, 0,  
                        CTL_NET, PF_INET6, IPPROTO_IPV6, CTL_CREATE, CTL_EOL);  
         sysctl_createv(clog, 0, &portalgo_node, NULL,  
                        CTLFLAG_PERMANENT,  
                        CTLTYPE_STRING, "available",  
                        SYSCTL_DESCR("available algorithms"),  
                        sysctl_portalgo_available, 0, NULL, PORTALGO_MAXLEN,  
                        CTL_CREATE, CTL_EOL);  
         sysctl_createv(clog, 0, &portalgo_node, NULL,  
                        CTLFLAG_PERMANENT|CTLFLAG_READWRITE,  
                        CTLTYPE_STRING, "selected",  
                        SYSCTL_DESCR("selected algorithm"),  
                        sysctl_portalgo_selected6, 0, NULL, PORTALGO_MAXLEN,  
                        CTL_CREATE, CTL_EOL);  
         sysctl_createv(clog, 0, &portalgo_node, NULL,  
                        CTLFLAG_PERMANENT|CTLFLAG_READWRITE,  
                        CTLTYPE_STRUCT, "reserve",  
                        SYSCTL_DESCR("bitmap of reserved ports"),  
                        sysctl_portalgo_reserve6, 0, NULL, 0,  
                        CTL_CREATE, CTL_EOL);  
         sysctl_createv(clog, 0, NULL, NULL,  
                        CTLFLAG_PERMANENT|CTLFLAG_READWRITE,  
                        CTLTYPE_INT, "neighborgcthresh",  
                        SYSCTL_DESCR("Maximum number of entries in neighbor"  
                         " cache"),  
                        NULL, 1, &ip6_neighborgcthresh, 0,  
                        CTL_NET, PF_INET6, IPPROTO_IPV6,  
                        CTL_CREATE, CTL_EOL);  
         sysctl_createv(clog, 0, NULL, NULL,  
                        CTLFLAG_PERMANENT|CTLFLAG_READWRITE,  
                        CTLTYPE_INT, "maxifprefixes",  
                        SYSCTL_DESCR("Maximum number of prefixes created by"  
                            " route advertisement per interface"),  
                        NULL, 1, &ip6_maxifprefixes, 0,  
                        CTL_NET, PF_INET6, IPPROTO_IPV6,  
                        CTL_CREATE, CTL_EOL);  
         sysctl_createv(clog, 0, NULL, NULL,  
                        CTLFLAG_PERMANENT|CTLFLAG_READWRITE,  
                        CTLTYPE_INT, "maxifdefrouters",  
                        SYSCTL_DESCR("Maximum number of default routers created"  
                            " by route advertisement per interface"),  
                        NULL, 1, &ip6_maxifdefrouters, 0,  
                        CTL_NET, PF_INET6, IPPROTO_IPV6,  
                        CTL_CREATE, CTL_EOL);  
         sysctl_createv(clog, 0, NULL, NULL,  
                        CTLFLAG_PERMANENT|CTLFLAG_READWRITE,  
                        CTLTYPE_INT, "maxdynroutes",  
                        SYSCTL_DESCR("Maximum number of routes created via"  
                            " redirect"),  
                        NULL, 1, &ip6_maxdynroutes, 0,  
                        CTL_NET, PF_INET6, IPPROTO_IPV6,  
                        CTL_CREATE, CTL_EOL);  
 }  }
   
 void  void

Legend:
Removed from v.1.132.2.4  
changed lines
  Added in v.1.133

CVSweb <webmaster@jp.NetBSD.org>