Move ike_version_t definition from peer_cfg_t to ike_cfg_t
This commit is contained in:
parent
23ca39010e
commit
cf62d073f1
|
@ -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;
|
||||
|
||||
/**
|
||||
|
|
|
@ -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.
|
||||
*
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue