diff options
Diffstat (limited to 'src/libcharon/plugins/stroke')
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_config.c | 2 | ||||
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_control.c | 16 | ||||
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_list.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c index f09c74155..4a49704ef 100644 --- a/src/libcharon/plugins/stroke/stroke_config.c +++ b/src/libcharon/plugins/stroke/stroke_config.c @@ -670,7 +670,7 @@ static peer_cfg_t *build_peer_cfg(private_stroke_config_t *this, * 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.ikev2 ? 2 : 1, ike_cfg, + msg->add_conn.ikev2 ? IKEV2 : IKEV1, ike_cfg, msg->add_conn.me.sendcert, unique, msg->add_conn.rekey.tries, rekey, reauth, jitter, over, msg->add_conn.mobike, msg->add_conn.dpd.delay, diff --git a/src/libcharon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c index f0d8f3b74..5897862c3 100644 --- a/src/libcharon/plugins/stroke/stroke_control.c +++ b/src/libcharon/plugins/stroke/stroke_control.c @@ -126,10 +126,10 @@ METHOD(stroke_control_t, initiate, void, msg->initiate.name); if (peer_cfg) { - if (peer_cfg->get_ike_version(peer_cfg) != 2) + if (peer_cfg->get_ike_version(peer_cfg) != IKEV2) { - DBG1(DBG_CFG, "ignoring initiation request for IKEv%d config", - peer_cfg->get_ike_version(peer_cfg)); + DBG1(DBG_CFG, "ignoring initiation request for %N config", + ike_version_names, peer_cfg->get_ike_version(peer_cfg)); peer_cfg->destroy(peer_cfg); return; } @@ -161,7 +161,7 @@ METHOD(stroke_control_t, initiate, void, NULL, NULL, NULL, NULL); while (enumerator->enumerate(enumerator, &peer_cfg)) { - if (peer_cfg->get_ike_version(peer_cfg) != 2) + if (peer_cfg->get_ike_version(peer_cfg) != IKEV2) { continue; } @@ -568,10 +568,10 @@ METHOD(stroke_control_t, route, void, msg->route.name); if (peer_cfg) { - if (peer_cfg->get_ike_version(peer_cfg) != 2) + if (peer_cfg->get_ike_version(peer_cfg) != IKEV2) { - DBG1(DBG_CFG, "ignoring initiation request for IKEv%d config", - peer_cfg->get_ike_version(peer_cfg)); + DBG1(DBG_CFG, "ignoring initiation request for %N config", + ike_version_names, peer_cfg->get_ike_version(peer_cfg)); peer_cfg->destroy(peer_cfg); return; } @@ -603,7 +603,7 @@ METHOD(stroke_control_t, route, void, NULL, NULL, NULL, NULL); while (enumerator->enumerate(enumerator, &peer_cfg)) { - if (peer_cfg->get_ike_version(peer_cfg) != 2) + if (peer_cfg->get_ike_version(peer_cfg) != IKEV2) { continue; } diff --git a/src/libcharon/plugins/stroke/stroke_list.c b/src/libcharon/plugins/stroke/stroke_list.c index af061155f..4145a7962 100644 --- a/src/libcharon/plugins/stroke/stroke_list.c +++ b/src/libcharon/plugins/stroke/stroke_list.c @@ -489,7 +489,7 @@ METHOD(stroke_list_t, status, void, charon->backends, NULL, NULL, NULL, NULL); while (enumerator->enumerate(enumerator, &peer_cfg)) { - if (peer_cfg->get_ike_version(peer_cfg) != 2 || + if (peer_cfg->get_ike_version(peer_cfg) != IKEV2 || (name && !streq(name, peer_cfg->get_name(peer_cfg)))) { continue; |