summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>1999-10-28 03:34:04 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>1999-10-28 03:34:04 +0000
commit79c42e713453fdcac1a8c490a73f050fbf63f52a (patch)
treebb17ca8a15f1c050f28a0792c9300f2575046f45
parent579901e50c4374a4e7fc2a4909bb8bc0b76b826f (diff)
net.inet.etherip.allow sysctl
-rw-r--r--sbin/sysctl/sysctl.83
-rw-r--r--sbin/sysctl/sysctl.c52
-rw-r--r--usr.sbin/sysctl/sysctl.83
-rw-r--r--usr.sbin/sysctl/sysctl.c52
4 files changed, 104 insertions, 6 deletions
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 8f12a31e677..3982fe8d865 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysctl.8,v 1.30 1999/10/17 19:09:16 aaron Exp $
+.\" $OpenBSD: sysctl.8,v 1.31 1999/10/28 03:34:03 angelos Exp $
.\" $NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
.\"
.\" Copyright (c) 1993
@@ -160,6 +160,7 @@ privilege can change the value.
.It net.inet.icmp.maskrepl integer yes
.It net.inet.icmp.bmcastecho integer yes
.It net.inet.ip4.allow integer yes
+.It net.inet.etherip.allow integer yes
.It net.inet.tcp.rfc1323 integer yes
.It net.inet.tcp.keepinittime integer yes
.It net.inet.tcp.keepidle integer yes
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index f032b09d323..ec37403f599 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysctl.c,v 1.41 1999/09/02 22:04:38 pjanzen Exp $ */
+/* $OpenBSD: sysctl.c,v 1.42 1999/10/28 03:34:03 angelos Exp $ */
/* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)sysctl.c 8.5 (Berkeley) 5/9/95";
#else
-static char *rcsid = "$OpenBSD: sysctl.c,v 1.41 1999/09/02 22:04:38 pjanzen Exp $";
+static char *rcsid = "$OpenBSD: sysctl.c,v 1.42 1999/10/28 03:34:03 angelos Exp $";
#endif
#endif /* not lint */
@@ -64,6 +64,7 @@ static char *rcsid = "$OpenBSD: sysctl.c,v 1.41 1999/09/02 22:04:38 pjanzen Exp
#include <netinet/in_pcb.h>
#include <netinet/ip_icmp.h>
#include <netinet/ip_ip4.h>
+#include <netinet/ip_ether.h>
#include <netinet/ip_ah.h>
#include <netinet/ip_esp.h>
#include <netinet/icmp_var.h>
@@ -919,6 +920,7 @@ struct ctlname tcpname[] = TCPCTL_NAMES;
struct ctlname udpname[] = UDPCTL_NAMES;
struct ctlname espname[] = ESPCTL_NAMES;
struct ctlname ahname[] = AHCTL_NAMES;
+struct ctlname etheripname[] = ETHERIPCTL_NAMES;
struct list inetlist = { inetname, IPPROTO_MAXID };
struct list inetvars[] = {
{ ipname, IPCTL_MAXID }, /* ip */
@@ -973,6 +975,52 @@ struct list inetvars[] = {
{ 0, 0 },
{ espname, ESPCTL_MAXID }, /* esp */
{ ahname, AHCTL_MAXID }, /* ah */
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { etheripname, ETHERIPCTL_MAXID },
};
/*
diff --git a/usr.sbin/sysctl/sysctl.8 b/usr.sbin/sysctl/sysctl.8
index 8f12a31e677..3982fe8d865 100644
--- a/usr.sbin/sysctl/sysctl.8
+++ b/usr.sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysctl.8,v 1.30 1999/10/17 19:09:16 aaron Exp $
+.\" $OpenBSD: sysctl.8,v 1.31 1999/10/28 03:34:03 angelos Exp $
.\" $NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
.\"
.\" Copyright (c) 1993
@@ -160,6 +160,7 @@ privilege can change the value.
.It net.inet.icmp.maskrepl integer yes
.It net.inet.icmp.bmcastecho integer yes
.It net.inet.ip4.allow integer yes
+.It net.inet.etherip.allow integer yes
.It net.inet.tcp.rfc1323 integer yes
.It net.inet.tcp.keepinittime integer yes
.It net.inet.tcp.keepidle integer yes
diff --git a/usr.sbin/sysctl/sysctl.c b/usr.sbin/sysctl/sysctl.c
index f032b09d323..ec37403f599 100644
--- a/usr.sbin/sysctl/sysctl.c
+++ b/usr.sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysctl.c,v 1.41 1999/09/02 22:04:38 pjanzen Exp $ */
+/* $OpenBSD: sysctl.c,v 1.42 1999/10/28 03:34:03 angelos Exp $ */
/* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)sysctl.c 8.5 (Berkeley) 5/9/95";
#else
-static char *rcsid = "$OpenBSD: sysctl.c,v 1.41 1999/09/02 22:04:38 pjanzen Exp $";
+static char *rcsid = "$OpenBSD: sysctl.c,v 1.42 1999/10/28 03:34:03 angelos Exp $";
#endif
#endif /* not lint */
@@ -64,6 +64,7 @@ static char *rcsid = "$OpenBSD: sysctl.c,v 1.41 1999/09/02 22:04:38 pjanzen Exp
#include <netinet/in_pcb.h>
#include <netinet/ip_icmp.h>
#include <netinet/ip_ip4.h>
+#include <netinet/ip_ether.h>
#include <netinet/ip_ah.h>
#include <netinet/ip_esp.h>
#include <netinet/icmp_var.h>
@@ -919,6 +920,7 @@ struct ctlname tcpname[] = TCPCTL_NAMES;
struct ctlname udpname[] = UDPCTL_NAMES;
struct ctlname espname[] = ESPCTL_NAMES;
struct ctlname ahname[] = AHCTL_NAMES;
+struct ctlname etheripname[] = ETHERIPCTL_NAMES;
struct list inetlist = { inetname, IPPROTO_MAXID };
struct list inetvars[] = {
{ ipname, IPCTL_MAXID }, /* ip */
@@ -973,6 +975,52 @@ struct list inetvars[] = {
{ 0, 0 },
{ espname, ESPCTL_MAXID }, /* esp */
{ ahname, AHCTL_MAXID }, /* ah */
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 0 },
+ { etheripname, ETHERIPCTL_MAXID },
};
/*