Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.104 retrieving revision 1.112 diff -u -p -r1.104 -r1.112 --- src/sys/netinet6/ip6_input.c 2007/05/05 21:23:50 1.104 +++ src/sys/netinet6/ip6_input.c 2007/10/29 16:54:42 1.112 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.104 2007/05/05 21:23:50 yamt Exp $ */ +/* $NetBSD: ip6_input.c,v 1.112 2007/10/29 16:54:42 dyoung Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.104 2007/05/05 21:23:50 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.112 2007/10/29 16:54:42 dyoung Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -136,7 +136,7 @@ static int ip6qmaxlen = IFQ_MAXLEN; struct in6_ifaddr *in6_ifaddr; struct ifqueue ip6intrq; -extern struct callout in6_tmpaddrtimer_ch; +extern callout_t in6_tmpaddrtimer_ch; int ip6_forward_srcrt; /* XXX */ int ip6_sourcecheck; /* XXX */ @@ -148,11 +148,11 @@ struct pfil_head inet6_pfil_hook; struct ip6stat ip6stat; -static void ip6_init2 __P((void *)); -static struct m_tag *ip6_setdstifaddr __P((struct mbuf *, struct in6_ifaddr *)); +static void ip6_init2(void *); +static struct m_tag *ip6_setdstifaddr(struct mbuf *, const struct in6_ifaddr *); -static int ip6_hopopts_input __P((u_int32_t *, u_int32_t *, struct mbuf **, int *)); -static struct mbuf *ip6_pullexthdr __P((struct mbuf *, size_t, int)); +static int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *); +static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int); /* * IP6 initialization: fill in IP6 protocol switch table. @@ -202,11 +202,11 @@ ip6_init2(void *dummy) { /* nd6_timer_init */ - callout_init(&nd6_timer_ch); + callout_init(&nd6_timer_ch, 0); callout_reset(&nd6_timer_ch, hz, nd6_timer, NULL); /* timer for regeneranation of temporary addresses randomize ID */ - callout_init(&in6_tmpaddrtimer_ch); + callout_init(&in6_tmpaddrtimer_ch, 0); callout_reset(&in6_tmpaddrtimer_ch, (ip6_temp_preferred_lifetime - ip6_desync_factor - ip6_temp_regen_advance) * hz, @@ -243,13 +243,17 @@ void ip6_input(struct mbuf *m) { struct ip6_hdr *ip6; - int off = sizeof(struct ip6_hdr), nest; + int hit, off = sizeof(struct ip6_hdr), nest; u_int32_t plen; u_int32_t rtalert = ~0; int nxt, ours = 0, rh_present = 0; struct ifnet *deliverifp = NULL; int srcrt = 0; - const struct sockaddr_in6 *cdst; + const struct rtentry *rt; + union { + struct sockaddr dst; + struct sockaddr_in6 dst6; + } u; #ifdef FAST_IPSEC struct m_tag *mtag; struct tdb_ident *tdbi; @@ -475,34 +479,18 @@ ip6_input(struct mbuf *m) goto hbhcheck; } - cdst = satocsin6(rtcache_getdst(&ip6_forward_rt)); + sockaddr_in6_init(&u.dst6, &ip6->ip6_dst, 0, 0, 0); + /* * Unicast check */ - if (cdst == NULL) - ; - else if (!IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, &cdst->sin6_addr)) - rtcache_free(&ip6_forward_rt); - else - rtcache_check(&ip6_forward_rt); - if (ip6_forward_rt.ro_rt != NULL) { - /* XXX Revalidated route is accounted wrongly. */ + rt = rtcache_lookup2(&ip6_forward_rt, &u.dst, 1, &hit); + if (hit) ip6stat.ip6s_forward_cachehit++; - } else { - union { - struct sockaddr dst; - struct sockaddr_in6 dst6; - } u; - + else ip6stat.ip6s_forward_cachemiss++; - sockaddr_in6_init(&u.dst6, &ip6->ip6_dst, 0, 0, 0); - rtcache_setdst(&ip6_forward_rt, &u.dst); - - rtcache_init(&ip6_forward_rt); - } - -#define rt6_key(r) ((struct sockaddr_in6 *)((r)->rt_nodes->rn_key)) +#define rt6_getkey(__rt) satocsin6(rt_getkey(__rt)) /* * Accept the packet if the forwarding interface to the destination @@ -513,22 +501,19 @@ ip6_input(struct mbuf *m) * But we think it's even useful in some situations, e.g. when using * a special daemon which wants to intercept the packet. */ - if (ip6_forward_rt.ro_rt != NULL && - (ip6_forward_rt.ro_rt->rt_flags & - (RTF_HOST|RTF_GATEWAY)) == RTF_HOST && - !(ip6_forward_rt.ro_rt->rt_flags & RTF_CLONED) && + if (rt != NULL && + (rt->rt_flags & (RTF_HOST|RTF_GATEWAY)) == RTF_HOST && + !(rt->rt_flags & RTF_CLONED) && #if 0 /* * The check below is redundant since the comparison of * the destination and the key of the rtentry has * already done through looking up the routing table. */ - IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, - &rt6_key(ip6_forward_rt.ro_rt)->sin6_addr) && + IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, &rt6_getkey(rt)->sin6_addr) && #endif - ip6_forward_rt.ro_rt->rt_ifp->if_type == IFT_LOOP) { - struct in6_ifaddr *ia6 = - (struct in6_ifaddr *)ip6_forward_rt.ro_rt->rt_ifa; + rt->rt_ifp->if_type == IFT_LOOP) { + struct in6_ifaddr *ia6 = (struct in6_ifaddr *)rt->rt_ifa; if (ia6->ia6_flags & IN6_IFF_ANYCAST) m->m_flags |= M_ANYCAST6; /* @@ -556,12 +541,11 @@ ip6_input(struct mbuf *m) */ #if defined(NFAITH) && 0 < NFAITH if (ip6_keepfaith) { - if (ip6_forward_rt.ro_rt != NULL && - ip6_forward_rt.ro_rt->rt_ifp != NULL && - ip6_forward_rt.ro_rt->rt_ifp->if_type == IFT_FAITH) { + if (rt != NULL && rt->rt_ifp != NULL && + rt->rt_ifp->if_type == IFT_FAITH) { /* XXX do we need more sanity checks? */ ours = 1; - deliverifp = ip6_forward_rt.ro_rt->rt_ifp; /* faith */ + deliverifp = rt->rt_ifp; /* faith */ goto hbhcheck; } } @@ -606,18 +590,16 @@ ip6_input(struct mbuf *m) * as our interface address (e.g. multicast addresses, addresses * within FAITH prefixes and such). */ - if (deliverifp && !ip6_getdstifaddr(m)) { + if (deliverifp && ip6_getdstifaddr(m) == NULL) { struct in6_ifaddr *ia6; ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); - if (ia6) { - if (!ip6_setdstifaddr(m, ia6)) { - /* - * XXX maybe we should drop the packet here, - * as we could not provide enough information - * to the upper layers. - */ - } + if (ia6 != NULL && ip6_setdstifaddr(m, ia6) == NULL) { + /* + * XXX maybe we should drop the packet here, + * as we could not provide enough information + * to the upper layers. + */ } } @@ -826,7 +808,6 @@ ip6_input(struct mbuf *m) /* XXX error stat??? */ error = EINVAL; DPRINTF(("ip6_input: no SP, packet discarded\n"));/*XXX*/ - goto bad; } splx(s); if (error) @@ -846,27 +827,30 @@ ip6_input(struct mbuf *m) * set/grab in6_ifaddr correspond to IPv6 destination address. */ static struct m_tag * -ip6_setdstifaddr(m, ia6) - struct mbuf *m; - struct in6_ifaddr *ia6; +ip6_setdstifaddr(struct mbuf *m, const struct in6_ifaddr *ia) { struct m_tag *mtag; mtag = ip6_addaux(m); - if (mtag) - ((struct ip6aux *)(mtag + 1))->ip6a_dstia6 = ia6; + if (mtag != NULL) { + struct ip6aux *ip6a; + + ip6a = (struct ip6aux *)(mtag + 1); + in6_setscope(&ip6a->ip6a_src, ia->ia_ifp, &ip6a->ip6a_scope_id); + ip6a->ip6a_src = ia->ia_addr.sin6_addr; + ip6a->ip6a_flags = ia->ia6_flags; + } return mtag; /* NULL if failed to set */ } -struct in6_ifaddr * -ip6_getdstifaddr(m) - struct mbuf *m; +const struct ip6aux * +ip6_getdstifaddr(struct mbuf *m) { struct m_tag *mtag; mtag = ip6_findaux(m); - if (mtag) - return ((struct ip6aux *)(mtag + 1))->ip6a_dstia6; + if (mtag != NULL) + return (struct ip6aux *)(mtag + 1); else return NULL; } @@ -874,13 +858,12 @@ ip6_getdstifaddr(m) /* * Hop-by-Hop options header processing. If a valid jumbo payload option is * included, the real payload length will be stored in plenp. + * + * rtalertp - XXX: should be stored more smart way */ static int -ip6_hopopts_input(plenp, rtalertp, mp, offp) - u_int32_t *plenp; - u_int32_t *rtalertp; /* XXX: should be stored more smart way */ - struct mbuf **mp; - int *offp; +ip6_hopopts_input(u_int32_t *plenp, u_int32_t *rtalertp, + struct mbuf **mp, int *offp) { struct mbuf *m = *mp; int off = *offp, hbhlen; @@ -924,12 +907,8 @@ ip6_hopopts_input(plenp, rtalertp, mp, o * opthead + hbhlen is located in continuous memory region. */ int -ip6_process_hopopts(m, opthead, hbhlen, rtalertp, plenp) - struct mbuf *m; - u_int8_t *opthead; - int hbhlen; - u_int32_t *rtalertp; - u_int32_t *plenp; +ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen, + u_int32_t *rtalertp, u_int32_t *plenp) { struct ip6_hdr *ip6; int optlen = 0; @@ -1061,10 +1040,7 @@ ip6_process_hopopts(m, opthead, hbhlen, * is not continuous in order to return an ICMPv6 error. */ int -ip6_unknown_opt(optp, m, off) - u_int8_t *optp; - struct mbuf *m; - int off; +ip6_unknown_opt(u_int8_t *optp, struct mbuf *m, int off) { struct ip6_hdr *ip6; @@ -1106,11 +1082,8 @@ ip6_unknown_opt(optp, m, off) * you are using IP6_EXTHDR_CHECK() not m_pulldown()) */ void -ip6_savecontrol(in6p, mp, ip6, m) - struct in6pcb *in6p; - struct mbuf **mp; - struct ip6_hdr *ip6; - struct mbuf *m; +ip6_savecontrol(struct in6pcb *in6p, struct mbuf **mp, + struct ip6_hdr *ip6, struct mbuf *m) { #ifdef RFC2292 #define IS2292(x, y) ((in6p->in6p_flags & IN6P_RFC2292) ? (x) : (y)) @@ -1367,10 +1340,7 @@ ip6_notify_pmtu(struct in6pcb *in6p, con * contains the result, or NULL on error. */ static struct mbuf * -ip6_pullexthdr(m, off, nxt) - struct mbuf *m; - size_t off; - int nxt; +ip6_pullexthdr(struct mbuf *m, size_t off, int nxt) { struct ip6_ext ip6e; size_t elen; @@ -1429,9 +1399,7 @@ ip6_pullexthdr(m, off, nxt) * we develop `neater' mechanism to process extension headers. */ u_int8_t * -ip6_get_prevhdr(m, off) - struct mbuf *m; - int off; +ip6_get_prevhdr(struct mbuf *m, int off) { struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); @@ -1470,11 +1438,7 @@ ip6_get_prevhdr(m, off) * get next header offset. m will be retained. */ int -ip6_nexthdr(m, off, proto, nxtp) - struct mbuf *m; - int off; - int proto; - int *nxtp; +ip6_nexthdr(struct mbuf *m, int off, int proto, int *nxtp) { struct ip6_hdr ip6; struct ip6_ext ip6e; @@ -1553,11 +1517,7 @@ ip6_nexthdr(m, off, proto, nxtp) * get offset for the last header in the chain. m will be kept untainted. */ int -ip6_lasthdr(m, off, proto, nxtp) - struct mbuf *m; - int off; - int proto; - int *nxtp; +ip6_lasthdr(struct mbuf *m, int off, int proto, int *nxtp) { int newoff; int nxt; @@ -1581,8 +1541,7 @@ ip6_lasthdr(m, off, proto, nxtp) } struct m_tag * -ip6_addaux(m) - struct mbuf *m; +ip6_addaux(struct mbuf *m) { struct m_tag *mtag; @@ -1599,8 +1558,7 @@ ip6_addaux(m) } struct m_tag * -ip6_findaux(m) - struct mbuf *m; +ip6_findaux(struct mbuf *m) { struct m_tag *mtag; @@ -1609,8 +1567,7 @@ ip6_findaux(m) } void -ip6_delaux(m) - struct mbuf *m; +ip6_delaux(struct mbuf *m) { struct m_tag *mtag; @@ -1670,31 +1627,6 @@ sysctl_net_inet6_ip6_hashsize(SYSCTLFN_A } #endif /* GATEWAY */ -static int -sysctl_net_inet6_ip6_rht0(SYSCTLFN_ARGS) -{ - int error, tmp; - struct sysctlnode node; - - node = *rnode; - tmp = ip6_rht0; - node.sysctl_data = &tmp; - error = sysctl_lookup(SYSCTLFN_CALL(&node)); - if (error || newp == NULL) - return error; - - switch (tmp) { - case -1: /* disable processing */ - case 0: /* disable for host, enable for router */ - case 1: /* enable for all */ - break; - default: - return EINVAL; - } - ip6_rht0 = tmp; - return 0; -} - /* * System control for IP6 */ @@ -1994,11 +1926,4 @@ SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, CTL_NET, PF_INET6, IPPROTO_IPV6, CTL_CREATE, CTL_EOL); #endif - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "rht0", - SYSCTL_DESCR("Processing of routing header type 0 (IPv6)"), - sysctl_net_inet6_ip6_rht0, 0, &ip6_rht0, 0, - CTL_NET, PF_INET6, IPPROTO_IPV6, - CTL_CREATE, CTL_EOL); }