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.78.2.6 retrieving revision 1.90.2.1.2.2 diff -u -p -r1.78.2.6 -r1.90.2.1.2.2 --- src/sys/netinet6/ip6_input.c 2007/11/15 11:45:11 1.78.2.6 +++ src/sys/netinet6/ip6_input.c 2007/09/23 21:36:35 1.90.2.1.2.2 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.78.2.6 2007/11/15 11:45:11 yamt Exp $ */ +/* $NetBSD: ip6_input.c,v 1.90.2.1.2.2 2007/09/23 21:36:35 wrstuden 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.78.2.6 2007/11/15 11:45:11 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.90.2.1.2.2 2007/09/23 21:36:35 wrstuden 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 callout_t in6_tmpaddrtimer_ch; +extern struct callout 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(void *); -static struct m_tag *ip6_setdstifaddr(struct mbuf *, const struct in6_ifaddr *); +static void ip6_init2 __P((void *)); +static struct m_tag *ip6_setdstifaddr __P((struct mbuf *, struct in6_ifaddr *)); -static int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *); -static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int); +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)); /* * IP6 initialization: fill in IP6 protocol switch table. @@ -182,9 +182,6 @@ ip6_init() ip6_desync_factor = arc4random() % MAX_TEMP_DESYNC_FACTOR; ip6_init2((void *)0); -#ifdef GATEWAY - ip6flow_init(ip6_hashsize); -#endif #ifdef PFIL_HOOKS /* Register our Packet Filter hook. */ @@ -202,11 +199,11 @@ ip6_init2(void *dummy) { /* nd6_timer_init */ - callout_init(&nd6_timer_ch, 0); + callout_init(&nd6_timer_ch); callout_reset(&nd6_timer_ch, hz, nd6_timer, NULL); /* timer for regeneranation of temporary addresses randomize ID */ - callout_init(&in6_tmpaddrtimer_ch, 0); + callout_init(&in6_tmpaddrtimer_ch); callout_reset(&in6_tmpaddrtimer_ch, (ip6_temp_preferred_lifetime - ip6_desync_factor - ip6_temp_regen_advance) * hz, @@ -237,23 +234,19 @@ ip6intr() } } -extern struct route ip6_forward_rt; +extern struct route_in6 ip6_forward_rt; void -ip6_input(struct mbuf *m) +ip6_input(m) + struct mbuf *m; { struct ip6_hdr *ip6; - int hit, off = sizeof(struct ip6_hdr), nest; + int off = sizeof(struct ip6_hdr), nest; u_int32_t plen; u_int32_t rtalert = ~0; - int nxt, ours = 0, rh_present = 0; + int nxt, ours = 0; struct ifnet *deliverifp = NULL; int srcrt = 0; - const struct rtentry *rt; - union { - struct sockaddr dst; - struct sockaddr_in6 dst6; - } u; #ifdef FAST_IPSEC struct m_tag *mtag; struct tdb_ident *tdbi; @@ -284,7 +277,7 @@ ip6_input(struct mbuf *m) else ip6stat.ip6s_mext1++; } else { -#define M2MMAX __arraycount(ip6stat.ip6s_m2m) +#define M2MMAX (sizeof(ip6stat.ip6s_m2m)/sizeof(ip6stat.ip6s_m2m[0])) if (m->m_next) { if (m->m_flags & M_LOOP) { ip6stat.ip6s_m2m[lo0ifp->if_index]++; /* XXX */ @@ -306,7 +299,7 @@ ip6_input(struct mbuf *m) * it. Otherwise, if it is aligned, make sure the entire base * IPv6 header is in the first mbuf of the chain. */ - if (IP6_HDR_ALIGNED_P(mtod(m, void *)) == 0) { + if (IP6_HDR_ALIGNED_P(mtod(m, caddr_t)) == 0) { struct ifnet *inifp = m->m_pkthdr.rcvif; if ((m = m_copyup(m, sizeof(struct ip6_hdr), (max_linkhdr + 3) & ~3)) == NULL) { @@ -332,17 +325,6 @@ ip6_input(struct mbuf *m) 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 - * based on this packet. - */ - m->m_flags |= M_CANFASTFWD; -#endif - #ifdef PFIL_HOOKS /* * Run through list of hooks for input packets. If there are any @@ -479,18 +461,34 @@ ip6_input(struct mbuf *m) goto hbhcheck; } - sockaddr_in6_init(&u.dst6, &ip6->ip6_dst, 0, 0, 0); - /* * Unicast check */ - rt = rtcache_lookup2(&ip6_forward_rt, &u.dst, 1, &hit); - if (hit) + if (ip6_forward_rt.ro_rt != NULL && + (ip6_forward_rt.ro_rt->rt_flags & RTF_UP) != 0 && + IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, + &((struct sockaddr_in6 *)(&ip6_forward_rt.ro_dst))->sin6_addr)) ip6stat.ip6s_forward_cachehit++; - else - ip6stat.ip6s_forward_cachemiss++; + else { + struct sockaddr_in6 *dst6; + + if (ip6_forward_rt.ro_rt) { + /* route is down or destination is different */ + ip6stat.ip6s_forward_cachemiss++; + RTFREE(ip6_forward_rt.ro_rt); + ip6_forward_rt.ro_rt = 0; + } -#define rt6_getkey(__rt) satocsin6(rt_getkey(__rt)) + bzero(&ip6_forward_rt.ro_dst, sizeof(struct sockaddr_in6)); + dst6 = (struct sockaddr_in6 *)&ip6_forward_rt.ro_dst; + dst6->sin6_len = sizeof(struct sockaddr_in6); + dst6->sin6_family = AF_INET6; + dst6->sin6_addr = ip6->ip6_dst; + + rtalloc((struct route *)&ip6_forward_rt); + } + +#define rt6_key(r) ((struct sockaddr_in6 *)((r)->rt_nodes->rn_key)) /* * Accept the packet if the forwarding interface to the destination @@ -501,19 +499,22 @@ 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 (rt != NULL && - (rt->rt_flags & (RTF_HOST|RTF_GATEWAY)) == RTF_HOST && - !(rt->rt_flags & RTF_CLONED) && + if (ip6_forward_rt.ro_rt && + (ip6_forward_rt.ro_rt->rt_flags & + (RTF_HOST|RTF_GATEWAY)) == RTF_HOST && + !(ip6_forward_rt.ro_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_getkey(rt)->sin6_addr) && + IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, + &rt6_key(ip6_forward_rt.ro_rt)->sin6_addr) && #endif - rt->rt_ifp->if_type == IFT_LOOP) { - struct in6_ifaddr *ia6 = (struct in6_ifaddr *)rt->rt_ifa; + 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; if (ia6->ia6_flags & IN6_IFF_ANYCAST) m->m_flags |= M_ANYCAST6; /* @@ -541,11 +542,11 @@ ip6_input(struct mbuf *m) */ #if defined(NFAITH) && 0 < NFAITH if (ip6_keepfaith) { - if (rt != NULL && rt->rt_ifp != NULL && - rt->rt_ifp->if_type == IFT_FAITH) { + if (ip6_forward_rt.ro_rt && ip6_forward_rt.ro_rt->rt_ifp && + ip6_forward_rt.ro_rt->rt_ifp->if_type == IFT_FAITH) { /* XXX do we need more sanity checks? */ ours = 1; - deliverifp = rt->rt_ifp; /* faith */ + deliverifp = ip6_forward_rt.ro_rt->rt_ifp; /* faith */ goto hbhcheck; } } @@ -559,7 +560,9 @@ ip6_input(struct mbuf *m) * working right. */ struct ifaddr *ifa; - TAILQ_FOREACH(ifa, &m->m_pkthdr.rcvif->if_addrlist, ifa_list) { + for (ifa = m->m_pkthdr.rcvif->if_addrlist.tqh_first; + ifa; + ifa = ifa->ifa_list.tqe_next) { if (ifa->ifa_addr == NULL) continue; /* just for safety */ if (ifa->ifa_addr->sa_family != AF_INET6) @@ -590,16 +593,18 @@ ip6_input(struct mbuf *m) * as our interface address (e.g. multicast addresses, addresses * within FAITH prefixes and such). */ - if (deliverifp && ip6_getdstifaddr(m) == NULL) { + if (deliverifp && !ip6_getdstifaddr(m)) { struct in6_ifaddr *ia6; ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); - 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. - */ + 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. + */ + } } } @@ -638,7 +643,7 @@ ip6_input(struct mbuf *m) in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER, - (char *)&ip6->ip6_plen - (char *)ip6); + (caddr_t)&ip6->ip6_plen - (caddr_t)ip6); return; } IP6_EXTHDR_GET(hbh, struct ip6_hbh *, m, sizeof(struct ip6_hdr), @@ -737,11 +742,9 @@ ip6_input(struct mbuf *m) in6_ifstat_inc(deliverifp, ifs6_in_deliver); nest = 0; - rh_present = 0; while (nxt != IPPROTO_DONE) { if (ip6_hdrnestlimit && (++nest > ip6_hdrnestlimit)) { ip6stat.ip6s_toomanyhdr++; - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); goto bad; } @@ -755,15 +758,6 @@ ip6_input(struct mbuf *m) goto bad; } - if (nxt == IPPROTO_ROUTING) { - if (rh_present++) { - in6_ifstat_inc(m->m_pkthdr.rcvif, - ifs6_in_hdrerr); - ip6stat.ip6s_badoptions++; - goto bad; - } - } - #ifdef IPSEC /* * enforce IPsec policy checking if we are seeing last header. @@ -827,30 +821,27 @@ ip6_input(struct mbuf *m) * set/grab in6_ifaddr correspond to IPv6 destination address. */ static struct m_tag * -ip6_setdstifaddr(struct mbuf *m, const struct in6_ifaddr *ia) +ip6_setdstifaddr(m, ia6) + struct mbuf *m; + struct in6_ifaddr *ia6; { struct m_tag *mtag; mtag = ip6_addaux(m); - 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; - } + if (mtag) + ((struct ip6aux *)(mtag + 1))->ip6a_dstia6 = ia6; return mtag; /* NULL if failed to set */ } -const struct ip6aux * -ip6_getdstifaddr(struct mbuf *m) +struct in6_ifaddr * +ip6_getdstifaddr(m) + struct mbuf *m; { struct m_tag *mtag; mtag = ip6_findaux(m); - if (mtag != NULL) - return (struct ip6aux *)(mtag + 1); + if (mtag) + return ((struct ip6aux *)(mtag + 1))->ip6a_dstia6; else return NULL; } @@ -858,12 +849,13 @@ ip6_getdstifaddr(struct mbuf *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(u_int32_t *plenp, u_int32_t *rtalertp, - struct mbuf **mp, int *offp) +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; { struct mbuf *m = *mp; int off = *offp, hbhlen; @@ -907,8 +899,12 @@ ip6_hopopts_input(u_int32_t *plenp, u_in * opthead + hbhlen is located in continuous memory region. */ int -ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen, - u_int32_t *rtalertp, u_int32_t *plenp) +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; { struct ip6_hdr *ip6; int optlen = 0; @@ -943,7 +939,7 @@ ip6_process_hopopts(struct mbuf *m, u_in return (-1); } optlen = IP6OPT_RTALERT_LEN; - bcopy((void *)(opt + 2), (void *)&rtalert_val, 2); + bcopy((caddr_t)(opt + 2), (caddr_t)&rtalert_val, 2); *rtalertp = ntohs(rtalert_val); break; case IP6OPT_JUMBO: @@ -1040,7 +1036,10 @@ ip6_process_hopopts(struct mbuf *m, u_in * is not continuous in order to return an ICMPv6 error. */ int -ip6_unknown_opt(u_int8_t *optp, struct mbuf *m, int off) +ip6_unknown_opt(optp, m, off) + u_int8_t *optp; + struct mbuf *m; + int off; { struct ip6_hdr *ip6; @@ -1082,8 +1081,11 @@ ip6_unknown_opt(u_int8_t *optp, struct m * you are using IP6_EXTHDR_CHECK() not m_pulldown()) */ void -ip6_savecontrol(struct in6pcb *in6p, struct mbuf **mp, - struct ip6_hdr *ip6, struct mbuf *m) +ip6_savecontrol(in6p, mp, ip6, m) + 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)) @@ -1096,7 +1098,7 @@ ip6_savecontrol(struct in6pcb *in6p, str struct timeval tv; microtime(&tv); - *mp = sbcreatecontrol((void *) &tv, sizeof(tv), + *mp = sbcreatecontrol((caddr_t) &tv, sizeof(tv), SCM_TIMESTAMP, SOL_SOCKET); if (*mp) mp = &(*mp)->m_next; @@ -1115,7 +1117,7 @@ ip6_savecontrol(struct in6pcb *in6p, str in6_clearscope(&pi6.ipi6_addr); /* XXX */ pi6.ipi6_ifindex = m->m_pkthdr.rcvif ? m->m_pkthdr.rcvif->if_index : 0; - *mp = sbcreatecontrol((void *) &pi6, + *mp = sbcreatecontrol((caddr_t) &pi6, sizeof(struct in6_pktinfo), IS2292(IPV6_2292PKTINFO, IPV6_PKTINFO), IPPROTO_IPV6); if (*mp) @@ -1125,7 +1127,7 @@ ip6_savecontrol(struct in6pcb *in6p, str if (in6p->in6p_flags & IN6P_HOPLIMIT) { int hlim = ip6->ip6_hlim & 0xff; - *mp = sbcreatecontrol((void *) &hlim, sizeof(int), + *mp = sbcreatecontrol((caddr_t) &hlim, sizeof(int), IS2292(IPV6_2292HOPLIMIT, IPV6_HOPLIMIT), IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; @@ -1139,7 +1141,7 @@ ip6_savecontrol(struct in6pcb *in6p, str flowinfo >>= 20; tclass = flowinfo & 0xff; - *mp = sbcreatecontrol((void *)&tclass, sizeof(tclass), + *mp = sbcreatecontrol((caddr_t)&tclass, sizeof(tclass), IPV6_TCLASS, IPPROTO_IPV6); if (*mp) @@ -1187,7 +1189,7 @@ ip6_savecontrol(struct in6pcb *in6p, str * be removed before returning in the RFC 2292. * Note: this constraint is removed in RFC3542. */ - *mp = sbcreatecontrol((void *)hbh, hbhlen, + *mp = sbcreatecontrol((caddr_t)hbh, hbhlen, IS2292(IPV6_2292HOPOPTS, IPV6_HOPOPTS), IPPROTO_IPV6); if (*mp) @@ -1249,7 +1251,7 @@ ip6_savecontrol(struct in6pcb *in6p, str if (!in6p->in6p_flags & IN6P_DSTOPTS) break; - *mp = sbcreatecontrol((void *)ip6e, elen, + *mp = sbcreatecontrol((caddr_t)ip6e, elen, IS2292(IPV6_2292DSTOPTS, IPV6_DSTOPTS), IPPROTO_IPV6); if (*mp) @@ -1260,7 +1262,7 @@ ip6_savecontrol(struct in6pcb *in6p, str if (!in6p->in6p_flags & IN6P_RTHDR) break; - *mp = sbcreatecontrol((void *)ip6e, elen, + *mp = sbcreatecontrol((caddr_t)ip6e, elen, IS2292(IPV6_2292RTHDR, IPV6_RTHDR), IPPROTO_IPV6); if (*mp) @@ -1298,8 +1300,7 @@ ip6_savecontrol(struct in6pcb *in6p, str void -ip6_notify_pmtu(struct in6pcb *in6p, const struct sockaddr_in6 *dst, - uint32_t *mtu) +ip6_notify_pmtu(struct in6pcb *in6p, struct sockaddr_in6 *dst, uint32_t *mtu) { struct socket *so; struct mbuf *m_mtu; @@ -1321,11 +1322,11 @@ ip6_notify_pmtu(struct in6pcb *in6p, con if (sa6_recoverscope(&mtuctl.ip6m_addr)) return; - if ((m_mtu = sbcreatecontrol((void *)&mtuctl, sizeof(mtuctl), + if ((m_mtu = sbcreatecontrol((caddr_t)&mtuctl, sizeof(mtuctl), IPV6_PATHMTU, IPPROTO_IPV6)) == NULL) return; - if (sbappendaddr(&so->so_rcv, (const struct sockaddr *)dst, NULL, m_mtu) + if (sbappendaddr(&so->so_rcv, (struct sockaddr *)dst, NULL, m_mtu) == 0) { m_freem(m_mtu); /* XXX: should count statistics */ @@ -1340,7 +1341,10 @@ ip6_notify_pmtu(struct in6pcb *in6p, con * contains the result, or NULL on error. */ static struct mbuf * -ip6_pullexthdr(struct mbuf *m, size_t off, int nxt) +ip6_pullexthdr(m, off, nxt) + struct mbuf *m; + size_t off; + int nxt; { struct ip6_ext ip6e; size_t elen; @@ -1358,7 +1362,7 @@ ip6_pullexthdr(struct mbuf *m, size_t of } #endif - m_copydata(m, off, sizeof(ip6e), (void *)&ip6e); + m_copydata(m, off, sizeof(ip6e), (caddr_t)&ip6e); if (nxt == IPPROTO_AH) elen = (ip6e.ip6e_len + 2) << 2; else @@ -1381,7 +1385,7 @@ ip6_pullexthdr(struct mbuf *m, size_t of return NULL; } - m_copydata(m, off, elen, mtod(n, void *)); + m_copydata(m, off, elen, mtod(n, caddr_t)); n->m_len = elen; return n; } @@ -1399,7 +1403,9 @@ ip6_pullexthdr(struct mbuf *m, size_t of * we develop `neater' mechanism to process extension headers. */ u_int8_t * -ip6_get_prevhdr(struct mbuf *m, int off) +ip6_get_prevhdr(m, off) + struct mbuf *m; + int off; { struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); @@ -1412,7 +1418,7 @@ ip6_get_prevhdr(struct mbuf *m, int off) nxt = ip6->ip6_nxt; len = sizeof(struct ip6_hdr); while (len < off) { - ip6e = (struct ip6_ext *)(mtod(m, char *) + len); + ip6e = (struct ip6_ext *)(mtod(m, caddr_t) + len); switch (nxt) { case IPPROTO_FRAGMENT: @@ -1438,7 +1444,11 @@ ip6_get_prevhdr(struct mbuf *m, int off) * get next header offset. m will be retained. */ int -ip6_nexthdr(struct mbuf *m, int off, int proto, int *nxtp) +ip6_nexthdr(m, off, proto, nxtp) + struct mbuf *m; + int off; + int proto; + int *nxtp; { struct ip6_hdr ip6; struct ip6_ext ip6e; @@ -1457,7 +1467,7 @@ ip6_nexthdr(struct mbuf *m, int off, int return -1; if (m->m_pkthdr.len < off + sizeof(ip6)) return -1; - m_copydata(m, off, sizeof(ip6), (void *)&ip6); + m_copydata(m, off, sizeof(ip6), (caddr_t)&ip6); if (nxtp) *nxtp = ip6.ip6_nxt; off += sizeof(ip6); @@ -1470,7 +1480,7 @@ ip6_nexthdr(struct mbuf *m, int off, int */ if (m->m_pkthdr.len < off + sizeof(fh)) return -1; - m_copydata(m, off, sizeof(fh), (void *)&fh); + m_copydata(m, off, sizeof(fh), (caddr_t)&fh); if ((fh.ip6f_offlg & IP6F_OFF_MASK) != 0) return -1; if (nxtp) @@ -1481,7 +1491,7 @@ ip6_nexthdr(struct mbuf *m, int off, int case IPPROTO_AH: if (m->m_pkthdr.len < off + sizeof(ip6e)) return -1; - m_copydata(m, off, sizeof(ip6e), (void *)&ip6e); + m_copydata(m, off, sizeof(ip6e), (caddr_t)&ip6e); if (nxtp) *nxtp = ip6e.ip6e_nxt; off += (ip6e.ip6e_len + 2) << 2; @@ -1494,7 +1504,7 @@ ip6_nexthdr(struct mbuf *m, int off, int case IPPROTO_DSTOPTS: if (m->m_pkthdr.len < off + sizeof(ip6e)) return -1; - m_copydata(m, off, sizeof(ip6e), (void *)&ip6e); + m_copydata(m, off, sizeof(ip6e), (caddr_t)&ip6e); if (nxtp) *nxtp = ip6e.ip6e_nxt; off += (ip6e.ip6e_len + 1) << 3; @@ -1517,7 +1527,11 @@ ip6_nexthdr(struct mbuf *m, int off, int * get offset for the last header in the chain. m will be kept untainted. */ int -ip6_lasthdr(struct mbuf *m, int off, int proto, int *nxtp) +ip6_lasthdr(m, off, proto, nxtp) + struct mbuf *m; + int off; + int proto; + int *nxtp; { int newoff; int nxt; @@ -1541,7 +1555,8 @@ ip6_lasthdr(struct mbuf *m, int off, int } struct m_tag * -ip6_addaux(struct mbuf *m) +ip6_addaux(m) + struct mbuf *m; { struct m_tag *mtag; @@ -1558,7 +1573,8 @@ ip6_addaux(struct mbuf *m) } struct m_tag * -ip6_findaux(struct mbuf *m) +ip6_findaux(m) + struct mbuf *m; { struct m_tag *mtag; @@ -1567,7 +1583,8 @@ ip6_findaux(struct mbuf *m) } void -ip6_delaux(struct mbuf *m) +ip6_delaux(m) + struct mbuf *m; { struct m_tag *mtag; @@ -1576,56 +1593,30 @@ ip6_delaux(struct mbuf *m) m_tag_delete(m, mtag); } -#ifdef GATEWAY -/* - * sysctl helper routine for net.inet.ip6.maxflows. Since - * we could reduce this value, call ip6flow_reap(); - */ -static int -sysctl_net_inet6_ip6_maxflows(SYSCTLFN_ARGS) -{ - int s; - - s = sysctl_lookup(SYSCTLFN_CALL(rnode)); - if (s || newp == NULL) - return (s); - - s = splsoftnet(); - ip6flow_reap(0); - splx(s); - - return (0); -} - static int -sysctl_net_inet6_ip6_hashsize(SYSCTLFN_ARGS) +sysctl_net_inet6_ip6_rht0(SYSCTLFN_ARGS) { int error, tmp; struct sysctlnode node; node = *rnode; - tmp = ip6_hashsize; + tmp = ip6_rht0; node.sysctl_data = &tmp; error = sysctl_lookup(SYSCTLFN_CALL(&node)); if (error || newp == NULL) - return (error); + return error; - if ((tmp & (tmp - 1)) == 0 && tmp != 0) { - /* - * Can only fail due to malloc() - */ - if (ip6flow_invalidate_all(tmp)) - return ENOMEM; - } else { - /* - * EINVAL if not a power of 2 - */ + switch (tmp) { + case -1: /* disable processing */ + case 0: /* disable for host, enable for router */ + case 1: /* enable for all */ + break; + default: return EINVAL; - } - - return (0); + } + ip6_rht0 = tmp; + return 0; } -#endif /* GATEWAY */ /* * System control for IP6 @@ -1910,20 +1901,11 @@ SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, NULL, 0, &ip6_mcast_pmtu, 0, CTL_NET, PF_INET6, IPPROTO_IPV6, CTL_CREATE, CTL_EOL); -#ifdef GATEWAY - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "maxflows", - SYSCTL_DESCR("Number of flows for fast forwarding (IPv6)"), - sysctl_net_inet6_ip6_maxflows, 0, &ip6_maxflows, 0, - CTL_NET, PF_INET6, IPPROTO_IPV6, - CTL_CREATE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "hashsize", - SYSCTL_DESCR("Size of hash table for fast forwarding (IPv6)"), - sysctl_net_inet6_ip6_hashsize, 0, &ip6_hashsize, 0, + 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); -#endif }