Start adding new style sysctl here too.

8 files changed, 74 insertions, 13 deletions

diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 4e38754..6d3c2f0 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_proto.c	8.2 (Berkeley) 2/9/95
- *	$Id: in_proto.c,v 1.18 1995/09/21 17:58:07 wollman Exp $
+ *	$Id: in_proto.c,v 1.19 1995/10/26 20:30:42 julian Exp $
  */
 
 #include <sys/param.h>
@@ -41,6 +41,7 @@
 #include <sys/domain.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
+#include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/radix.h>
@@ -179,6 +180,14 @@ struct domain inetdomain =
 
 DOMAIN_SET(inet);
 
+SYSCTL_NODE(_net,PF_INET,	   inet,CTLFLAG_RW,0,	"InterNet Protocols");
+
+SYSCTL_NODE(_net_inet,IPPROTO_IP,  ip,	CTLFLAG_RW,0,	"IP");
+SYSCTL_NODE(_net_inet,IPPROTO_ICMP,icmp,CTLFLAG_RW,0,	"ICMP");
+SYSCTL_NODE(_net_inet,IPPROTO_UDP, udp,	CTLFLAG_RW,0,	"UDP");
+SYSCTL_NODE(_net_inet,IPPROTO_TCP, tcp,	CTLFLAG_RW,0,	"TCP");
+SYSCTL_NODE(_net_inet,IPPROTO_IGMP,igmp,CTLFLAG_RW,0,	"IGMP");
+
 #include "imp.h"
 #if NIMP > 0
 extern	struct domain impdomain;
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index fe9216d..cd8738b 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: in_rmx.c,v 1.16 1995/09/18 15:51:32 wollman Exp $
+ * $Id: in_rmx.c,v 1.17 1995/10/29 15:32:28 phk Exp $
  */
 
 /*
@@ -45,6 +45,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
@@ -146,10 +147,21 @@ in_matroute(void *v_arg, struct radix_node_head *head)
 	return rn;
 }
 
-/* MIB variables: net.inet.ip.{rtexpire,rtmaxcache,rtminexpire}. */
-int rtq_reallyold = 60*60;	/* one hour is ``really old'' */
-int rtq_toomany = 128;		/* 128 cached routes is ``too many'' */
-int rtq_minreallyold = 10;	/* never automatically crank down to less */
+int rtq_reallyold = 60*60;
+	/* one hour is ``really old'' */
+SYSCTL_INT(_net_inet_ip, IPCTL_RTEXPIRE, rtexpire,
+	CTLFLAG_RW, &rtq_reallyold , 0, "");
+				   
+int rtq_minreallyold = 10;
+	/* never automatically crank down to less */
+SYSCTL_INT(_net_inet_ip, IPCTL_RTMINEXPIRE, rtminexpire,
+	CTLFLAG_RW, &rtq_minreallyold , 0, "");
+				   
+int rtq_toomany = 128;
+	/* 128 cached routes is ``too many'' */
+SYSCTL_INT(_net_inet_ip, IPCTL_RTMAXCACHE, rtmaxcache,
+	CTLFLAG_RW, &rtq_toomany , 0, "");
+				   
 
 /*
  * On last reference drop, mark the route as belong to us so that it can be
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index c64d398..771e57c 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,12 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.30 1995/10/13 16:00:25 wollman Exp $
+ *	$Id: tcp_input.c,v 1.31 1995/11/03 22:31:54 olah Exp $
  */
 
 #ifndef TUBA_INCLUDE
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
@@ -70,6 +72,8 @@ int	tcprexmtthresh = 3;
 tcp_seq	tcp_iss;
 tcp_cc	tcp_ccgen;
 struct	tcpstat tcpstat;
+SYSCTL_STRUCT(_net_inet_tcp, TCPCTL_STATS, stats,
+	CTLFLAG_RD, &tcpstat , tcpstat, "");
 u_long	tcp_now;
 struct inpcbhead tcb;
 struct inpcbinfo tcbinfo;
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index c64d398..771e57c 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,12 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.30 1995/10/13 16:00:25 wollman Exp $
+ *	$Id: tcp_input.c,v 1.31 1995/11/03 22:31:54 olah Exp $
  */
 
 #ifndef TUBA_INCLUDE
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
@@ -70,6 +72,8 @@ int	tcprexmtthresh = 3;
 tcp_seq	tcp_iss;
 tcp_cc	tcp_ccgen;
 struct	tcpstat tcpstat;
