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.4 retrieving revision 1.85 diff -u -p -r1.78.2.4 -r1.85 --- src/sys/netinet6/ip6_input.c 2007/09/03 14:43:32 1.78.2.4 +++ src/sys/netinet6/ip6_input.c 2006/05/05 00:03:22 1.85 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.78.2.4 2007/09/03 14:43:32 yamt Exp $ */ +/* $NetBSD: ip6_input.c,v 1.85 2006/05/05 00:03:22 rpaulo 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.4 2007/09/03 14:43:32 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.85 2006/05/05 00:03:22 rpaulo Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -112,12 +112,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_input.c, #include #endif -#ifdef FAST_IPSEC -#include -#include -#include -#endif /* FAST_IPSEC */ - #include #include "faith.h" @@ -136,7 +130,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 */ @@ -182,9 +176,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. */ @@ -198,15 +189,16 @@ ip6_init() } static void -ip6_init2(void *dummy) +ip6_init2(dummy) + 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,29 +229,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; - struct secpolicy *sp; - int s, error; -#endif #ifdef IPSEC /* @@ -284,7 +266,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 +288,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 +314,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 @@ -357,8 +328,6 @@ ip6_input(struct mbuf *m) */ #ifdef IPSEC if (!ipsec_getnhist(m)) -#elif defined(FAST_IPSEC) - if (!ipsec_indone(m)) #else if (1) #endif @@ -441,10 +410,6 @@ ip6_input(struct mbuf *m) * dst are the loopback address and the receiving interface * is not loopback. */ - if (__predict_false( - m_makewritable(&m, 0, sizeof(struct ip6_hdr), M_DONTWAIT))) - goto bad; - ip6 = mtod(m, struct ip6_hdr *); if (in6_clearscope(&ip6->ip6_src) || in6_clearscope(&ip6->ip6_dst)) { ip6stat.ip6s_badscope++; /* XXX */ goto bad; @@ -479,18 +444,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; + } + + 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_getkey(__rt) satocsin6(rt_getkey(__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 +482,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 +525,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 +543,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) @@ -640,7 +626,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), @@ -739,11 +725,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; } @@ -757,15 +741,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. @@ -778,46 +753,6 @@ ip6_input(struct mbuf *m) goto bad; } #endif -#ifdef FAST_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[ip_protox[nxt]].pr_flags & PR_LASTHDR) != 0) { - /* - * Check if the packet has already had IPsec processing - * done. If so, then just pass it along. This tag gets - * set during AH, ESP, etc. input handling, before the - * packet is returned to the ip input queue for delivery. - */ - mtag = m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL); - s = splsoftnet(); - if (mtag != NULL) { - tdbi = (struct tdb_ident *)(mtag + 1); - sp = ipsec_getpolicy(tdbi, IPSEC_DIR_INBOUND); - } else { - sp = ipsec_getpolicybyaddr(m, IPSEC_DIR_INBOUND, - IP_FORWARDING, &error); - } - if (sp != NULL) { - /* - * Check security policy against packet attributes. - */ - error = ipsec_in_reject(sp, m); - KEY_FREESP(&sp); - } else { - /* XXX error stat??? */ - error = EINVAL; - DPRINTF(("ip6_input: no SP, packet discarded\n"));/*XXX*/ - goto bad; - } - splx(s); - if (error) - goto bad; - } -#endif /* FAST_IPSEC */ - nxt = (*inet6sw[ip6_protox[nxt]].pr_input)(&m, &off, nxt); } @@ -830,7 +765,9 @@ ip6_input(struct mbuf *m) * set/grab in6_ifaddr correspond to IPv6 destination address. */ static struct m_tag * -ip6_setdstifaddr(struct mbuf *m, struct in6_ifaddr *ia6) +ip6_setdstifaddr(m, ia6) + struct mbuf *m; + struct in6_ifaddr *ia6; { struct m_tag *mtag; @@ -841,7 +778,8 @@ ip6_setdstifaddr(struct mbuf *m, struct } struct in6_ifaddr * -ip6_getdstifaddr(struct mbuf *m) +ip6_getdstifaddr(m) + struct mbuf *m; { struct m_tag *mtag; @@ -855,12 +793,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; @@ -904,8 +843,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; @@ -940,7 +883,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: @@ -1037,7 +980,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; @@ -1079,8 +1025,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)) @@ -1093,17 +1042,12 @@ 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; } #endif - - /* some OSes call this logic with IPv4 packet, for SO_TIMESTAMP */ - if ((ip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) - return; - /* RFC 2292 sec. 5 */ if ((in6p->in6p_flags & IN6P_PKTINFO) != 0) { struct in6_pktinfo pi6; @@ -1112,7 +1056,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) @@ -1122,7 +1066,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; @@ -1136,7 +1080,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) @@ -1184,7 +1128,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) @@ -1205,7 +1149,7 @@ ip6_savecontrol(struct in6pcb *in6p, str * Note that the order of the headers remains in * the chain of ancillary data. */ - for (;;) { /* is explicit loop prevention necessary? */ + while (1) { /* is explicit loop prevention necessary? */ struct ip6_ext *ip6e = NULL; int elen; struct mbuf *ext = NULL; @@ -1246,7 +1190,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) @@ -1257,7 +1201,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) @@ -1295,8 +1239,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; @@ -1318,11 +1261,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 */ @@ -1337,7 +1280,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; @@ -1355,7 +1301,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 @@ -1378,7 +1324,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; } @@ -1396,7 +1342,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 *); @@ -1409,7 +1357,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: @@ -1435,7 +1383,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; @@ -1454,7 +1406,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); @@ -1467,7 +1419,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) @@ -1478,7 +1430,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; @@ -1491,7 +1443,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; @@ -1514,7 +1466,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; @@ -1523,7 +1479,7 @@ ip6_lasthdr(struct mbuf *m, int off, int nxt = -1; nxtp = &nxt; } - for (;;) { + while (1) { newoff = ip6_nexthdr(m, off, proto, nxtp); if (newoff < 0) return off; @@ -1538,7 +1494,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; @@ -1555,7 +1512,8 @@ ip6_addaux(struct mbuf *m) } struct m_tag * -ip6_findaux(struct mbuf *m) +ip6_findaux(m) + struct mbuf *m; { struct m_tag *mtag; @@ -1564,7 +1522,8 @@ ip6_findaux(struct mbuf *m) } void -ip6_delaux(struct mbuf *m) +ip6_delaux(m) + struct mbuf *m; { struct m_tag *mtag; @@ -1573,57 +1532,6 @@ 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) -{ - int error, tmp; - struct sysctlnode node; - - node = *rnode; - tmp = ip6_hashsize; - node.sysctl_data = &tmp; - error = sysctl_lookup(SYSCTLFN_CALL(&node)); - if (error || newp == NULL) - 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 - */ - return EINVAL; - } - - return (0); -} -#endif /* GATEWAY */ - /* * System control for IP6 */ @@ -1907,20 +1815,4 @@ 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, - CTL_NET, PF_INET6, IPPROTO_IPV6, - CTL_CREATE, CTL_EOL); -#endif }