Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Revert the change that made kern.file2 and net.*.*.pcbli...



details:   https://anonhg.NetBSD.org/src/rev/8b2b411a112a
branches:  trunk
changeset: 574740:8b2b411a112a
user:      atatat <atatat%NetBSD.org@localhost>
date:      Fri Mar 11 06:16:15 2005 +0000

description:
Revert the change that made kern.file2 and net.*.*.pcblist into nodes
instead of structs.  It had other deleterious side-effects that are
rather nasty.  Another solution must be found.

diffstat:

 sys/kern/init_sysctl.c     |  6 +++---
 sys/netinet/raw_ip.c       |  6 +++---
 sys/netinet/tcp_usrreq.c   |  6 +++---
 sys/netinet/udp_usrreq.c   |  6 +++---
 sys/netinet6/raw_ip6.c     |  6 +++---
 sys/netinet6/udp6_usrreq.c |  6 +++---
 sys/sys/sysctl.h           |  4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)

diffs (180 lines):

diff -r 7d782278117d -r 8b2b411a112a sys/kern/init_sysctl.c
--- a/sys/kern/init_sysctl.c    Fri Mar 11 04:18:47 2005 +0000
+++ b/sys/kern/init_sysctl.c    Fri Mar 11 06:16:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: init_sysctl.c,v 1.35 2005/03/10 05:43:31 atatat Exp $ */
+/*     $NetBSD: init_sysctl.c,v 1.36 2005/03/11 06:16:15 atatat Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.35 2005/03/10 05:43:31 atatat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.36 2005/03/11 06:16:15 atatat Exp $");
 
 #include "opt_sysv.h"
 #include "opt_multiprocessor.h"
@@ -723,7 +723,7 @@
                       CTL_KERN, KERN_DRIVERS, CTL_EOL);
        sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT,
-                      CTLTYPE_NODE, "file2",
+                      CTLTYPE_STRUCT, "file2",
                       SYSCTL_DESCR("System open file table"),
                       sysctl_kern_file2, 0, NULL, 0,
                       CTL_KERN, KERN_FILE2, CTL_EOL);
diff -r 7d782278117d -r 8b2b411a112a sys/netinet/raw_ip.c
--- a/sys/netinet/raw_ip.c      Fri Mar 11 04:18:47 2005 +0000
+++ b/sys/netinet/raw_ip.c      Fri Mar 11 06:16:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip.c,v 1.85 2005/03/10 05:43:25 atatat Exp $       */
+/*     $NetBSD: raw_ip.c,v 1.86 2005/03/11 06:16:16 atatat Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.85 2005/03/10 05:43:25 atatat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.86 2005/03/11 06:16:16 atatat Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -689,7 +689,7 @@
 
        sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT,
-                      CTLTYPE_NODE, "pcblist",
+                      CTLTYPE_STRUCT, "pcblist",
                       SYSCTL_DESCR("Raw IPv4 control block list"),
                       sysctl_inpcblist, 0, &rawcbtable, 0,
                       CTL_NET, PF_INET, IPPROTO_RAW,
diff -r 7d782278117d -r 8b2b411a112a sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Fri Mar 11 04:18:47 2005 +0000
+++ b/sys/netinet/tcp_usrreq.c  Fri Mar 11 06:16:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_usrreq.c,v 1.99 2005/03/10 05:49:14 atatat Exp $   */
+/*     $NetBSD: tcp_usrreq.c,v 1.100 2005/03/11 06:16:16 atatat Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -100,7 +100,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.99 2005/03/10 05:49:14 atatat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.100 2005/03/11 06:16:16 atatat Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1569,7 +1569,7 @@
                       CTL_EOL);
        sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT,
-                      CTLTYPE_NODE, "pcblist",
+                      CTLTYPE_STRUCT, "pcblist",
                       SYSCTL_DESCR("TCP protocol control block list"),
                       sysctl_inpcblist, 0, &tcbtable, 0,
                       CTL_NET, pf, IPPROTO_TCP, CTL_CREATE,
diff -r 7d782278117d -r 8b2b411a112a sys/netinet/udp_usrreq.c
--- a/sys/netinet/udp_usrreq.c  Fri Mar 11 04:18:47 2005 +0000
+++ b/sys/netinet/udp_usrreq.c  Fri Mar 11 06:16:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp_usrreq.c,v 1.133 2005/03/10 05:43:26 atatat Exp $  */
+/*     $NetBSD: udp_usrreq.c,v 1.134 2005/03/11 06:16:16 atatat Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.133 2005/03/10 05:43:26 atatat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.134 2005/03/11 06:16:16 atatat Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1336,7 +1336,7 @@
                       CTL_EOL);
        sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT,
-                      CTLTYPE_NODE, "pcblist",
+                      CTLTYPE_STRUCT, "pcblist",
                       SYSCTL_DESCR("UDP protocol control block list"),
                       sysctl_inpcblist, 0, &udbtable, 0,
                       CTL_NET, PF_INET, IPPROTO_UDP, CTL_CREATE,
diff -r 7d782278117d -r 8b2b411a112a sys/netinet6/raw_ip6.c
--- a/sys/netinet6/raw_ip6.c    Fri Mar 11 04:18:47 2005 +0000
+++ b/sys/netinet6/raw_ip6.c    Fri Mar 11 06:16:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip6.c,v 1.70 2005/03/10 05:43:28 atatat Exp $      */
+/*     $NetBSD: raw_ip6.c,v 1.71 2005/03/11 06:16:16 atatat Exp $      */
 /*     $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $        */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.70 2005/03/10 05:43:28 atatat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.71 2005/03/11 06:16:16 atatat Exp $");
 
 #include "opt_ipsec.h"
 
