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 acf4b6141ce7c26e534c62e4152795330a1573d0..36102f34188e777f9dc77dedf4db4eeb68eb53a0 100644 (file)
--- 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 691d223a3819ab9c8ca7c04dca4c3a6c614cc556..d6206938098c50b50ccec0b3a047ff480b1bf16c 100644 (file)
--- 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 01ca026e16f5b447b53064747af46cdbf62d64ab..04bb34336e16273b399da8d2c689e372e1cfad51 100644 (file)
--- 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 97089e1b02be3f4f50703c0dc592a8ed3af69871..c4dc63f0166bac49b1ad946a835e4bd3e86a71ab 100644 (file)
--- 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