summaryrefslogtreecommitdiff
path: root/sbin/ipsecctl
diff options
context:
space:
mode:
authorHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2006-06-01 15:53:40 +0000
committerHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2006-06-01 15:53:40 +0000
commit84bc49520ee64cef137281b61044494ac1b7a920 (patch)
treea7121e1e4a3fc4b2f84a2694b7355e2a9370169d /sbin/ipsecctl
parent6ec9adf62aa73d5899f30e2a9259295667a52aa9 (diff)
Add members dst2, proto2 and spi2 to struct ipsec_rule and define
rule type "group". Needed for grouping.
Diffstat (limited to 'sbin/ipsecctl')
-rw-r--r--sbin/ipsecctl/ipsecctl.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/sbin/ipsecctl/ipsecctl.h b/sbin/ipsecctl/ipsecctl.h
index 81608a8f6d8..eb8e5ef6206 100644
--- a/sbin/ipsecctl/ipsecctl.h
+++ b/sbin/ipsecctl/ipsecctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsecctl.h,v 1.40 2006/06/01 15:47:26 hshoexer Exp $ */
+/* $OpenBSD: ipsecctl.h,v 1.41 2006/06/01 15:53:39 hshoexer Exp $ */
/*
* Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org>
*
@@ -36,6 +36,7 @@ enum {
#define RULE_FLOW 0x01
#define RULE_SA 0x02
#define RULE_IKE 0x04
+#define RULE_GROUP 0x08
enum {
DIRECTION_UNKNOWN, IPSEC_IN, IPSEC_OUT, IPSEC_INOUT
@@ -144,6 +145,7 @@ struct ipsec_rule {
struct ipsec_addr_wrap *src;
struct ipsec_addr_wrap *dst;
+ struct ipsec_addr_wrap *dst2;
struct ipsec_addr_wrap *local;
struct ipsec_addr_wrap *peer;
struct ipsec_auth *auth;
@@ -156,11 +158,13 @@ struct ipsec_rule {
u_int8_t satype; /* encapsulating prococol */
u_int8_t proto; /* encapsulated protocol */
+ u_int8_t proto2;
u_int8_t tmode;
u_int8_t direction;
u_int8_t flowtype;
u_int8_t ikemode;
u_int32_t spi;
+ u_int32_t spi2;
u_int32_t nr;
TAILQ_ENTRY(ipsec_rule) rule_entry;