From f7a8fcedc0305dfca7d82adba03c88401240d039 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 16 Nov 2011 17:28:06 +0100 Subject: Use enum to define IKE version on peer_cfg_t. Replaced all those magic numbers. --- src/libcharon/plugins/stroke/stroke_control.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/libcharon/plugins/stroke/stroke_control.c') 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; } -- cgit v1.2.3