From: Martin Willi <martin@revosec.ch>
Date: Tue, 16 Oct 2012 12:21:17 +0000 (+0200)
Subject: Move ike_version_t definition from peer_cfg_t to ike_cfg_t
X-Git-Tag: 5.0.2dr4~335
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf62d073f17591fb632dd878983fed7ccf6540b4;p=thirdparty%2Fstrongswan.git

Move ike_version_t definition from peer_cfg_t to ike_cfg_t
---

diff --git a/src/libcharon/config/ike_cfg.c b/src/libcharon/config/ike_cfg.c
index acf4b6141c..36102f3418 100644
--- a/src/libcharon/config/ike_cfg.c
+++ b/src/libcharon/config/ike_cfg.c
@@ -21,6 +21,12 @@
 #include <daemon.h>
 
 
+ENUM(ike_version_names, IKE_ANY, IKEV2,
+	"IKEv1/2",
+	"IKEv1",
+	"IKEv2",
+);
+
 typedef struct private_ike_cfg_t private_ike_cfg_t;
 
 /**
diff --git a/src/libcharon/config/ike_cfg.h b/src/libcharon/config/ike_cfg.h
index 691d223a38..d620693809 100644
--- a/src/libcharon/config/ike_cfg.h
+++ b/src/libcharon/config/ike_cfg.h
@@ -22,6 +22,7 @@
 #ifndef IKE_CFG_H_
 #define IKE_CFG_H_
 
+typedef enum ike_version_t ike_version_t;
 typedef struct ike_cfg_t ike_cfg_t;
 
 #include <library.h>
@@ -31,6 +32,23 @@ typedef struct ike_cfg_t ike_cfg_t;
 #include <config/proposal.h>
 #include <crypto/diffie_hellman.h>
 
+/**
+ * IKE version.
+ */
+enum ike_version_t {
+	/** any version */
+	IKE_ANY = 0,
+	/** IKE version 1 */
+	IKEV1 = 1,
+	/** IKE version 2 */
+	IKEV2 = 2,
+};
+
+/**
+ * enum strings fro ike_version_t
+ */
+extern enum_name_t *ike_version_names;
+
 /**
  * An ike_cfg_t defines the rules to set up an IKE_SA.
  *
diff --git a/src/libcharon/config/peer_cfg.c b/src/libcharon/config/peer_cfg.c
index 01ca026e16..04bb34336e 100644
--- a/src/libcharon/config/peer_cfg.c
+++ b/src/libcharon/config/peer_cfg.c
@@ -25,12 +25,6 @@
 #include <utils/linked_list.h>
 #include <utils/identification.h>
 
-ENUM(ike_version_names, IKE_ANY, IKEV2,
-	"IKEv1/2",
-	"IKEv1",
-	"IKEv2",
-);
-
 ENUM(cert_policy_names, CERT_ALWAYS_SEND, CERT_NEVER_SEND,
 	"CERT_ALWAYS_SEND",
 	"CERT_SEND_IF_ASKED",
diff --git a/src/libcharon/config/peer_cfg.h b/src/libcharon/config/peer_cfg.h
index 97089e1b02..c4dc63f016 100644
--- a/src/libcharon/config/peer_cfg.h
+++ b/src/libcharon/config/peer_cfg.h
@@ -23,7 +23,6 @@
 #ifndef PEER_CFG_H_
 #define PEER_CFG_H_
 
-typedef enum ike_version_t ike_version_t;
 typedef enum cert_policy_t cert_policy_t;
 typedef enum unique_policy_t unique_policy_t;
 typedef struct peer_cfg_t peer_cfg_t;
@@ -37,23 +36,6 @@ typedef struct peer_cfg_t peer_cfg_t;
 #include <config/child_cfg.h>
 #include <credentials/auth_cfg.h>
 
-/**
- * IKE version.
- */
-enum ike_version_t {
-	/** any version */
-	IKE_ANY = 0,
-	/** IKE version 1 */
-	IKEV1 = 1,
-	/** IKE version 2 */
-	IKEV2 = 2,
-};
-
-/**
- * enum strings fro ike_version_t
- */
-extern enum_name_t *ike_version_names;
-
 /**
  * Certificate sending policy. This is also used for certificate
  * requests when using this definition for the other peer. If