aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/conf/NOTES8
-rw-r--r--sys/i386/conf/LINT8
-rw-r--r--sys/i386/conf/NOTES8
-rw-r--r--sys/netinet/ip_input.c17
-rw-r--r--sys/netipx/ipx_input.c30
-rw-r--r--sys/netipx/ipx_proto.c10
6 files changed, 27 insertions, 54 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 48fd42b0e8c9..98e6bfdd7938 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.230 1995/12/29 02:04:20 jkh Exp $
+# $Id: LINT,v 1.231 1995/12/29 12:51:09 bde Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -187,11 +187,6 @@ options HDLC #X.25 link layer for serial lines
# 4.2BSD. This option should not be used unless you have a 4.2BSD
# machine and TCP connections fail.
#
-# GATEWAY allows the machine to forward packets, and also configures
-# larger static sizes of a number of system tables. It is largely
-# replaced by the more dynamic behavior of
-# sysctl -w net.inet.ip.forwarding=1
-#
# MROUTING enables the kernel multicast packet forwarder, which works
# with mrouted(8).
#
@@ -203,7 +198,6 @@ options HDLC #X.25 link layer for serial lines
# TCPDEBUG is undocumented.
#
options "TCP_COMPAT_42" #emulate 4.2BSD TCP bugs
-options GATEWAY #internetwork gateway
options MROUTING # Multicast routing
options IPFIREWALL #firewall
options IPFIREWALL_VERBOSE #print information about
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 48fd42b0e8c9..98e6bfdd7938 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.230 1995/12/29 02:04:20 jkh Exp $
+# $Id: LINT,v 1.231 1995/12/29 12:51:09 bde Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -187,11 +187,6 @@ options HDLC #X.25 link layer for serial lines
# 4.2BSD. This option should not be used unless you have a 4.2BSD
# machine and TCP connections fail.
#
-# GATEWAY allows the machine to forward packets, and also configures
-# larger static sizes of a number of system tables. It is largely
-# replaced by the more dynamic behavior of
-# sysctl -w net.inet.ip.forwarding=1
-#
# MROUTING enables the kernel multicast packet forwarder, which works
# with mrouted(8).
#
@@ -203,7 +198,6 @@ options HDLC #X.25 link layer for serial lines
# TCPDEBUG is undocumented.
#
options "TCP_COMPAT_42" #emulate 4.2BSD TCP bugs
-options GATEWAY #internetwork gateway
options MROUTING # Multicast routing
options IPFIREWALL #firewall
options IPFIREWALL_VERBOSE #print information about
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 48fd42b0e8c9..98e6bfdd7938 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.230 1995/12/29 02:04:20 jkh Exp $
+# $Id: LINT,v 1.231 1995/12/29 12:51:09 bde Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -187,11 +187,6 @@ options HDLC #X.25 link layer for serial lines
# 4.2BSD. This option should not be used unless you have a 4.2BSD
# machine and TCP connections fail.
#
-# GATEWAY allows the machine to forward packets, and also configures
-# larger static sizes of a number of system tables. It is largely
-# replaced by the more dynamic behavior of
-# sysctl -w net.inet.ip.forwarding=1
-#
# MROUTING enables the kernel multicast packet forwarder, which works
# with mrouted(8).
#
@@ -203,7 +198,6 @@ options HDLC #X.25 link layer for serial lines
# TCPDEBUG is undocumented.
#
options "TCP_COMPAT_42" #emulate 4.2BSD TCP bugs
-options GATEWAY #internetwork gateway
options MROUTING # Multicast routing
options IPFIREWALL #firewall
options IPFIREWALL_VERBOSE #print information about
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 50a2fd32bc0c..5543bb92e678 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ip_input.c 8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.32 1995/12/20 18:04:19 wollman Exp $
+ * $Id: ip_input.c,v 1.33 1995/12/21 21:12:22 wollman Exp $
*/
#include <sys/param.h>
@@ -67,22 +67,11 @@ int rsvp_on = 0;
static int ip_rsvp_on;
struct socket *ip_rsvpd;
-#ifndef IPFORWARDING
-#ifdef GATEWAY
-#define IPFORWARDING 1 /* forward IP packets not for us */
-#else /* GATEWAY */
-#define IPFORWARDING 0 /* don't forward IP packets not for us */
-#endif /* GATEWAY */
-#endif /* IPFORWARDING */
-#ifndef IPSENDREDIRECTS
-#define IPSENDREDIRECTS 1
-#endif
-
-static int ipforwarding = IPFORWARDING;
+static int ipforwarding = 0;
SYSCTL_INT(_net_inet_ip, IPCTL_FORWARDING, forwarding, CTLFLAG_RW,
&ipforwarding, 0, "");
-static int ipsendredirects = IPSENDREDIRECTS;
+static int ipsendredirects = 1; /* XXX */
SYSCTL_INT(_net_inet_ip, IPCTL_SENDREDIRECTS, redirect, CTLFLAG_RW,
&ipsendredirects, 0, "");
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index 3b77ac42521c..c93235de07f6 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -33,7 +33,7 @@
*
* @(#)ipx_input.c
*
- * $Id: ipx_input.c,v 1.5 1995/11/24 11:43:52 bde Exp $
+ * $Id: ipx_input.c,v 1.6 1995/12/16 02:14:33 bde Exp $
*/
#include <sys/param.h>
@@ -47,6 +47,7 @@
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/kernel.h>
+#include <sys/sysctl.h>
#include <net/if.h>
#include <net/route.h>
@@ -60,29 +61,22 @@
#include <netipx/ipx_var.h>
#include <netipx/ipx_error.h>
-#ifndef IPXFORWARDING
-#ifdef GATEWAY
-#define IPXFORWARDING 1 /* forward IPX packets not for us */
-#else
-#define IPXFORWARDING 0 /* don't forward IPX packets not for us */
-#endif
-#endif
#ifndef IPXPRINTFS
#define IPXPRINTFS 1 /* printing forwarding information */
#endif
-#ifndef IPXCKSUM
-#define IPXCKSUM 0 /* perform IPX checksum */
-#endif
-
-#ifndef IXDONOSOCKS
-#define IPXDONOSOCKS 0 /* return no socket errors */
-#endif
+int ipxcksum = 0;
+SYSCTL_INT(_net_ipx_ipx, OID_AUTO, checksum, CTLFLAG_RW,
+ &ipxcksum, 0, "");
-int ipxcksum = IPXCKSUM;
int ipxprintfs = IPXPRINTFS;
-int ipxdonosocks = IPXDONOSOCKS;
-int ipxforwarding = IPXFORWARDING;
+int ipxdonosocks = 0;
+SYSCTL_INT(_net_ipx_ipx, OID_AUTO, donosocks, CTLFLAG_RW,
+ &ipxdonosocks, 0, "");
+
+int ipxforwarding = 0;
+SYSCTL_INT(_net_ipx_ipx, OID_AUTO, ipxforwarding, CTLFLAG_RW,
+ &ipxforwarding, 0, "");
union ipx_host ipx_thishost;
union ipx_net ipx_zeronet;
diff --git a/sys/netipx/ipx_proto.c b/sys/netipx/ipx_proto.c
index fc20d32c27e4..476445553c8b 100644
--- a/sys/netipx/ipx_proto.c
+++ b/sys/netipx/ipx_proto.c
@@ -33,7 +33,7 @@
*
* @(#)ipx_proto.c
*
- * $Id: ipx_proto.c,v 1.2 1995/10/31 23:36:36 julian Exp $
+ * $Id: ipx_proto.c,v 1.3 1995/11/04 09:03:18 julian Exp $
*/
#include <sys/param.h>
@@ -42,6 +42,7 @@
#include <sys/domain.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
+#include <sys/sysctl.h>
#include <net/radix.h>
@@ -100,3 +101,10 @@ struct domain ipxdomain =
rn_inithead, 16, sizeof(struct sockaddr_ipx)};
DOMAIN_SET(ipx);
+SYSCTL_NODE(_net, PF_IPX, ipx, CTLFLAG_RW, 0,
+ "IPX/SPX");
+
+SYSCTL_NODE(_net_ipx, IPXPROTO_RAW, ipx, CTLFLAG_RW, 0, "IPX");
+SYSCTL_NODE(_net_ipx, IPXPROTO_SPX, spx, CTLFLAG_RW, 0, "SPX");
+SYSCTL_NODE(_net_ipx, IPXPROTO_ERROR, error, CTLFLAG_RW, 0,
+ "Error Protocol");
generated by cgit v1.3 (git 2.53.0) at 2026-08-05 05:11:47 +0000