diff options
| author | Martin Willi <martin@revosec.ch> | 2011-11-18 10:08:18 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:30:43 +0100 |
| commit | cf1772f68544828e13be59415262995e85ef3436 (patch) | |
| tree | 6acdf98a4459548760e36efa606d82a4aa48bde7 /src/libcharon/plugins/stroke | |
| parent | 558f79f76d624d4f47df2b1668ad6d8492100b89 (diff) | |
| download | strongswan-cf1772f68544828e13be59415262995e85ef3436.tar.bz2 strongswan-cf1772f68544828e13be59415262995e85ef3436.tar.xz | |
Do not ignore configs for IKEv1 in charon anymore
Diffstat (limited to 'src/libcharon/plugins/stroke')
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_control.c | 24 | ||||
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_list.c | 3 |
2 files changed, 1 insertions, 26 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c index 5897862c3..98f57b56c 100644 --- a/src/libcharon/plugins/stroke/stroke_control.c +++ b/src/libcharon/plugins/stroke/stroke_control.c @@ -126,14 +126,6 @@ METHOD(stroke_control_t, initiate, void, msg->initiate.name); if (peer_cfg) { - if (peer_cfg->get_ike_version(peer_cfg) != IKEV2) - { - 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; - } - child_cfg = get_child_from_peer(peer_cfg, msg->initiate.name); if (child_cfg == NULL) { @@ -161,10 +153,6 @@ METHOD(stroke_control_t, initiate, void, NULL, NULL, NULL, NULL); while (enumerator->enumerate(enumerator, &peer_cfg)) { - if (peer_cfg->get_ike_version(peer_cfg) != IKEV2) - { - continue; - } child_cfg = get_child_from_peer(peer_cfg, msg->initiate.name); if (child_cfg) { @@ -568,14 +556,6 @@ METHOD(stroke_control_t, route, void, msg->route.name); if (peer_cfg) { - if (peer_cfg->get_ike_version(peer_cfg) != IKEV2) - { - 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; - } - child_cfg = get_child_from_peer(peer_cfg, msg->route.name); if (child_cfg == NULL) { @@ -603,10 +583,6 @@ METHOD(stroke_control_t, route, void, NULL, NULL, NULL, NULL); while (enumerator->enumerate(enumerator, &peer_cfg)) { - if (peer_cfg->get_ike_version(peer_cfg) != IKEV2) - { - continue; - } child_cfg = get_child_from_peer(peer_cfg, msg->route.name); if (child_cfg) { diff --git a/src/libcharon/plugins/stroke/stroke_list.c b/src/libcharon/plugins/stroke/stroke_list.c index 4145a7962..2246e748d 100644 --- a/src/libcharon/plugins/stroke/stroke_list.c +++ b/src/libcharon/plugins/stroke/stroke_list.c @@ -489,8 +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) != IKEV2 || - (name && !streq(name, peer_cfg->get_name(peer_cfg)))) + if (name && !streq(name, peer_cfg->get_name(peer_cfg))) { continue; } |