summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJean-Jacques Bernard-Gundol <jjbg@cvs.openbsd.org>2001-07-05 08:27:40 +0000
committerJean-Jacques Bernard-Gundol <jjbg@cvs.openbsd.org>2001-07-05 08:27:40 +0000
commit336c45b48406c6cc8e8416a2f269e4b2ad2ae7f8 (patch)
tree05ecb11ce21f21cf121ba5c16590634c790e361c /sys
parentcbef729cf31392a5779398b19c2fc8845aea7630 (diff)
Include files for IPComp support. angelos@ ok.
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if.h3
-rw-r--r--sys/net/pfkeyv2.h14
2 files changed, 14 insertions, 3 deletions
diff --git a/sys/net/if.h b/sys/net/if.h
index e486c42adc5..5095e171654 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.h,v 1.29 2001/06/27 05:50:06 kjc Exp $ */
+/* $OpenBSD: if.h,v 1.30 2001/07/05 08:27:38 jjbg Exp $ */
/* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */
/*
@@ -229,6 +229,7 @@ struct ifnet { /* and the entries */
#define IFCAP_IPSEC 0x00000008 /* can do IPsec */
#define IFCAP_VLAN_MTU 0x00000010 /* VLAN-compatible MTU */
#define IFCAP_VLAN_HWTAGGING 0x00000020 /* hardware VLAN tag support */
+#define IFCAP_IPCOMP 0x00000040 /* can do IPcomp */
/*
* Output queues (ifp->if_snd) and internetwork datagram level (pup level 1)
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h
index 05464a6f20a..bd75bbd38c1 100644
--- a/sys/net/pfkeyv2.h
+++ b/sys/net/pfkeyv2.h
@@ -178,6 +178,7 @@ struct sadb_x_cred {
#ifdef _KERNEL
#define SADB_X_GETSPROTO(x) ( (x) == SADB_SATYPE_AH ? IPPROTO_AH :\
(x) == SADB_SATYPE_ESP ? IPPROTO_ESP :\
+ (x) == SADB_X_SATYPE_IPCOMP ? IPPROTO_IPCOMP:\
IPPROTO_IPIP )
#endif
@@ -211,7 +212,9 @@ struct sadb_x_cred {
#define SADB_X_EXT_REMOTE_CREDENTIALS 27
#define SADB_X_EXT_LOCAL_AUTH 28
#define SADB_X_EXT_REMOTE_AUTH 29
-#define SADB_EXT_MAX 29
+#define SADB_X_EXT_SUPPORTED_COMP 30
+#define SADB_EXT_MAX 30
+
/* Fix pfkeyv2.c struct pfkeyv2_socket if SATYPE_MAX > 31 */
#define SADB_SATYPE_UNSPEC 0
@@ -223,7 +226,8 @@ struct sadb_x_cred {
#define SADB_SATYPE_MIP 6
#define SADB_X_SATYPE_IPIP 7
#define SADB_X_SATYPE_TCPSIGNATURE 8
-#define SADB_SATYPE_MAX 8
+#define SADB_X_SATYPE_IPCOMP 9
+#define SADB_SATYPE_MAX 9
#define SADB_SASTATE_LARVAL 0
#define SADB_SASTATE_MATURE 1
@@ -259,6 +263,12 @@ struct sadb_x_cred {
#define SADB_X_EALG_SKIPJACK 249
#define SADB_EALG_MAX 249
+#define SADB_X_CALG_NONE 0
+#define SADB_X_CALG_OUI 1
+#define SADB_X_CALG_DEFLATE 2
+#define SADB_X_CALG_LSZ 3
+#define SADB_X_CALG_MAX 4
+
#define SADB_SAFLAGS_PFS 0x001 /* perfect forward secrecy */
#define SADB_X_SAFLAGS_HALFIV 0x002 /* Used for ESP-old */
#define SADB_X_SAFLAGS_TUNNEL 0x004 /* Force tunneling */