@@ -886,7 +886,7 @@
 
        sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT,
-                      CTLTYPE_NODE, "pcblist",
+                      CTLTYPE_STRUCT, "pcblist",
                       SYSCTL_DESCR("Raw IPv6 control block list"),
                       sysctl_inpcblist, 0, &raw6cbtable, 0,
                       CTL_NET, PF_INET6, IPPROTO_RAW,
diff -r 7d782278117d -r 8b2b411a112a sys/netinet6/udp6_usrreq.c
--- a/sys/netinet6/udp6_usrreq.c        Fri Mar 11 04:18:47 2005 +0000
+++ b/sys/netinet6/udp6_usrreq.c        Fri Mar 11 06:16:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp6_usrreq.c,v 1.66 2005/03/10 05:43:28 atatat Exp $  */
+/*     $NetBSD: udp6_usrreq.c,v 1.67 2005/03/11 06:16:16 atatat Exp $  */
 /*     $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $    */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.66 2005/03/10 05:43:28 atatat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.67 2005/03/11 06:16:16 atatat Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -454,7 +454,7 @@
                       CTL_EOL);
        sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT,
-                      CTLTYPE_NODE, "pcblist",
+                      CTLTYPE_STRUCT, "pcblist",
                       SYSCTL_DESCR("UDP protocol control block list"),
                       sysctl_inpcblist, 0, &udbtable, 0,
                       CTL_NET, PF_INET6, IPPROTO_UDP, CTL_CREATE,
diff -r 7d782278117d -r 8b2b411a112a sys/sys/sysctl.h
--- a/sys/sys/sysctl.h  Fri Mar 11 04:18:47 2005 +0000
+++ b/sys/sys/sysctl.h  Fri Mar 11 06:16:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysctl.h,v 1.132 2005/03/10 05:43:33 atatat Exp $      */
+/*     $NetBSD: sysctl.h,v 1.133 2005/03/11 06:16:16 atatat Exp $      */
 
 /*
  * Copyright (c) 1989, 1993
@@ -349,7 +349,7 @@
        { "root_partition", CTLTYPE_INT}, \
        { "drivers", CTLTYPE_STRUCT }, \
        { "buf", CTLTYPE_NODE }, \
-       { "file2", CTLTYPE_NODE }, \
+       { "file2", CTLTYPE_STRUCT }, \
 }
 
 /*



Home | Main Index | Thread Index | Old Index