Remove version argument on peer_cfg constructor, use ike_cfg version instead

diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
index e908b32a189e26ac8834115b4fcda87e5f141bee..1eeaccaf68ba80a0d783e9a1450f05eff8d61510 100644 (file)
--- a/src/charon-nm/nm/nm_service.c
+++ b/src/charon-nm/nm/nm_service.c
@@ -502,7 +502,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
                                                         charon->socket->get_port(charon->socket, FALSE),
                                                        (char*)address, FALSE, IKEV2_UDP_PORT);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
-       peer_cfg = peer_cfg_create(priv->name, IKEV2, ike_cfg,
+       peer_cfg = peer_cfg_create(priv->name, ike_cfg,
                                        CERT_SEND_IF_ASKED, UNIQUE_REPLACE, 1, /* keyingtries */
                                        36000, 0, /* rekey 10h, reauth none */
                                        600, 600, /* jitter, over 10min */

diff --git a/src/conftest/config.c b/src/conftest/config.c
index 82b05e37050579624061af643f893e2910d09897..6adb545c0d3472cf1dcdbb12ac2122a8fa74f6ef 100644 (file)
--- a/src/conftest/config.c
+++ b/src/conftest/config.c
@@ -251,7 +251,7 @@ static peer_cfg_t *load_peer_config(private_config_t *this,
        uintptr_t strength;
 
        ike_cfg = load_ike_config(this, settings, config);
-       peer_cfg = peer_cfg_create(config, IKEV2, ike_cfg, CERT_ALWAYS_SEND,
+       peer_cfg = peer_cfg_create(config, ike_cfg, CERT_ALWAYS_SEND,
                                                           UNIQUE_NO, 1, 0, 0, 0, 0, FALSE, FALSE, 0, 0,
                                                           FALSE, NULL, NULL);
 

diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/jni/libandroidbridge/backend/android_service.c
index 802d2f681ba11836267d97206e0f6f0df3eaa8e5..6c23bf2688cf123d22af16a92d0183662e291be1 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/backend/android_service.c
+++ b/src/frontends/android/jni/libandroidbridge/backend/android_service.c
@@ -474,7 +474,7 @@ static job_requeue_t initiate(private_android_service_t *this)
                                                         this->gateway, FALSE, IKEV2_UDP_PORT);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
 
-       peer_cfg = peer_cfg_create("android", IKEV2, ike_cfg, CERT_SEND_IF_ASKED,
+       peer_cfg = peer_cfg_create("android", ike_cfg, CERT_SEND_IF_ASKED,
                                                           UNIQUE_REPLACE, 0, /* keyingtries */
                                                           36000, 0, /* rekey 10h, reauth none */
                                                           600, 600, /* jitter, over 10min */

diff --git a/src/libcharon/config/peer_cfg.c b/src/libcharon/config/peer_cfg.c
index 04bb34336e16273b399da8d2c689e372e1cfad51..5b3d869de2ac26cef1ef5ab99e47e5af24fb8c91 100644 (file)
--- a/src/libcharon/config/peer_cfg.c
+++ b/src/libcharon/config/peer_cfg.c
@@ -59,11 +59,6 @@ struct private_peer_cfg_t {
         */
        char *name;
 
-       /**
-        * IKE version to use for initiation
-        */
-       ike_version_t ike_version;
-
        /**
         * IKE config associated to this peer config
         */
@@ -182,7 +177,7 @@ METHOD(peer_cfg_t, get_name, char*,
 METHOD(peer_cfg_t, get_ike_version, ike_version_t,
        private_peer_cfg_t *this)
 {
-       return this->ike_version;
+       return this->ike_cfg->get_version(this->ike_cfg);
 }
 
 METHOD(peer_cfg_t, get_ike_cfg, ike_cfg_t*,
@@ -578,7 +573,7 @@ METHOD(peer_cfg_t, equals, bool,
        e2->destroy(e2);
 
        return (
-               this->ike_version == other->ike_version &&
+               get_ike_version(this) == get_ike_version(other) &&
                this->cert_policy == other->cert_policy &&
                this->unique == other->unique &&
                this->keyingtries == other->keyingtries &&
@@ -633,7 +628,7 @@ METHOD(peer_cfg_t, destroy, void,
 /*
  * Described in header-file
  */
-peer_cfg_t *peer_cfg_create(char *name, ike_version_t ike_version,
+peer_cfg_t *peer_cfg_create(char *name,
                                                        ike_cfg_t *ike_cfg, cert_policy_t cert_policy,
                                                        unique_policy_t unique, u_int32_t keyingtries,
                                                        u_int32_t rekey_time, u_int32_t reauth_time,
@@ -689,7 +684,6 @@ peer_cfg_t *peer_cfg_create(char *name, ike_version_t ike_version,
 #endif /* ME */
                },
                .name = strdup(name),
-               .ike_version = ike_version,
                .ike_cfg = ike_cfg,
                .child_cfgs = linked_list_create(),
                .mutex = mutex_create(MUTEX_TYPE_DEFAULT),

diff --git a/src/libcharon/config/peer_cfg.h b/src/libcharon/config/peer_cfg.h
index c4dc63f0166bac49b1ad946a835e4bd3e86a71ab..121f7589ef45bbbe66b409ec83f483a6289bb166 100644 (file)
--- a/src/libcharon/config/peer_cfg.h
+++ b/src/libcharon/config/peer_cfg.h
@@ -356,7 +356,6 @@ struct peer_cfg_t {
  * (rekeylifetime - random(0, jitter)).
  *
  * @param name                         name of the peer_cfg
- * @param ike_version          which IKE version we should use for this peer
  * @param ike_cfg                      IKE config to use when acting as initiator
  * @param cert_policy          should we send a certificate payload?
  * @param unique                       uniqueness of an IKE_SA
@@ -374,7 +373,7 @@ struct peer_cfg_t {
  * @param peer_id                      ID that identifies our peer at the mediation server
  * @return                                     peer_cfg_t object
  */
-peer_cfg_t *peer_cfg_create(char *name, ike_version_t ike_version,
+peer_cfg_t *peer_cfg_create(char *name,
                                                        ike_cfg_t *ike_cfg, cert_policy_t cert_policy,
                                                        unique_policy_t unique, u_int32_t keyingtries,
                                                        u_int32_t rekey_time, u_int32_t reauth_time,

diff --git a/src/libcharon/plugins/android/android_service.c b/src/libcharon/plugins/android/android_service.c
index 3c432cfb814a079e7f0668b1231311b85f3675ca..d398b136f23193b929ca1e4d642ba0b018f6e46d 100644 (file)
--- a/src/libcharon/plugins/android/android_service.c
+++ b/src/libcharon/plugins/android/android_service.c
@@ -269,7 +269,7 @@ static job_requeue_t initiate(private_android_service_t *this)
                                                         hostname, FALSE, IKEV2_UDP_PORT);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
 
-       peer_cfg = peer_cfg_create("android", IKEV2, ike_cfg, CERT_SEND_IF_ASKED,
+       peer_cfg = peer_cfg_create("android", ike_cfg, CERT_SEND_IF_ASKED,
                                                           UNIQUE_REPLACE, 1, /* keyingtries */
                                                           36000, 0, /* rekey 10h, reauth none */
                                                           600, 600, /* jitter, over 10min */

diff --git a/src/libcharon/plugins/ha/ha_tunnel.c b/src/libcharon/plugins/ha/ha_tunnel.c
index 616b395c62aa8b47cc87b9be8a803dcf17dfff07..05f522e8e14b104046022bd3e73251f0be66318f 100644 (file)
--- a/src/libcharon/plugins/ha/ha_tunnel.c
+++ b/src/libcharon/plugins/ha/ha_tunnel.c
@@ -207,7 +207,7 @@ static void setup_tunnel(private_ha_tunnel_t *this,
                                                         charon->socket->get_port(charon->socket, FALSE),
                                                         remote, FALSE, IKEV2_UDP_PORT);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
-       peer_cfg = peer_cfg_create("ha", IKEV2, ike_cfg, CERT_NEVER_SEND,
+       peer_cfg = peer_cfg_create("ha", ike_cfg, CERT_NEVER_SEND,
                                                UNIQUE_KEEP, 0, 86400, 0, 7200, 3600, FALSE, FALSE, 30,
                                                0, FALSE, NULL, NULL);
 

diff --git a/src/libcharon/plugins/load_tester/load_tester_config.c b/src/libcharon/plugins/load_tester/load_tester_config.c
index fe7b969ca754e7b5c1ab10874ba0a84e11017715..0bfa67e568f516509160bd46004bee1e7e3f271f 100644 (file)
--- a/src/libcharon/plugins/load_tester/load_tester_config.c
+++ b/src/libcharon/plugins/load_tester/load_tester_config.c
@@ -273,7 +273,7 @@ static peer_cfg_t* generate_config(private_load_tester_config_t *this, uint num)
                                                                 this->remote, FALSE, IKEV2_UDP_PORT);
        }
        ike_cfg->add_proposal(ike_cfg, this->proposal->clone(this->proposal));
-       peer_cfg = peer_cfg_create("load-test", IKEV2, ike_cfg,
+       peer_cfg = peer_cfg_create("load-test", ike_cfg,
                                                           CERT_SEND_IF_ASKED, UNIQUE_NO, 1, /* keytries */
                                                           this->ike_rekey, 0, /* rekey, reauth */
                                                           0, this->ike_rekey, /* jitter, overtime */

diff --git a/src/libcharon/plugins/maemo/maemo_service.c b/src/libcharon/plugins/maemo/maemo_service.c
index c7eac2973a8818847e3ce7d50d8b38821a961e87..dca01fbaa2cc0a994b45c9f95c8a1a52dae07e4a 100644 (file)
--- a/src/libcharon/plugins/maemo/maemo_service.c
+++ b/src/libcharon/plugins/maemo/maemo_service.c
@@ -328,7 +328,7 @@ static gboolean initiate_connection(private_maemo_service_t *this,
                                                         hostname, FALSE, IKEV2_UDP_PORT);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
 
-       peer_cfg = peer_cfg_create(this->current, IKEV2, ike_cfg,
+       peer_cfg = peer_cfg_create(this->current, ike_cfg,
                                                           CERT_SEND_IF_ASKED,
                                                           UNIQUE_REPLACE, 1, /* keyingtries */
                                                           36000, 0, /* rekey 10h, reauth none */

diff --git a/src/libcharon/plugins/medcli/medcli_config.c b/src/libcharon/plugins/medcli/medcli_config.c
index 4dde0866836ad9979a62d779f74ce40d557d4628..440d4dd4e5647605d44e7b76df6e2b546c597af0 100644 (file)
--- a/src/libcharon/plugins/medcli/medcli_config.c
+++ b/src/libcharon/plugins/medcli/medcli_config.c
@@ -124,7 +124,7 @@ METHOD(backend_t, get_peer_cfg_by_name, peer_cfg_t*,
                                                         address, FALSE, IKEV2_UDP_PORT);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
        med_cfg = peer_cfg_create(
-               "mediation", IKEV2, ike_cfg,
+               "mediation", ike_cfg,
                CERT_NEVER_SEND, UNIQUE_REPLACE,
                1, this->rekey*60, 0,                   /* keytries, rekey, reauth */
                this->rekey*5, this->rekey*3,   /* jitter, overtime */
@@ -161,7 +161,7 @@ METHOD(backend_t, get_peer_cfg_by_name, peer_cfg_t*,
                return NULL;
        }
        peer_cfg = peer_cfg_create(
-               name, IKEV2, this->ike->get_ref(this->ike),
+               name, this->ike->get_ref(this->ike),
                CERT_NEVER_SEND, UNIQUE_REPLACE,
                1, this->rekey*60, 0,                   /* keytries, rekey, reauth */
                this->rekey*5, this->rekey*3,   /* jitter, overtime */
@@ -236,7 +236,7 @@ METHOD(enumerator_t, peer_enumerator_enumerate, bool,
                return FALSE;
        }
        this->current = peer_cfg_create(
-                               name, IKEV2, this->ike->get_ref(this->ike),
+                               name, this->ike->get_ref(this->ike),
                                CERT_NEVER_SEND, UNIQUE_REPLACE,
                                1, this->rekey*60, 0,                   /* keytries, rekey, reauth */
                                this->rekey*5, this->rekey*3,   /* jitter, overtime */

diff --git a/src/libcharon/plugins/medsrv/medsrv_config.c b/src/libcharon/plugins/medsrv/medsrv_config.c
index a3dada69a86511517fb7f5d4e4e3ee314e37efd0..a2d7489f4a68b3d5529ce542ec284aa6cf862a09 100644 (file)
--- a/src/libcharon/plugins/medsrv/medsrv_config.c
+++ b/src/libcharon/plugins/medsrv/medsrv_config.c
@@ -88,7 +88,7 @@ METHOD(backend_t, create_peer_cfg_enumerator, enumerator_t*,
                if (e->enumerate(e, &name))
                {
                        peer_cfg = peer_cfg_create(
-                               name, IKEV2, this->ike->get_ref(this->ike),
+                               name, this->ike->get_ref(this->ike),
                                CERT_NEVER_SEND, UNIQUE_REPLACE,
                                1, this->rekey*60, 0,                   /* keytries, rekey, reauth */
                                this->rekey*5, this->rekey*3,   /* jitter, overtime */

diff --git a/src/libcharon/plugins/sql/sql_config.c b/src/libcharon/plugins/sql/sql_config.c
index 0054f6c63c5268d09c64323970fd88ffd33fb2cc..565c8584badf3d9917db07f51262d88c1ad1e349 100644 (file)
--- a/src/libcharon/plugins/sql/sql_config.c
+++ b/src/libcharon/plugins/sql/sql_config.c
@@ -371,7 +371,7 @@ static peer_cfg_t *build_peer_cfg(private_sql_config_t *this, enumerator_t *e,
                if (ike)
                {
                        peer_cfg = peer_cfg_create(
-                                       name, IKEV2, ike, cert_policy, uniqueid,
+                                       name, ike, cert_policy, uniqueid,
                                        keyingtries, rekeytime, reauthtime, jitter, overtime,
                                        mobike, FALSE, dpd_delay, 0,
                                        mediation, mediated_cfg, peer_id);

diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c
index ef7682be6dc325e1857ed66969756837d53359de..0d3684d6d274da1cb4a93602bc0fe41d2f45cb15 100644 (file)
--- a/src/libcharon/plugins/stroke/stroke_config.c
+++ b/src/libcharon/plugins/stroke/stroke_config.c
@@ -708,8 +708,7 @@ static peer_cfg_t *build_peer_cfg(private_stroke_config_t *this,
        /* other.sourceip is managed in stroke_attributes. If it is set, we define
         * the pool name as the connection name, which the attribute provider
         * uses to serve pool addresses. */
-       peer_cfg = peer_cfg_create(msg->add_conn.name,
-               msg->add_conn.version, ike_cfg,
+       peer_cfg = peer_cfg_create(msg->add_conn.name, ike_cfg,
                msg->add_conn.me.sendcert, unique,
                msg->add_conn.rekey.tries, rekey, reauth, jitter, over,
                msg->add_conn.mobike, msg->add_conn.aggressive,

diff --git a/src/libcharon/plugins/uci/uci_config.c b/src/libcharon/plugins/uci/uci_config.c
index 4947c62dd6ce65c882b3e3f94438f77acb16cab2..82887303f32f5dabd751475c3ee42617c5265e94 100644 (file)
--- a/src/libcharon/plugins/uci/uci_config.c
+++ b/src/libcharon/plugins/uci/uci_config.c
@@ -174,7 +174,7 @@ METHOD(enumerator_t, peer_enumerator_enumerate, bool,
                                                                 remote_addr, FALSE, IKEV2_UDP_PORT);
                ike_cfg->add_proposal(ike_cfg, create_proposal(ike_proposal, PROTO_IKE));
                this->peer_cfg = peer_cfg_create(
-                                       name, IKEV2, ike_cfg, CERT_SEND_IF_ASKED, UNIQUE_NO,
+                                       name, ike_cfg, CERT_SEND_IF_ASKED, UNIQUE_NO,
                                        1, create_rekey(ike_rekey), 0,  /* keytries, rekey, reauth */
                                        1800, 900,                                              /* jitter, overtime */
                                        TRUE, FALSE,                            /* mobike, aggressive */