summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/net/encap.c4
-rw-r--r--sys/net/encap.h12
-rw-r--r--sys/netinet/ip_ipsp.h37
3 files changed, 45 insertions, 8 deletions
diff --git a/sys/net/encap.c b/sys/net/encap.c
index 9e0845f098b..ea0d210c4d4 100644
--- a/sys/net/encap.c
+++ b/sys/net/encap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: encap.c,v 1.8 1997/07/11 23:37:51 provos Exp $ */
+/* $OpenBSD: encap.c,v 1.9 1997/07/14 08:46:39 provos Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -92,7 +92,7 @@ encap_sysctl(int *name, u_int namelen, void *oldp, size_t *oldplenp,
switch (name[0])
{
- case IPSECCTL_ENCDEBUG:
+ case ENCAPCTL_ENCDEBUG:
return (sysctl_int(oldp, oldplenp, newp, newlen, &encdebug));
default:
diff --git a/sys/net/encap.h b/sys/net/encap.h
index 81b4c40cad9..0c4ddf25bf0 100644
--- a/sys/net/encap.h
+++ b/sys/net/encap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: encap.h,v 1.7 1997/07/11 23:37:52 provos Exp $ */
+/* $OpenBSD: encap.h,v 1.8 1997/07/14 08:46:40 provos Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -29,6 +29,16 @@
* Declarations useful in the encapsulation code.
*/
+/* Sysctl definitions */
+
+#define ENCAPCTL_ENCDEBUG 1
+#define ENCAPCTL_MAXID 2
+
+#define ENCAPCTL_NAMES {\
+ { 0, 0 }, \
+ { "encdebug", CTLTYPE_INT }, \
+}
+
/*
* Definitions for encapsulation-related phenomena.
*
diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h
index 56cbb2b2701..916bd228738 100644
--- a/sys/netinet/ip_ipsp.h
+++ b/sys/netinet/ip_ipsp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipsp.h,v 1.11 1997/07/11 23:37:59 provos Exp $ */
+/* $OpenBSD: ip_ipsp.h,v 1.12 1997/07/14 08:46:38 provos Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -154,12 +154,39 @@ extern unsigned char ipseczeroes[];
/*
* Names for IPsec sysctl objects
*/
-#define IPSECCTL_ENCDEBUG 1 /* turn debugging on/off */
-#define IPSECCTL_MAXID 2
+#define IPSECCTL_ENCAP 28
+#define IPSECCTL_MAXID 29
-#define IPSECCTL_NAMES {\
+#define CTL_IPSEC_NAMES {\
{ 0, 0 }, \
- { "encdebug", CTLTYPE_INT }, \
+ { 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 }, \
+ { "encap", CTLTYPE_NODE }, \
}
#ifdef _KERNEL