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.73 retrieving revision 1.73.2.1 diff -u -p -r1.73 -r1.73.2.1 --- src/sys/netinet6/ip6_input.c 2004/03/24 15:34:54 1.73 +++ src/sys/netinet6/ip6_input.c 2004/05/28 07:23:48 1.73.2.1 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.73 2004/03/24 15:34:54 atatat Exp $ */ +/* $NetBSD: ip6_input.c,v 1.73.2.1 2004/05/28 07:23:48 tron 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.73 2004/03/24 15:34:54 atatat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.73.2.1 2004/05/28 07:23:48 tron Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -1445,30 +1445,35 @@ SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, CTL_NET, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "inet6", NULL, + 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", NULL, + 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", NULL, + 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", NULL, + 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", NULL, + 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); @@ -1508,7 +1513,9 @@ SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, #endif sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "maxfragpackets", NULL, + 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); @@ -1528,63 +1535,76 @@ SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, #endif sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "accept_rtadv", NULL, + 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", NULL, + 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", NULL, + 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", NULL, + 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", NULL, + 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", NULL, + 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", NULL, + 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 sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "gifhlim", NULL, + 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", NULL, + CTLTYPE_STRING, "kame_version", + SYSCTL_DESCR("KAME Version"), NULL, 0, __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", NULL, + 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); @@ -1599,39 +1619,48 @@ SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, #ifndef INET6_BINDV6ONLY |CTLFLAG_READWRITE, #endif - CTLTYPE_INT, "v6only", NULL, + 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", NULL, + 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", NULL, + 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 sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "lowportmin", NULL, + 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", NULL, + 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", NULL, + 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);