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.62 retrieving revision 1.78 diff -u -p -r1.62 -r1.78 --- src/sys/netinet6/ip6_input.c 2003/05/14 14:34:14 1.62 +++ src/sys/netinet6/ip6_input.c 2005/05/29 21:43:51 1.78 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.62 2003/05/14 14:34:14 itojun Exp $ */ +/* $NetBSD: ip6_input.c,v 1.78 2005/05/29 21:43:51 christos Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -42,11 +42,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -66,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.62 2003/05/14 14:34:14 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.78 2005/05/29 21:43:51 christos Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -116,11 +112,8 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_input.c, #include -/* we need it for NLOOP. */ -#include "loop.h" #include "faith.h" #include "gif.h" -#include "bpfilter.h" #if NGIF > 0 #include @@ -135,7 +128,6 @@ static int ip6qmaxlen = IFQ_MAXLEN; struct in6_ifaddr *in6_ifaddr; struct ifqueue ip6intrq; -extern struct ifnet loif[NLOOP]; int ip6_forward_srcrt; /* XXX */ int ip6_sourcecheck; /* XXX */ int ip6_sourcecheck_interval; /* XXX */ @@ -158,23 +150,22 @@ static struct mbuf *ip6_pullexthdr __P(( void ip6_init() { - struct ip6protosw *pr; + const struct ip6protosw *pr; int i; - pr = (struct ip6protosw *)pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW); + pr = (const struct ip6protosw *)pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW); if (pr == 0) panic("ip6_init"); for (i = 0; i < IPPROTO_MAX; i++) ip6_protox[i] = pr - inet6sw; - for (pr = (struct ip6protosw *)inet6domain.dom_protosw; - pr < (struct ip6protosw *)inet6domain.dom_protoswNPROTOSW; pr++) + for (pr = (const struct ip6protosw *)inet6domain.dom_protosw; + pr < (const struct ip6protosw *)inet6domain.dom_protoswNPROTOSW; pr++) if (pr->pr_domain->dom_family == PF_INET6 && pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW) ip6_protox[pr->pr_protocol] = pr - inet6sw; ip6intrq.ifq_maxlen = ip6qmaxlen; nd6_init(); frag6_init(); - ip6_flow_seq = arc4random(); ip6_init2((void *)0); @@ -230,6 +221,7 @@ ip6_input(m) u_int32_t rtalert = ~0; int nxt, ours = 0; struct ifnet *deliverifp = NULL; + int srcrt = 0; #ifdef IPSEC /* @@ -252,7 +244,7 @@ ip6_input(m) #define M2MMAX (sizeof(ip6stat.ip6s_m2m)/sizeof(ip6stat.ip6s_m2m[0])) if (m->m_next) { if (m->m_flags & M_LOOP) { - ip6stat.ip6s_m2m[loif[0].if_index]++; /* XXX */ + ip6stat.ip6s_m2m[lo0ifp->if_index]++; /* XXX */ } else if (m->m_pkthdr.rcvif->if_index < M2MMAX) ip6stat.ip6s_m2m[m->m_pkthdr.rcvif->if_index]++; else @@ -315,12 +307,16 @@ ip6_input(m) if (1) #endif { + struct in6_addr odst; + + odst = ip6->ip6_dst; if (pfil_run_hooks(&inet6_pfil_hook, &m, m->m_pkthdr.rcvif, PFIL_IN) != 0) return; if (m == NULL) return; ip6 = mtod(m, struct ip6_hdr *); + srcrt = !IN6_ARE_ADDR_EQUAL(&odst, &ip6->ip6_dst); } #endif /* PFIL_HOOKS */ @@ -466,7 +462,7 @@ ip6_input(m) 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)) + &((struct sockaddr_in6 *)(&ip6_forward_rt.ro_dst))->sin6_addr)) ip6stat.ip6s_forward_cachehit++; else { struct sockaddr_in6 *dst6; @@ -541,8 +537,8 @@ ip6_input(m) */ #if defined(NFAITH) && 0 < NFAITH if (ip6_keepfaith) { - if (ip6_forward_rt.ro_rt && ip6_forward_rt.ro_rt->rt_ifp - && ip6_forward_rt.ro_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 = ip6_forward_rt.ro_rt->rt_ifp; /* faith */ @@ -683,7 +679,7 @@ ip6_input(m) return; } } else if (!ours) { - ip6_forward(m, 0); + ip6_forward(m, srcrt); return; } @@ -770,7 +766,6 @@ ip6_hopopts_input(plenp, rtalertp, mp, o struct mbuf *m = *mp; int off = *offp, hbhlen; struct ip6_hbh *hbh; - u_int8_t *opt; /* validation of the length of the header */ IP6_EXTHDR_GET(hbh, struct ip6_hbh *, m, @@ -789,7 +784,6 @@ ip6_hopopts_input(plenp, rtalertp, mp, o KASSERT(IP6_HDR_ALIGNED_P(hbh)); off += hbhlen; hbhlen -= sizeof(struct ip6_hbh); - opt = (u_int8_t *)hbh + sizeof(struct ip6_hbh); if (ip6_process_hopopts(m, (u_int8_t *)hbh + sizeof(struct ip6_hbh), hbhlen, rtalertp, plenp) < 0) @@ -999,12 +993,6 @@ ip6_savecontrol(in6p, mp, ip6, m) struct ip6_hdr *ip6; struct mbuf *m; { - struct proc *p = curproc; /* XXX */ - int privileged; - - privileged = 0; - if (p && !suser(p->p_ucred, &p->p_acflag)) - privileged++; #ifdef SO_TIMESTAMP if (in6p->in6p_socket->so_options & SO_TIMESTAMP) { @@ -1012,15 +1000,14 @@ ip6_savecontrol(in6p, mp, ip6, m) microtime(&tv); *mp = sbcreatecontrol((caddr_t) &tv, sizeof(tv), - SCM_TIMESTAMP, SOL_SOCKET); + SCM_TIMESTAMP, SOL_SOCKET); if (*mp) mp = &(*mp)->m_next; } #endif if (in6p->in6p_flags & IN6P_RECVDSTADDR) { *mp = sbcreatecontrol((caddr_t) &ip6->ip6_dst, - sizeof(struct in6_addr), IPV6_RECVDSTADDR, - IPPROTO_IPV6); + sizeof(struct in6_addr), IPV6_RECVDSTADDR, IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; } @@ -1044,27 +1031,27 @@ ip6_savecontrol(in6p, mp, ip6, m) ? m->m_pkthdr.rcvif->if_index : 0; *mp = sbcreatecontrol((caddr_t) &pi6, - sizeof(struct in6_pktinfo), IPV6_PKTINFO, - IPPROTO_IPV6); + sizeof(struct in6_pktinfo), IPV6_PKTINFO, IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; } if (in6p->in6p_flags & IN6P_HOPLIMIT) { int hlim = ip6->ip6_hlim & 0xff; - *mp = sbcreatecontrol((caddr_t) &hlim, - sizeof(int), IPV6_HOPLIMIT, IPPROTO_IPV6); + *mp = sbcreatecontrol((caddr_t) &hlim, sizeof(int), + IPV6_HOPLIMIT, IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; } /* IN6P_NEXTHOP - for outgoing packet only */ /* - * IPV6_HOPOPTS socket option. We require super-user privilege - * for the option, but it might be too strict, since there might - * be some hop-by-hop options which can be returned to normal user. - * See RFC 2292 section 6. + * IPV6_HOPOPTS socket option. Recall that we required super-user + * privilege for the option (see ip6_ctloutput), but it might be too + * strict, since there might be some hop-by-hop options which can be + * returned to normal user. + * See also RFC 2292 section 6. */ - if ((in6p->in6p_flags & IN6P_HOPOPTS) != 0 && privileged) { + if ((in6p->in6p_flags & IN6P_HOPOPTS) != 0) { /* * Check if a hop-by-hop options header is contatined in the * received packet, and if so, store the options as ancillary @@ -1072,14 +1059,14 @@ ip6_savecontrol(in6p, mp, ip6, m) * just after the IPv6 header, which fact is assured through * the IPv6 input processing. */ - struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); - if (ip6->ip6_nxt == IPPROTO_HOPOPTS) { + struct ip6_hdr *xip6 = mtod(m, struct ip6_hdr *); + if (xip6->ip6_nxt == IPPROTO_HOPOPTS) { struct ip6_hbh *hbh; int hbhlen; struct mbuf *ext; ext = ip6_pullexthdr(m, sizeof(struct ip6_hdr), - ip6->ip6_nxt); + xip6->ip6_nxt); if (ext == NULL) { ip6stat.ip6s_tooshort++; return; @@ -1099,7 +1086,7 @@ ip6_savecontrol(in6p, mp, ip6, m) * But it's too painful operation... */ *mp = sbcreatecontrol((caddr_t)hbh, hbhlen, - IPV6_HOPOPTS, IPPROTO_IPV6); + IPV6_HOPOPTS, IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; m_freem(ext); @@ -1108,8 +1095,8 @@ ip6_savecontrol(in6p, mp, ip6, m) /* IPV6_DSTOPTS and IPV6_RTHDR socket options */ if (in6p->in6p_flags & (IN6P_DSTOPTS | IN6P_RTHDR)) { - struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); - int nxt = ip6->ip6_nxt, off = sizeof(struct ip6_hdr); + struct ip6_hdr *xip6 = mtod(m, struct ip6_hdr *); + int nxt = xip6->ip6_nxt, off = sizeof(struct ip6_hdr); /* * Search for destination options headers or routing @@ -1159,17 +1146,8 @@ ip6_savecontrol(in6p, mp, ip6, m) if (!in6p->in6p_flags & IN6P_DSTOPTS) break; - /* - * We also require super-user privilege for - * the option. - * See the comments on IN6_HOPOPTS. - */ - if (!privileged) - break; - *mp = sbcreatecontrol((caddr_t)ip6e, elen, - IPV6_DSTOPTS, - IPPROTO_IPV6); + IPV6_DSTOPTS, IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; break; @@ -1179,8 +1157,7 @@ ip6_savecontrol(in6p, mp, ip6, m) break; *mp = sbcreatecontrol((caddr_t)ip6e, elen, - IPV6_RTHDR, - IPPROTO_IPV6); + IPV6_RTHDR, IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; break; @@ -1355,7 +1332,7 @@ ip6_nexthdr(m, off, proto, nxtp) if (m->m_pkthdr.len < off + sizeof(fh)) return -1; m_copydata(m, off, sizeof(fh), (caddr_t)&fh); - if ((ntohs(fh.ip6f_offlg) & IP6F_OFF_MASK) != 0) + if ((fh.ip6f_offlg & IP6F_OFF_MASK) != 0) return -1; if (nxtp) *nxtp = fh.ip6f_nxt; @@ -1441,127 +1418,233 @@ u_char inet6ctlerrmap[PRC_NCMDS] = { ENOPROTOOPT }; -int -ip6_sysctl(name, namelen, oldp, oldlenp, newp, newlen) - int *name; - u_int namelen; - void *oldp; - size_t *oldlenp; - void *newp; - size_t newlen; +SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, "sysctl net.inet6.ip6 subtree setup") { - int old, error; - /* All sysctl names at this level are terminal. */ - if (namelen != 1) - return ENOTDIR; - - switch (name[0]) { - - case IPV6CTL_FORWARDING: - return sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_forwarding); - case IPV6CTL_SENDREDIRECTS: - return sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_sendredirects); - case IPV6CTL_DEFHLIM: - return sysctl_int(oldp, oldlenp, newp, newlen, &ip6_defhlim); - case IPV6CTL_MAXFRAGPACKETS: - return sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_maxfragpackets); - case IPV6CTL_ACCEPT_RTADV: - return sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_accept_rtadv); - case IPV6CTL_KEEPFAITH: - return sysctl_int(oldp, oldlenp, newp, newlen, &ip6_keepfaith); - case IPV6CTL_LOG_INTERVAL: - return sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_log_interval); - case IPV6CTL_HDRNESTLIMIT: - return sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_hdrnestlimit); - case IPV6CTL_DAD_COUNT: - return sysctl_int(oldp, oldlenp, newp, newlen, &ip6_dad_count); - case IPV6CTL_AUTO_FLOWLABEL: - return sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_auto_flowlabel); - case IPV6CTL_DEFMCASTHLIM: - return sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_defmcasthlim); + sysctl_createv(clog, 0, NULL, NULL, + 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", + SYSCTL_DESCR("PF_INET6 related settings"), + NULL, 0, NULL, 0, + CTL_NET, PF_INET6, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "ip6", + SYSCTL_DESCR("IPv6 related settings"), + NULL, 0, NULL, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, CTL_EOL); + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "forwarding", + SYSCTL_DESCR("Enable forwarding of INET6 datagrams"), + NULL, 0, &ip6_forwarding, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_FORWARDING, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "redirect", + SYSCTL_DESCR("Enable sending of ICMPv6 redirect messages"), + NULL, 0, &ip6_sendredirects, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_SENDREDIRECTS, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "hlim", + SYSCTL_DESCR("Hop limit for an INET6 datagram"), + NULL, 0, &ip6_defhlim, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_DEFHLIM, CTL_EOL); +#ifdef notyet + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "mtu", NULL, + NULL, 0, &, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_DEFMTU, CTL_EOL); +#endif +#ifdef __no_idea__ + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "forwsrcrt", NULL, + NULL, 0, &?, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_FORWSRCRT, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_STRUCT, "stats", NULL, + NULL, 0, &?, sizeof(?), + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_STATS, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_STRUCT, "mrtstats", NULL, + NULL, 0, &?, sizeof(?), + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_MRTSTATS, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_?, "mrtproto", NULL, + NULL, 0, &?, sizeof(?), + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_MRTPROTO, CTL_EOL); +#endif + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "maxfragpackets", + SYSCTL_DESCR("Maximum number of fragments to buffer " + "for reassembly"), + NULL, 0, &ip6_maxfragpackets, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_MAXFRAGPACKETS, CTL_EOL); +#ifdef __no_idea__ + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "sourcecheck", NULL, + NULL, 0, &?, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_SOURCECHECK, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "sourcecheck_logint", NULL, + NULL, 0, &?, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_SOURCECHECK_LOGINT, CTL_EOL); +#endif + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "accept_rtadv", + SYSCTL_DESCR("Accept router advertisements"), + NULL, 0, &ip6_accept_rtadv, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_ACCEPT_RTADV, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "keepfaith", + SYSCTL_DESCR("Activate faith interface"), + NULL, 0, &ip6_keepfaith, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_KEEPFAITH, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "log_interval", + SYSCTL_DESCR("Minumum interval between logging " + "unroutable packets"), + NULL, 0, &ip6_log_interval, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_LOG_INTERVAL, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "hdrnestlimit", + SYSCTL_DESCR("Maximum number of nested IPv6 headers"), + NULL, 0, &ip6_hdrnestlimit, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_HDRNESTLIMIT, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "dad_count", + SYSCTL_DESCR("Number of Duplicate Address Detection " + "probes to send"), + NULL, 0, &ip6_dad_count, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_DAD_COUNT, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "auto_flowlabel", + SYSCTL_DESCR("Assign random IPv6 flow labels"), + NULL, 0, &ip6_auto_flowlabel, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_AUTO_FLOWLABEL, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "defmcasthlim", + SYSCTL_DESCR("Default multicast hop limit"), + NULL, 0, &ip6_defmcasthlim, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_DEFMCASTHLIM, CTL_EOL); #if NGIF > 0 - case IPV6CTL_GIF_HLIM: - return sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_gif_hlim); -#endif - case IPV6CTL_KAME_VERSION: - return sysctl_rdstring(oldp, oldlenp, newp, __KAME_VERSION); - case IPV6CTL_USE_DEPRECATED: - return sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_use_deprecated); - case IPV6CTL_RR_PRUNE: - return sysctl_int(oldp, oldlenp, newp, newlen, &ip6_rr_prune); - case IPV6CTL_V6ONLY: -#ifdef INET6_BINDV6ONLY - return sysctl_rdint(oldp, oldlenp, newp, ip6_v6only); -#else - return sysctl_int(oldp, oldlenp, newp, newlen, &ip6_v6only); -#endif - case IPV6CTL_ANONPORTMIN: - old = ip6_anonportmin; - error = sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_anonportmin); - if (ip6_anonportmin >= ip6_anonportmax || ip6_anonportmin < 0 || - ip6_anonportmin > 65535 + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "gifhlim", + SYSCTL_DESCR("Default hop limit for a gif tunnel datagram"), + NULL, 0, &ip6_gif_hlim, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_GIF_HLIM, CTL_EOL); +#endif /* NGIF */ + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_STRING, "kame_version", + SYSCTL_DESCR("KAME Version"), + NULL, 0, __UNCONST(__KAME_VERSION), 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_KAME_VERSION, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "use_deprecated", + SYSCTL_DESCR("Allow use of deprecated addresses as " + "source addresses"), + NULL, 0, &ip6_use_deprecated, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_USE_DEPRECATED, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "rr_prune", NULL, + NULL, 0, &ip6_rr_prune, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_RR_PRUNE, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT +#ifndef INET6_BINDV6ONLY + |CTLFLAG_READWRITE, +#endif + CTLTYPE_INT, "v6only", + SYSCTL_DESCR("Disallow PF_INET6 sockets from connecting " + "to PF_INET sockets"), + NULL, 0, &ip6_v6only, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_V6ONLY, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "anonportmin", + SYSCTL_DESCR("Lowest ephemeral port number to assign"), + sysctl_net_inet_ip_ports, 0, &ip6_anonportmin, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_ANONPORTMIN, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "anonportmax", + SYSCTL_DESCR("Highest ephemeral port number to assign"), + sysctl_net_inet_ip_ports, 0, &ip6_anonportmax, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_ANONPORTMAX, CTL_EOL); #ifndef IPNOPRIVPORTS - || ip6_anonportmin < IPV6PORT_RESERVED -#endif - ) { - ip6_anonportmin = old; - return (EINVAL); - } - return (error); - case IPV6CTL_ANONPORTMAX: - old = ip6_anonportmax; - error = sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_anonportmax); - if (ip6_anonportmin >= ip6_anonportmax || ip6_anonportmax < 0 || - ip6_anonportmax > 65535 -#ifndef IPNOPRIVPORTS - || ip6_anonportmax < IPV6PORT_RESERVED -#endif - ) { - ip6_anonportmax = old; - return (EINVAL); - } - return (error); -#ifndef IPNOPRIVPORTS - case IPV6CTL_LOWPORTMIN: - old = ip6_lowportmin; - error = sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_lowportmin); - if (ip6_lowportmin >= ip6_lowportmax || - ip6_lowportmin > IPV6PORT_RESERVEDMAX || - ip6_lowportmin < IPV6PORT_RESERVEDMIN) { - ip6_lowportmin = old; - return (EINVAL); - } - return (error); - case IPV6CTL_LOWPORTMAX: - old = ip6_lowportmax; - error = sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_lowportmax); - if (ip6_lowportmin >= ip6_lowportmax || - ip6_lowportmax > IPV6PORT_RESERVEDMAX || - ip6_lowportmax < IPV6PORT_RESERVEDMIN) { - ip6_lowportmax = old; - return (EINVAL); - } - return (error); -#endif - case IPV6CTL_MAXFRAGS: - return sysctl_int(oldp, oldlenp, newp, newlen, &ip6_maxfrags); - default: - return EOPNOTSUPP; - } - /* NOTREACHED */ + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "lowportmin", + SYSCTL_DESCR("Lowest privileged ephemeral port number " + "to assign"), + sysctl_net_inet_ip_ports, 0, &ip6_lowportmin, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_LOWPORTMIN, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "lowportmax", + SYSCTL_DESCR("Highest privileged ephemeral port number " + "to assign"), + sysctl_net_inet_ip_ports, 0, &ip6_lowportmax, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_LOWPORTMAX, CTL_EOL); +#endif /* IPNOPRIVPORTS */ + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "maxfrags", + SYSCTL_DESCR("Maximum fragments in reassembly queue"), + NULL, 0, &ip6_maxfrags, 0, + CTL_NET, PF_INET6, IPPROTO_IPV6, + IPV6CTL_MAXFRAGS, CTL_EOL); }