From 4de3747b897fc473f20d051046b8d71a6f0bb57c Mon Sep 17 00:00:00 2001 From: atatat Date: Tue, 25 May 2004 04:33:59 +0000 Subject: [PATCH] Sysctl descriptions under net subtree (net.key not done) --- sys/kern/uipc_domain.c | 7 ++- sys/net/bpf.c | 10 ++-- sys/net/if.c | 19 ++++--- sys/net/rtsock.c | 10 ++-- sys/net80211/ieee80211.c | 10 ++-- sys/net80211/ieee80211_rssadapt.c | 11 ++-- sys/netinet/if_arp.c | 19 ++++--- sys/netinet/ip_icmp.c | 25 +++++--- sys/netinet/ip_input.c | 79 ++++++++++++++++++-------- sys/netinet/tcp_usrreq.c | 94 +++++++++++++++++++++---------- sys/netinet/udp_usrreq.c | 16 ++++-- sys/netinet6/icmp6.c | 55 +++++++++++------- sys/netinet6/ip6_input.c | 77 +++++++++++++++++-------- sys/netinet6/ipsec.c | 77 +++++++++++++++++-------- sys/netinet6/udp6_usrreq.c | 13 +++-- 15 files changed, 350 insertions(+), 172 deletions(-) diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 615c50aea72b..a71359bda76f 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_domain.c,v 1.47 2004/04/22 01:01:40 matt Exp $ */ +/* $NetBSD: uipc_domain.c,v 1.48 2004/05/25 04:33:59 atatat Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.47 2004/04/22 01:01:40 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.48 2004/05/25 04:33:59 atatat Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -215,7 +215,8 @@ SYSCTL_SETUP(sysctl_net_setup, "sysctl net subtree setup") sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "local", NULL, + CTLTYPE_NODE, "local", + SYSCTL_DESCR("PF_LOCAL related settings"), NULL, 0, NULL, 0, CTL_NET, PF_LOCAL, CTL_EOL); diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 44c428915a97..6e6ee9ec8817 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1,4 +1,4 @@ -/* $NetBSD: bpf.c,v 1.97 2004/05/19 13:09:11 darrenr Exp $ */ +/* $NetBSD: bpf.c,v 1.98 2004/05/25 04:33:59 atatat Exp $ */ /* * Copyright (c) 1990, 1991, 1993 @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.97 2004/05/19 13:09:11 darrenr Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.98 2004/05/25 04:33:59 atatat Exp $"); #include "bpfilter.h" @@ -1676,13 +1676,15 @@ SYSCTL_SETUP(sysctl_net_bfp_setup, "sysctl net.bpf subtree setup") node = NULL; sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "bpf", NULL, + CTLTYPE_NODE, "bpf", + SYSCTL_DESCR("BPF options"), NULL, 0, NULL, 0, CTL_NET, CTL_CREATE, CTL_EOL); if (node != NULL) sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "maxbufsize", NULL, + CTLTYPE_INT, "maxbufsize", + SYSCTL_DESCR("Maximum size for data capture buffer"), sysctl_net_bpf_maxbufsize, 0, &bpf_maxbufsize, 0, CTL_NET, node->sysctl_num, CTL_CREATE, CTL_EOL); } diff --git a/sys/net/if.c b/sys/net/if.c index 59f127c6f472..1992da23f21e 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $NetBSD: if.c,v 1.141 2004/04/22 01:01:40 matt Exp $ */ +/* $NetBSD: if.c,v 1.142 2004/05/25 04:33:59 atatat Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.141 2004/04/22 01:01:40 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.142 2004/05/25 04:33:59 atatat Exp $"); #include "opt_inet.h" @@ -1729,30 +1729,35 @@ sysctl_net_ifq_setup(struct sysctllog **clog, CTL_NET, pf, ipn, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "ifq", NULL, + CTLTYPE_NODE, "ifq", + SYSCTL_DESCR("Protocol input queue controls"), NULL, 0, NULL, 0, CTL_NET, pf, ipn, qid, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_INT, "len", NULL, + CTLTYPE_INT, "len", + SYSCTL_DESCR("Current input queue length"), NULL, 0, &ifq->ifq_len, 0, CTL_NET, pf, ipn, qid, IFQCTL_LEN, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "maxlen", NULL, + CTLTYPE_INT, "maxlen", + SYSCTL_DESCR("Maximum allowed input queue length"), NULL, 0, &ifq->ifq_maxlen, 0, CTL_NET, pf, ipn, qid, IFQCTL_MAXLEN, CTL_EOL); #ifdef notyet sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_INT, "peak", NULL, + CTLTYPE_INT, "peak", + SYSCTL_DESCR("Highest input queue length"), NULL, 0, &ifq->ifq_peak, 0, CTL_NET, pf, ipn, qid, IFQCTL_PEAK, CTL_EOL); #endif sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_INT, "drops", NULL, + CTLTYPE_INT, "drops", + SYSCTL_DESCR("Packets dropped due to full input queue"), NULL, 0, &ifq->ifq_drops, 0, CTL_NET, pf, ipn, qid, IFQCTL_DROPS, CTL_EOL); } diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index dcc4841fd195..500427e35024 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtsock.c,v 1.70 2004/04/22 01:01:40 matt Exp $ */ +/* $NetBSD: rtsock.c,v 1.71 2004/05/25 04:33:59 atatat Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.70 2004/04/22 01:01:40 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.71 2004/05/25 04:33:59 atatat Exp $"); #include "opt_inet.h" @@ -1112,12 +1112,14 @@ SYSCTL_SETUP(sysctl_net_route_setup, "sysctl net.route subtree setup") sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "route", NULL, + CTLTYPE_NODE, "route", + SYSCTL_DESCR("PF_ROUTE information"), NULL, 0, NULL, 0, CTL_NET, PF_ROUTE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "rtable", NULL, + CTLTYPE_NODE, "rtable", + SYSCTL_DESCR("Routing table information"), sysctl_rtable, 0, NULL, 0, CTL_NET, PF_ROUTE, 0 /* any protocol */, CTL_EOL); } diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 40ec09590215..d67c7928c281 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -1,4 +1,4 @@ -/* $NetBSD: ieee80211.c,v 1.14 2004/05/09 09:00:05 dyoung Exp $ */ +/* $NetBSD: ieee80211.c,v 1.15 2004/05/25 04:33:59 atatat Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting @@ -35,7 +35,7 @@ #ifdef __FreeBSD__ __FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.11 2004/04/02 20:19:20 sam Exp $"); #else -__KERNEL_RCSID(0, "$NetBSD: ieee80211.c,v 1.14 2004/05/09 09:00:05 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ieee80211.c,v 1.15 2004/05/25 04:33:59 atatat Exp $"); #endif /* @@ -978,7 +978,8 @@ SYSCTL_SETUP(sysctl_ieee80211, "sysctl ieee80211 subtree setup") /* control debugging printfs */ if ((rc = sysctl_createv(clog, 0, &rnode, &cnode, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, - "debug", NULL, sysctl_ieee80211_verify, 0, &ieee80211_debug, 0, + "debug", SYSCTL_DESCR("Enable IEEE 802.11 debugging output"), + sysctl_ieee80211_verify, 0, &ieee80211_debug, 0, CTL_CREATE, CTL_EOL)) != 0) goto err; @@ -989,7 +990,8 @@ SYSCTL_SETUP(sysctl_ieee80211, "sysctl ieee80211 subtree setup") /* control inactivity timer */ if ((rc = sysctl_createv(clog, 0, &rnode, &cnode, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, - "maxinact", NULL, sysctl_ieee80211_verify, 0, &ieee80211_inact_max, + "maxinact", SYSCTL_DESCR("Station inactivity timeout"), + sysctl_ieee80211_verify, 0, &ieee80211_inact_max, 0, CTL_CREATE, CTL_EOL)) != 0) goto err; diff --git a/sys/net80211/ieee80211_rssadapt.c b/sys/net80211/ieee80211_rssadapt.c index 73c2da88ca81..2c66ca759896 100644 --- a/sys/net80211/ieee80211_rssadapt.c +++ b/sys/net80211/ieee80211_rssadapt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ieee80211_rssadapt.c,v 1.6 2004/05/06 07:11:40 dyoung Exp $ */ +/* $NetBSD: ieee80211_rssadapt.c,v 1.7 2004/05/25 04:33:59 atatat Exp $ */ /*- * Copyright (c) 2003, 2004 David Young. All rights reserved. * @@ -171,14 +171,16 @@ SYSCTL_SETUP(sysctl_ieee80211_rssadapt, goto err; if ((rc = sysctl_createv(clog, 0, &node, &node, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "rssadapt", NULL, + CTLFLAG_PERMANENT, CTLTYPE_NODE, "rssadapt", + SYSCTL_DESCR("Received Signal Strength adaptation controls"), NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) goto err; #ifdef IEEE80211_DEBUG /* control debugging printfs */ if ((rc = sysctl_createv(clog, 0, &node, NULL, - CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "debug", NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "debug", + SYSCTL_DESCR("Enable RSS adaptation debugging output"), sysctl_ieee80211_rssadapt_debug, 0, &ieee80211_rssadapt_debug, 0, CTL_CREATE, CTL_EOL)) != 0) goto err; @@ -187,7 +189,8 @@ SYSCTL_SETUP(sysctl_ieee80211_rssadapt, /* control rate of decay for exponential averages */ if ((rc = sysctl_createv(clog, 0, &node, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_STRUCT, - "expavgctl", NULL, sysctl_ieee80211_rssadapt_expavgctl, 0, + "expavgctl", SYSCTL_DESCR("RSS exponential averaging control"), + sysctl_ieee80211_rssadapt_expavgctl, 0, &master_expavgctl, sizeof(master_expavgctl), CTL_CREATE, CTL_EOL)) != 0) goto err; diff --git a/sys/netinet/if_arp.c b/sys/netinet/if_arp.c index 5a1eacd5ae52..3420a1955601 100644 --- a/sys/netinet/if_arp.c +++ b/sys/netinet/if_arp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_arp.c,v 1.97 2004/04/28 14:09:36 ragge Exp $ */ +/* $NetBSD: if_arp.c,v 1.98 2004/05/25 04:33:59 atatat Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -75,7 +75,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.97 2004/04/28 14:09:36 ragge Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.98 2004/05/25 04:33:59 atatat Exp $"); #include "opt_ddb.h" #include "opt_inet.h" @@ -1523,31 +1523,36 @@ SYSCTL_SETUP(sysctl_net_inet_arp_setup, "sysctl net.inet.arp subtree setup") CTL_NET, PF_INET, CTL_EOL); sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "arp", NULL, + CTLTYPE_NODE, "arp", + SYSCTL_DESCR("Address Resolution Protocol"), NULL, 0, NULL, 0, CTL_NET, PF_INET, CTL_CREATE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "prune", NULL, + CTLTYPE_INT, "prune", + SYSCTL_DESCR("ARP cache pruning interval"), NULL, 0, &arpt_prune, 0, CTL_NET,PF_INET, node->sysctl_num, CTL_CREATE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "keep", NULL, + CTLTYPE_INT, "keep", + SYSCTL_DESCR("Valid ARP entry lifetime"), NULL, 0, &arpt_keep, 0, CTL_NET,PF_INET, node->sysctl_num, CTL_CREATE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "down", NULL, + CTLTYPE_INT, "down", + SYSCTL_DESCR("Failed ARP entry lifetime"), NULL, 0, &arpt_down, 0, CTL_NET,PF_INET, node->sysctl_num, CTL_CREATE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "refresh", NULL, + CTLTYPE_INT, "refresh", + SYSCTL_DESCR("ARP entry refresh interval"), NULL, 0, &arpt_refresh, 0, CTL_NET,PF_INET, node->sysctl_num, CTL_CREATE, CTL_EOL); } diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index ffb2c4aa6e19..c18f43893b7d 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1,4 +1,4 @@ -/* $NetBSD: ip_icmp.c,v 1.83 2004/04/26 01:31:56 matt Exp $ */ +/* $NetBSD: ip_icmp.c,v 1.84 2004/05/25 04:33:59 atatat Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -101,7 +101,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.83 2004/04/26 01:31:56 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.84 2004/05/25 04:33:59 atatat Exp $"); #include "opt_ipsec.h" @@ -964,38 +964,47 @@ SYSCTL_SETUP(sysctl_net_inet_icmp_setup, "sysctl net.inet.icmp subtree setup") CTL_NET, PF_INET, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "icmp", NULL, + CTLTYPE_NODE, "icmp", + SYSCTL_DESCR("ICMPv4 related settings"), NULL, 0, NULL, 0, CTL_NET, PF_INET, IPPROTO_ICMP, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "maskrepl", NULL, + CTLTYPE_INT, "maskrepl", + SYSCTL_DESCR("Respond to ICMP_MASKREQ messages"), NULL, 0, &icmpmaskrepl, 0, CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_MASKREPL, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "returndatabytes", NULL, + CTLTYPE_INT, "returndatabytes", + SYSCTL_DESCR("Number of bytes to return in an ICMP " + "error message"), sysctl_net_inet_icmp_returndatabytes, 0, &icmpreturndatabytes, 0, CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_RETURNDATABYTES, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "errppslimit", NULL, + CTLTYPE_INT, "errppslimit", + SYSCTL_DESCR("Maximum number of outgoing ICMP error " + "messages per second"), NULL, 0, &icmperrppslim, 0, CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_ERRPPSLIMIT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "rediraccept", NULL, + CTLTYPE_INT, "rediraccept", + SYSCTL_DESCR("Accept ICMP_REDIRECT messages"), NULL, 0, &icmp_rediraccept, 0, CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_REDIRACCEPT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "redirtimeout", NULL, + CTLTYPE_INT, "redirtimeout", + SYSCTL_DESCR("Lifetime of ICMP_REDIRECT generated " + "routes"), sysctl_net_inet_icmp_redirtimeout, 0, &icmp_redirtimeout, 0, CTL_NET, PF_INET, IPPROTO_ICMP, diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 8284d7d29fad..66b3ecad843a 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.202 2004/05/02 05:02:53 darrenr Exp $ */ +/* $NetBSD: ip_input.c,v 1.203 2004/05/25 04:34:00 atatat Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -98,7 +98,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.202 2004/05/02 05:02:53 darrenr Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.203 2004/05/25 04:34:00 atatat Exp $"); #include "opt_inet.h" #include "opt_gateway.h" @@ -2154,107 +2154,126 @@ SYSCTL_SETUP(sysctl_net_inet_ip_setup, "sysctl net.inet.ip subtree setup") CTL_NET, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "inet", NULL, + CTLTYPE_NODE, "inet", + SYSCTL_DESCR("PF_INET related settings"), NULL, 0, NULL, 0, CTL_NET, PF_INET, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "ip", NULL, + CTLTYPE_NODE, "ip", + SYSCTL_DESCR("IPv4 related settings"), NULL, 0, NULL, 0, CTL_NET, PF_INET, IPPROTO_IP, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "forwarding", NULL, + CTLTYPE_INT, "forwarding", + SYSCTL_DESCR("Enable forwarding of INET datagrams"), NULL, 0, &ipforwarding, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_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 ICMP redirect messages"), NULL, 0, &ipsendredirects, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_SENDREDIRECTS, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "ttl", NULL, + CTLTYPE_INT, "ttl", + SYSCTL_DESCR("Default TTL for an INET datagram"), NULL, 0, &ip_defttl, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_DEFTTL, CTL_EOL); #ifdef IPCTL_DEFMTU sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT /* |CTLFLAG_READWRITE? */, - CTLTYPE_INT, "mtu", NULL, + CTLTYPE_INT, "mtu", + SYSCTL_DESCR("Default MTA for an INET route"), NULL, 0, &ip_mtu, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_DEFMTU, CTL_EOL); #endif /* IPCTL_DEFMTU */ sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READONLY1, - CTLTYPE_INT, "forwsrcrt", NULL, + CTLTYPE_INT, "forwsrcrt", + SYSCTL_DESCR("Enable forwarding of source-routed " + "datagrams"), NULL, 0, &ip_forwsrcrt, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_FORWSRCRT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "directed-broadcast", NULL, + CTLTYPE_INT, "directed-broadcast", + SYSCTL_DESCR("Enable forwarding of broadcast datagrams"), NULL, 0, &ip_directedbcast, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_DIRECTEDBCAST, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "allowsrcrt", NULL, + CTLTYPE_INT, "allowsrcrt", + SYSCTL_DESCR("Accept source-routed datagrams"), NULL, 0, &ip_allowsrcrt, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_ALLOWSRCRT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "subnetsarelocal", NULL, + CTLTYPE_INT, "subnetsarelocal", + SYSCTL_DESCR("Whether logical subnets are considered " + "local"), NULL, 0, &subnetsarelocal, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_SUBNETSARELOCAL, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "mtudisc", NULL, + CTLTYPE_INT, "mtudisc", + SYSCTL_DESCR("Use RFC1191 Path MTU Discovery"), NULL, 0, &ip_mtudisc, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_MTUDISC, 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, &anonportmin, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_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, &anonportmax, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_ANONPORTMAX, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "mtudisctimeout", NULL, + CTLTYPE_INT, "mtudisctimeout", + SYSCTL_DESCR("Lifetime of a Path MTU Discovered route"), sysctl_net_inet_ip_pmtudto, 0, &ip_mtudisc_timeout, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_MTUDISCTIMEOUT, CTL_EOL); #ifdef GATEWAY sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "maxflows", NULL, + CTLTYPE_INT, "maxflows", + SYSCTL_DESCR("Number of flows for fast forwarding"), sysctl_net_inet_ip_maxflows, 0, &ip_maxflows, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_MAXFLOWS, CTL_EOL); #endif /* GATEWAY */ sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "hostzerobroadcast", NULL, + CTLTYPE_INT, "hostzerobroadcast", + SYSCTL_DESCR("All zeroes address is broadcast address"), NULL, 0, &hostzeroisbroadcast, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_HOSTZEROBROADCAST, CTL_EOL); #if NGIF > 0 sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "gifttl", NULL, + CTLTYPE_INT, "gifttl", + SYSCTL_DESCR("Default TTL for a gif tunnel datagram"), NULL, 0, &ip_gif_ttl, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_GIF_TTL, CTL_EOL); @@ -2262,40 +2281,50 @@ SYSCTL_SETUP(sysctl_net_inet_ip_setup, "sysctl net.inet.ip subtree setup") #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, &lowportmin, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_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, &lowportmax, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_LOWPORTMAX, CTL_EOL); #endif /* IPNOPRIVPORTS */ sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "maxfragpackets", NULL, + CTLTYPE_INT, "maxfragpackets", + SYSCTL_DESCR("Maximum number of fragments to retain for " + "possible reassembly"), NULL, 0, &ip_maxfragpackets, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_MAXFRAGPACKETS, CTL_EOL); #if NGRE > 0 sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "grettl", NULL, + CTLTYPE_INT, "grettl", + SYSCTL_DESCR("Default TTL for a gre tunnel datagram"), NULL, 0, &ip_gre_ttl, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_GRE_TTL, CTL_EOL); #endif /* NGRE */ sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "checkinterface", NULL, + CTLTYPE_INT, "checkinterface", + SYSCTL_DESCR("Enable receive side of Strong ES model " + "from RFC1122"), NULL, 0, &ip_checkinterface, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_CHECKINTERFACE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "random_id", NULL, + CTLTYPE_INT, "random_id", + SYSCTL_DESCR("Assign random ip_id values"), NULL, 0, &ip_do_randomid, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_RANDOMID, CTL_EOL); diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 0f0c0d5e5817..f93f0658afa5 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_usrreq.c,v 1.91 2004/05/18 14:44:16 itojun Exp $ */ +/* $NetBSD: tcp_usrreq.c,v 1.92 2004/05/25 04:34:00 atatat Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -98,7 +98,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.91 2004/05/18 14:44:16 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.92 2004/05/25 04:34:00 atatat Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -1207,124 +1207,155 @@ sysctl_net_inet_tcp_setup2(struct sysctllog **clog, int pf, const char *pfname, CTL_NET, pf, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, tcpname, NULL, + CTLTYPE_NODE, tcpname, + SYSCTL_DESCR("TCP related settings"), NULL, 0, NULL, 0, CTL_NET, pf, IPPROTO_TCP, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "rfc1323", NULL, + CTLTYPE_INT, "rfc1323", + SYSCTL_DESCR("Enable RFC1323 TCP extensions"), NULL, 0, &tcp_do_rfc1323, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_RFC1323, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "sendspace", NULL, + CTLTYPE_INT, "sendspace", + SYSCTL_DESCR("Default TCP send buffer size"), NULL, 0, &tcp_sendspace, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_SENDSPACE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "recvspace", NULL, + CTLTYPE_INT, "recvspace", + SYSCTL_DESCR("Default TCP receive buffer size"), NULL, 0, &tcp_recvspace, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_RECVSPACE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "mssdflt", NULL, + CTLTYPE_INT, "mssdflt", + SYSCTL_DESCR("Default maximum segment size"), sysctl_net_inet_tcp_mssdflt, 0, &tcp_mssdflt, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_MSSDFLT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "syn_cache_limit", NULL, + CTLTYPE_INT, "syn_cache_limit", + SYSCTL_DESCR("Maximum number of entries in the TCP " + "compressed state engine"), NULL, 0, &tcp_syn_cache_limit, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_SYN_CACHE_LIMIT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "syn_bucket_limit", NULL, + CTLTYPE_INT, "syn_bucket_limit", + SYSCTL_DESCR("Maximum number of entries per hash " + "bucket in the TCP compressed state " + "engine"), NULL, 0, &tcp_syn_bucket_limit, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_SYN_BUCKET_LIMIT, CTL_EOL); #if 0 /* obsoleted */ sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "syn_cache_interval", NULL, + CTLTYPE_INT, "syn_cache_interval", + SYSCTL_DESCR("TCP compressed state engine's timer interval"), NULL, 0, &tcp_syn_cache_interval, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_SYN_CACHE_INTER, CTL_EOL); #endif sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "init_win", NULL, + CTLTYPE_INT, "init_win", + SYSCTL_DESCR("Initial TCP congestion window"), NULL, 0, &tcp_init_win, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_INIT_WIN, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "mss_ifmtu", NULL, + CTLTYPE_INT, "mss_ifmtu", + SYSCTL_DESCR("Use interface MTU for calculating MSS"), NULL, 0, &tcp_mss_ifmtu, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_MSS_IFMTU, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "sack", NULL, + CTLTYPE_INT, "sack", + SYSCTL_DESCR("Enable RFC2018 Selection ACKnowledgement " + "(not implemented)"), NULL, 0, &tcp_do_sack, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_SACK, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "win_scale", NULL, + CTLTYPE_INT, "win_scale", + SYSCTL_DESCR("Use RFC1323 window scale options"), NULL, 0, &tcp_do_win_scale, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_WSCALE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "timestamps", NULL, + CTLTYPE_INT, "timestamps", + SYSCTL_DESCR("Use RFC1323 time stamp options"), NULL, 0, &tcp_do_timestamps, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_TSTAMP, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "compat_42", NULL, + CTLTYPE_INT, "compat_42", + SYSCTL_DESCR("Enable workarounds for 4.2BSD TCP bugs"), NULL, 0, &tcp_compat_42, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_COMPAT_42, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "cwm", NULL, + CTLTYPE_INT, "cwm", + SYSCTL_DESCR("Hughes/Touch/Heidemann Congestion Window " + "Monitoring"), NULL, 0, &tcp_cwm, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_CWM, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "cwm_burstsize", NULL, + CTLTYPE_INT, "cwm_burstsize", + SYSCTL_DESCR("Congestion Window Monitoring allowed " + "burst count in packets"), NULL, 0, &tcp_cwm_burstsize, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_CWM_BURSTSIZE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "ack_on_push", NULL, + CTLTYPE_INT, "ack_on_push", + SYSCTL_DESCR("Immediately return ACK when PSH is " + "received"), NULL, 0, &tcp_ack_on_push, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_ACK_ON_PUSH, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "keepidle", NULL, + CTLTYPE_INT, "keepidle", + SYSCTL_DESCR("Allowed connection idle ticks before a " + "keepalive probe is sent"), NULL, 0, &tcp_keepidle, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_KEEPIDLE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "keepintvl", NULL, + CTLTYPE_INT, "keepintvl", + SYSCTL_DESCR("Ticks before next keepalive probe is sent"), NULL, 0, &tcp_keepintvl, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_KEEPINTVL, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "keepcnt", NULL, + CTLTYPE_INT, "keepcnt", + SYSCTL_DESCR("Number of keepalive probes to send"), NULL, 0, &tcp_keepcnt, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_KEEPCNT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE, - CTLTYPE_INT, "slowhz", NULL, + CTLTYPE_INT, "slowhz", + SYSCTL_DESCR("Keepalive ticks per second"), NULL, PR_SLOWHZ, NULL, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_SLOWHZ, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "newreno", NULL, + CTLTYPE_INT, "newreno", + SYSCTL_DESCR("NewReno congestion control algorithm"), NULL, 0, &tcp_do_newreno, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_NEWRENO, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "log_refused", NULL, + CTLTYPE_INT, "log_refused", + SYSCTL_DESCR("Log refused TCP connections"), NULL, 0, &tcp_log_refused, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_LOG_REFUSED, CTL_EOL); #if 0 /* obsoleted */ @@ -1336,23 +1367,28 @@ sysctl_net_inet_tcp_setup2(struct sysctllog **clog, int pf, const char *pfname, #endif sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "rstppslimit", NULL, + CTLTYPE_INT, "rstppslimit", + SYSCTL_DESCR("Maximum number of RST packets to send " + "per second"), NULL, 0, &tcp_rst_ppslim, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_RSTPPSLIMIT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "delack_ticks", NULL, + CTLTYPE_INT, "delack_ticks", + SYSCTL_DESCR("Number of ticks to delay sending an ACK"), NULL, 0, &tcp_delack_ticks, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_DELACK_TICKS, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "init_win_local", NULL, + CTLTYPE_INT, "init_win_local", + SYSCTL_DESCR("Initial TCP window size (in segments)"), NULL, 0, &tcp_init_win_local, 0, CTL_NET, pf, IPPROTO_TCP, TCPCTL_INIT_WIN_LOCAL, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_STRUCT, "ident", NULL, + CTLTYPE_STRUCT, "ident", + SYSCTL_DESCR("RFC1413 Identification Protocol lookups"), sysctl_net_inet_tcp_ident, 0, NULL, sizeof(uid_t), CTL_NET, pf, IPPROTO_TCP, TCPCTL_IDENT, CTL_EOL); } diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 1808d7b3033b..4b3fe55f9586 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $NetBSD: udp_usrreq.c,v 1.121 2004/05/07 00:55:15 jonathan Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.122 2004/05/25 04:34:00 atatat Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.121 2004/05/07 00:55:15 jonathan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.122 2004/05/25 04:34:00 atatat Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -1089,25 +1089,29 @@ SYSCTL_SETUP(sysctl_net_inet_udp_setup, "sysctl net.inet.udp subtree setup") CTL_NET, PF_INET, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "udp", NULL, + CTLTYPE_NODE, "udp", + SYSCTL_DESCR("UDPv4 related settings"), NULL, 0, NULL, 0, CTL_NET, PF_INET, IPPROTO_UDP, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "checksum", NULL, + CTLTYPE_INT, "checksum", + SYSCTL_DESCR("Compute and check UDP checksums"), NULL, 0, &udpcksum, 0, CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_CHECKSUM, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "sendspace", NULL, + CTLTYPE_INT, "sendspace", + SYSCTL_DESCR("Default UDP send buffer size"), NULL, 0, &udp_sendspace, 0, CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_SENDSPACE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "recvspace", NULL, + CTLTYPE_INT, "recvspace", + SYSCTL_DESCR("Default UDP receive buffer size"), NULL, 0, &udp_recvspace, 0, CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_RECVSPACE, CTL_EOL); diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 72ebfe657f14..4457aa92339e 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $NetBSD: icmp6.c,v 1.106 2004/03/26 03:35:02 itojun Exp $ */ +/* $NetBSD: icmp6.c,v 1.107 2004/05/25 04:34:00 atatat Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.106 2004/03/26 03:35:02 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.107 2004/05/25 04:34:00 atatat Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -2867,25 +2867,29 @@ SYSCTL_SETUP(sysctl_net_inet6_icmp6_setup, CTL_NET, PF_INET6, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "icmp6", NULL, + CTLTYPE_NODE, "icmp6", + SYSCTL_DESCR("ICMPv6 related settings"), NULL, 0, NULL, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_STRUCT, "stats", NULL, + CTLTYPE_STRUCT, "stats", + SYSCTL_DESCR("ICMPv6 transmission statistics"), NULL, 0, &icmp6stat, sizeof(icmp6stat), CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_STATS, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "rediraccept", NULL, + CTLTYPE_INT, "rediraccept", + SYSCTL_DESCR("Accept and process redirect messages"), NULL, 0, &icmp6_rediraccept, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_REDIRACCEPT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "redirtimeout", NULL, + CTLTYPE_INT, "redirtimeout", + SYSCTL_DESCR("Redirect generated route lifetime"), NULL, 0, &icmp6_redirtimeout, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_REDIRTIMEOUT, CTL_EOL); @@ -2899,31 +2903,36 @@ SYSCTL_SETUP(sysctl_net_inet6_icmp6_setup, #endif sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "nd6_prune", NULL, + CTLTYPE_INT, "nd6_prune", + SYSCTL_DESCR("Neighbor discovery prune interval"), NULL, 0, &nd6_prune, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_PRUNE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "nd6_delay", NULL, + CTLTYPE_INT, "nd6_delay", + SYSCTL_DESCR("First probe delay time"), NULL, 0, &nd6_delay, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_DELAY, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "nd6_umaxtries", NULL, + CTLTYPE_INT, "nd6_umaxtries", + SYSCTL_DESCR("Number of unicast discovery attempts"), NULL, 0, &nd6_umaxtries, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_UMAXTRIES, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "nd6_mmaxtries", NULL, + CTLTYPE_INT, "nd6_mmaxtries", + SYSCTL_DESCR("Number of multicast discovery attempts"), NULL, 0, &nd6_mmaxtries, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_MMAXTRIES, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "nd6_useloopback", NULL, + CTLTYPE_INT, "nd6_useloopback", + SYSCTL_DESCR("Use loopback interface for local traffic"), NULL, 0, &nd6_useloopback, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_USELOOPBACK, CTL_EOL); @@ -2937,49 +2946,57 @@ SYSCTL_SETUP(sysctl_net_inet6_icmp6_setup, #endif sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "nodeinfo", NULL, + CTLTYPE_INT, "nodeinfo", + SYSCTL_DESCR("Respond to node information requests"), NULL, 0, &icmp6_nodeinfo, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_NODEINFO, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "errppslimit", NULL, + CTLTYPE_INT, "errppslimit", + SYSCTL_DESCR("Maximum ICMP errors sent per second"), NULL, 0, &icmp6errppslim, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ERRPPSLIMIT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "nd6_maxnudhint", NULL, + CTLTYPE_INT, "nd6_maxnudhint", + SYSCTL_DESCR("Maximum neighbor unreachable hint count"), NULL, 0, &nd6_maxnudhint, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_MAXNUDHINT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "mtudisc_hiwat", NULL, + CTLTYPE_INT, "mtudisc_hiwat", + SYSCTL_DESCR("Low mark on MTU Discovery route timers"), NULL, 0, &icmp6_mtudisc_hiwat, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_MTUDISC_HIWAT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "mtudisc_lowat", NULL, + CTLTYPE_INT, "mtudisc_lowat", + SYSCTL_DESCR("Low mark on MTU Discovery route timers"), NULL, 0, &icmp6_mtudisc_lowat, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_MTUDISC_LOWAT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "nd6_debug", NULL, + CTLTYPE_INT, "nd6_debug", + SYSCTL_DESCR("Enable neighbor discovery debug output"), NULL, 0, &nd6_debug, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_DEBUG, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_STRUCT, "nd6_drlist", NULL, + CTLTYPE_STRUCT, "nd6_drlist", + SYSCTL_DESCR("Default router list"), sysctl_net_inet6_icmp6_nd6, 0, NULL, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_DRLIST, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_STRUCT, "nd6_prlist", NULL, + CTLTYPE_STRUCT, "nd6_prlist", + SYSCTL_DESCR("Prefix list"), sysctl_net_inet6_icmp6_nd6, 0, NULL, 0, CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_PRLIST, CTL_EOL); diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index cc56eab489da..85a9cc1b5317 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -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.74 2004/05/25 04:34:00 atatat 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.74 2004/05/25 04:34:00 atatat Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -1445,30 +1445,35 @@ SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, "sysctl net.inet6.ip6 subtree 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, "sysctl net.inet6.ip6 subtree 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, "sysctl net.inet6.ip6 subtree 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, "sysctl net.inet6.ip6 subtree 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); diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c index d74da7192a7b..4e1f6edc0f3b 100644 --- a/sys/netinet6/ipsec.c +++ b/sys/netinet6/ipsec.c @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec.c,v 1.96 2004/04/20 17:12:03 itojun Exp $ */ +/* $NetBSD: ipsec.c,v 1.97 2004/05/25 04:34:01 atatat Exp $ */ /* $KAME: ipsec.c,v 1.136 2002/05/19 00:36:39 itojun Exp $ */ /* @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.96 2004/04/20 17:12:03 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.97 2004/05/25 04:34:01 atatat Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -3624,43 +3624,54 @@ SYSCTL_SETUP(sysctl_net_inet_ipsec_setup, "sysctl net.inet.ipsec subtree setup") CTL_NET, PF_INET, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "ipsec", NULL, + CTLTYPE_NODE, "ipsec", + SYSCTL_DESCR("IPv4 related IPSec settings"), NULL, 0, NULL, 0, CTL_NET, PF_INET, IPPROTO_AH, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_STRUCT, "stats", NULL, + CTLTYPE_STRUCT, "stats", + SYSCTL_DESCR("IPSec statistics and counters"), NULL, 0, &ipsecstat, sizeof(ipsecstat), CTL_NET, PF_INET, IPPROTO_AH, IPSECCTL_STATS, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "def_policy", NULL, + CTLTYPE_INT, "def_policy", + SYSCTL_DESCR("Default action for non-IPSec packets"), sysctl_ipsec, 0, &ip4_def_policy, 0, CTL_NET, PF_INET, IPPROTO_AH, IPSECCTL_DEF_POLICY, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "esp_trans_deflev", NULL, + CTLTYPE_INT, "esp_trans_deflev", + SYSCTL_DESCR("Default required security level for " + "transport mode traffic"), sysctl_ipsec, 0, &ip4_esp_trans_deflev, 0, CTL_NET, PF_INET, IPPROTO_AH, IPSECCTL_DEF_ESP_TRANSLEV, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "esp_net_deflev", NULL, + CTLTYPE_INT, "esp_net_deflev", + SYSCTL_DESCR("Default required security level for " + "tunneled traffic"), sysctl_ipsec, 0, &ip4_esp_net_deflev, 0, CTL_NET, PF_INET, IPPROTO_AH, IPSECCTL_DEF_ESP_NETLEV, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "ah_trans_deflev", NULL, + CTLTYPE_INT, "ah_trans_deflev", + SYSCTL_DESCR("Default required security level for " + "transport mode headers"), sysctl_ipsec, 0, &ip4_ah_trans_deflev, 0, CTL_NET, PF_INET, IPPROTO_AH, IPSECCTL_DEF_AH_TRANSLEV, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "ah_net_deflev", NULL, + CTLTYPE_INT, "ah_net_deflev", + SYSCTL_DESCR("Default required security level for " + "tunneled headers"), sysctl_ipsec, 0, &ip4_ah_net_deflev, 0, CTL_NET, PF_INET, IPPROTO_AH, IPSECCTL_DEF_AH_NETLEV, CTL_EOL); @@ -3674,31 +3685,38 @@ SYSCTL_SETUP(sysctl_net_inet_ipsec_setup, "sysctl net.inet.ipsec subtree setup") #endif sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "ah_cleartos", NULL, + CTLTYPE_INT, "ah_cleartos", + SYSCTL_DESCR("Clear IP TOS field before calculating AH"), NULL, 0, &ip4_ah_cleartos, 0, CTL_NET, PF_INET, IPPROTO_AH, IPSECCTL_AH_CLEARTOS, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "ah_offsetmask", NULL, + CTLTYPE_INT, "ah_offsetmask", + SYSCTL_DESCR("Mask for IP fragment offset field when " + "calculating AH"), NULL, 0, &ip4_ah_offsetmask, 0, CTL_NET, PF_INET, IPPROTO_AH, IPSECCTL_AH_OFFSETMASK, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "dfbit", NULL, + CTLTYPE_INT, "dfbit", + SYSCTL_DESCR("IP header DF bit setting for tunneled " + "traffic"), NULL, 0, &ip4_ipsec_dfbit, 0, CTL_NET, PF_INET, IPPROTO_AH, IPSECCTL_DFBIT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "ecn", NULL, + CTLTYPE_INT, "ecn", + SYSCTL_DESCR("Behavior of ECN for tunneled traffic"), NULL, 0, &ip4_ipsec_ecn, 0, CTL_NET, PF_INET, IPPROTO_AH, IPSECCTL_ECN, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "debug", NULL, + CTLTYPE_INT, "debug", + SYSCTL_DESCR("Enable IPSec debugging output"), NULL, 0, &ipsec_debug, 0, CTL_NET, PF_INET, IPPROTO_AH, IPSECCTL_DEBUG, CTL_EOL); @@ -3752,55 +3770,68 @@ SYSCTL_SETUP(sysctl_net_inet6_ipsec6_setup, CTL_NET, PF_INET6, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "ipsec6", NULL, + CTLTYPE_NODE, "ipsec6", + SYSCTL_DESCR("IPv6 related IPSec settings"), NULL, 0, NULL, 0, CTL_NET, PF_INET6, IPPROTO_AH, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_STRUCT, "stats", NULL, + CTLTYPE_STRUCT, "stats", + SYSCTL_DESCR("IPSec statistics and counters"), NULL, 0, &ipsec6stat, sizeof(ipsec6stat), CTL_NET, PF_INET6, IPPROTO_AH, IPSECCTL_STATS, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "def_policy", NULL, + CTLTYPE_INT, "def_policy", + SYSCTL_DESCR("Default action for non-IPSec packets"), sysctl_ipsec, 0, &ip6_def_policy, 0, CTL_NET, PF_INET6, IPPROTO_AH, IPSECCTL_DEF_POLICY, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "esp_trans_deflev", NULL, + CTLTYPE_INT, "esp_trans_deflev", + SYSCTL_DESCR("Default required security level for " + "transport mode traffic"), sysctl_ipsec, 0, &ip6_esp_trans_deflev, 0, CTL_NET, PF_INET6, IPPROTO_AH, IPSECCTL_DEF_ESP_TRANSLEV, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "esp_net_deflev", NULL, + CTLTYPE_INT, "esp_net_deflev", + SYSCTL_DESCR("Default required security level for " + "tunneled traffic"), sysctl_ipsec, 0, &ip6_esp_net_deflev, 0, CTL_NET, PF_INET6, IPPROTO_AH, IPSECCTL_DEF_ESP_NETLEV, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "ah_trans_deflev", NULL, + CTLTYPE_INT, "ah_trans_deflev", + SYSCTL_DESCR("Default required security level for " + "transport mode headers"), sysctl_ipsec, 0, &ip6_ah_trans_deflev, 0, CTL_NET, PF_INET6, IPPROTO_AH, IPSECCTL_DEF_AH_TRANSLEV, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "ah_net_deflev", NULL, + CTLTYPE_INT, "ah_net_deflev", + SYSCTL_DESCR("Default required security level for " + "tunneled headers"), sysctl_ipsec, 0, &ip6_ah_net_deflev, 0, CTL_NET, PF_INET6, IPPROTO_AH, IPSECCTL_DEF_AH_NETLEV, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "ecn", NULL, + CTLTYPE_INT, "ecn", + SYSCTL_DESCR("Behavior of ECN for tunneled traffic"), NULL, 0, &ip6_ipsec_ecn, 0, CTL_NET, PF_INET6, IPPROTO_AH, IPSECCTL_ECN, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "debug", NULL, + CTLTYPE_INT, "debug", + SYSCTL_DESCR("Enable IPSec debugging output"), NULL, 0, &ipsec_debug, 0, CTL_NET, PF_INET6, IPPROTO_AH, IPSECCTL_DEBUG, CTL_EOL); diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index b03490c9f5cf..6f39c7c0e2d4 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -1,4 +1,4 @@ -/* $NetBSD: udp6_usrreq.c,v 1.62 2004/03/24 15:34:55 atatat Exp $ */ +/* $NetBSD: udp6_usrreq.c,v 1.63 2004/05/25 04:34:01 atatat Exp $ */ /* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.62 2004/03/24 15:34:55 atatat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.63 2004/05/25 04:34:01 atatat Exp $"); #include #include @@ -426,19 +426,22 @@ SYSCTL_SETUP(sysctl_net_inet6_udp6_setup, "sysctl net.inet6.udp6 subtree setup") CTL_NET, PF_INET6, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "udp6", NULL, + CTLTYPE_NODE, "udp6", + SYSCTL_DESCR("UDPv6 related settings"), NULL, 0, NULL, 0, CTL_NET, PF_INET6, IPPROTO_UDP, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "sendspace", NULL, + CTLTYPE_INT, "sendspace", + SYSCTL_DESCR("Default UDP send buffer size"), NULL, 0, &udp6_sendspace, 0, CTL_NET, PF_INET6, IPPROTO_UDP, UDP6CTL_SENDSPACE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "recvspace", NULL, + CTLTYPE_INT, "recvspace", + SYSCTL_DESCR("Default UDP receive buffer size"), NULL, 0, &udp6_recvspace, 0, CTL_NET, PF_INET6, IPPROTO_UDP, UDP6CTL_RECVSPACE, CTL_EOL);