Source-Changes-HG archive

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

[src/trunk]: src/sys/netinet Enable SCTP sysctl nodes.



details:   https://anonhg.NetBSD.org/src/rev/d87d73a24fd2
branches:  trunk
changeset: 834168:d87d73a24fd2
user:      rjs <rjs%NetBSD.org@localhost>
date:      Tue Jul 31 16:28:56 2018 +0000

description:
Enable SCTP sysctl nodes.

Rename auto asconf one to match FreeBSD.

diffstat:

 sys/netinet/sctp_usrreq.c |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r 084114f4a44c -r d87d73a24fd2 sys/netinet/sctp_usrreq.c
--- a/sys/netinet/sctp_usrreq.c Tue Jul 31 16:07:46 2018 +0000
+++ b/sys/netinet/sctp_usrreq.c Tue Jul 31 16:28:56 2018 +0000
@@ -1,5 +1,5 @@
 /*     $KAME: sctp_usrreq.c,v 1.50 2005/06/16 20:45:29 jinmei Exp $    */
-/*     $NetBSD: sctp_usrreq.c,v 1.11 2018/07/31 13:36:31 rjs Exp $     */
+/*     $NetBSD: sctp_usrreq.c,v 1.12 2018/07/31 16:28:56 rjs Exp $     */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_usrreq.c,v 1.11 2018/07/31 13:36:31 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_usrreq.c,v 1.12 2018/07/31 16:28:56 rjs Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -131,12 +131,16 @@
 unsigned int sctp_path_rtx_max_default = SCTP_DEF_MAX_SEND/2;
 unsigned int sctp_nr_outgoing_streams_default = SCTP_OSTREAM_INITIAL;
 
+static void sysctl_net_inet_sctp_setup(struct sysctllog **);
+
 void
 sctp_init(void)
 {
        /* Init the SCTP pcb in sctp_pcb.c */
        u_long sb_max_adj;
 
+       sysctl_net_inet_sctp_setup(NULL);
+
        sctp_pcb_init();
 
        if (nmbclusters > SCTP_ASOC_MAX_CHUNKS_ON_QUEUE)
@@ -3882,7 +3886,8 @@
 /*
  * Sysctl for sctp variables.
  */
-SYSCTL_SETUP(sysctl_net_inet_sctp_setup, "sysctl net.inet.sctp subtree setup")
+static void
+sysctl_net_inet_sctp_setup(struct sysctllog **clog)
 {
 
        sysctl_createv(clog, 0, NULL, NULL,
@@ -3920,7 +3925,7 @@
 
        sysctl_createv(clog, 0, NULL, NULL,
                        CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
-                       CTLTYPE_INT, "autoasconf",
+                       CTLTYPE_INT, "auto_asconf",
                        SYSCTL_DESCR("Enable SCTP Auto-ASCONF"),
                        NULL, 0, &sctp_auto_asconf, 0,
                        CTL_NET, PF_INET, IPPROTO_SCTP, SCTPCTL_AUTOASCONF,



Home | Main Index | Thread Index | Old Index