+SYSCTL_STRUCT(_net_inet_tcp, TCPCTL_STATS, stats,
+	CTLFLAG_RD, &tcpstat , tcpstat, "");
 u_long	tcp_now;
 struct inpcbhead tcb;
 struct inpcbinfo tcbinfo;
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index b0b75b8..591fb40 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,12 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.19 1995/10/12 17:37:24 wollman Exp $
+ *	$Id: tcp_subr.c,v 1.20 1995/10/16 18:21:20 wollman Exp $
  */
 
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
@@ -67,9 +69,17 @@
 
 /* patchable/settable parameters for tcp */
 int 	tcp_mssdflt = TCP_MSS;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_MSSDFLT, mssdflt,
+	CTLFLAG_RW, &tcp_mssdflt , 0, "");
 int 	tcp_rttdflt = TCPTV_SRTTDFLT / PR_SLOWHZ;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_RTTDFLT, rttdflt,
+	CTLFLAG_RW, &tcp_rttdflt , 0, "");
 int	tcp_do_rfc1323 = 1;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1323, rfc1323,
+	CTLFLAG_RW, &tcp_do_rfc1323 , 0, "");
 int	tcp_do_rfc1644 = 1;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1644, rfc1644,
+	CTLFLAG_RW, &tcp_do_rfc1644 , 0, "");
 static	void tcp_cleartaocache(void);
 
 /*
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index bfab342..4db44cf 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,12 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_timer.c,v 1.9 1995/10/03 16:54:17 wollman Exp $
+ *	$Id: tcp_timer.c,v 1.10 1995/11/03 22:19:50 olah Exp $
  */
 
 #ifndef TUBA_INCLUDE
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
@@ -63,7 +65,13 @@
 #include <netinet/tcpip.h>
 
 int	tcp_keepidle = TCPTV_KEEP_IDLE;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPIDLE, keepidle,
+	CTLFLAG_RW, &tcp_keepidle , 0, "");
+
 int	tcp_keepintvl = TCPTV_KEEPINTVL;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPINTVL, keepintvl,
+	CTLFLAG_RW, &tcp_keepintvl , 0, "");
+
 int	tcp_keepcnt = TCPTV_KEEPCNT;		/* max idle probes */
 int	tcp_maxpersistidle = TCPTV_KEEP_IDLE;	/* max idle time in persist */
 int	tcp_maxidle;
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index b0b75b8..591fb40 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -31,12 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.19 1995/10/12 17:37:24 wollman Exp $
+ *	$Id: tcp_subr.c,v 1.20 1995/10/16 18:21:20 wollman Exp $
  */
 
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
@@ -67,9 +69,17 @@
 
 /* patchable/settable parameters for tcp */
 int 	tcp_mssdflt = TCP_MSS;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_MSSDFLT, mssdflt,
+	CTLFLAG_RW, &tcp_mssdflt , 0, "");
 int 	tcp_rttdflt = TCPTV_SRTTDFLT / PR_SLOWHZ;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_RTTDFLT, rttdflt,
+	CTLFLAG_RW, &tcp_rttdflt , 0, "");
 int	tcp_do_rfc1323 = 1;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1323, rfc1323,
+	CTLFLAG_RW, &tcp_do_rfc1323 , 0, "");
 int	tcp_do_rfc1644 = 1;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1644, rfc1644,
+	CTLFLAG_RW, &tcp_do_rfc1644 , 0, "");
 static	void tcp_cleartaocache(void);
 
 /*
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 1b05f16..e5cbd66 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,12 +31,13 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id: tcp_usrreq.c,v 1.17 1995/10/29 21:30:25 olah Exp $
+ *	$Id: tcp_usrreq.c,v 1.18 1995/11/03 22:08:11 olah Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
@@ -45,7 +46,6 @@
 #include <sys/errno.h>
 #include <sys/stat.h>
 #include <vm/vm.h>
-#include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -592,7 +592,11 @@ tcp_ctloutput(op, so, level, optname, mp)
  * be set by the route).
  */
 u_long	tcp_sendspace = 1024*16;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_SENDSPACE, sendspace,
+	CTLFLAG_RW, &tcp_sendspace , 0, "");
 u_long	tcp_recvspace = 1024*16;
+SYSCTL_INT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace,
+	CTLFLAG_RW, &tcp_recvspace , 0, "");
 
 /*
  * Attach TCP protocol to socket, allocating