From 27f4dd33b27856817c13886e373c5da40aa9d0db Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Tue, 13 Oct 2009 13:55:06 +0200
Subject: use definitions from libstrongswan/attributes/attributes.h

---
 src/pluto/constants.c |  2 ++
 src/pluto/constants.h | 18 ------------------
 src/pluto/modecfg.c   |  1 +
 3 files changed, 3 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/pluto/constants.c b/src/pluto/constants.c
index 6e4198350..4716c6ad8 100644
--- a/src/pluto/constants.c
+++ b/src/pluto/constants.c
@@ -25,6 +25,8 @@
 
 #include <freeswan.h>
 
+#include <attributes/attributes.h>
+
 #include "constants.h"
 #include "defs.h"
 #include "log.h"
diff --git a/src/pluto/constants.h b/src/pluto/constants.h
index 552a11385..010c1c410 100644
--- a/src/pluto/constants.h
+++ b/src/pluto/constants.h
@@ -534,24 +534,6 @@ extern const char *const payload_name[];
 
 extern enum_names attr_msg_type_names;
 
-/* Mode Config attribute values */
-#define    INTERNAL_IP4_ADDRESS        1
-#define    INTERNAL_IP4_NETMASK        2
-#define    INTERNAL_IP4_DNS            3
-#define    INTERNAL_IP4_NBNS           4
-#define    INTERNAL_ADDRESS_EXPIRY     5
-#define    INTERNAL_IP4_DHCP           6
-#define    APPLICATION_VERSION         7
-#define    INTERNAL_IP6_ADDRESS        8
-#define    INTERNAL_IP6_NETMASK        9
-#define    INTERNAL_IP6_DNS           10
-#define    INTERNAL_IP6_NBNS          11
-#define    INTERNAL_IP6_DHCP          12
-#define    INTERNAL_IP4_SUBNET        13
-#define    SUPPORTED_ATTRIBUTES       14
-#define    INTERNAL_IP6_SUBNET        15
-
-
 extern enum_names modecfg_attr_names;
 
 /* XAUTH attribute values */
diff --git a/src/pluto/modecfg.c b/src/pluto/modecfg.c
index ae455472a..c8f9bb524 100644
--- a/src/pluto/modecfg.c
+++ b/src/pluto/modecfg.c
@@ -26,6 +26,7 @@
 #include <freeswan.h>
 
 #include <library.h>
+#include <attributes/attributes.h>
 #include <crypto/prfs/prf.h>
 
 #include "constants.h"
-- 
cgit v1.2.3