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/smp/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcharon/plugins/smp/smp.c') diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c index 68935aaab..2743b7224 100644 --- a/src/libcharon/plugins/smp/smp.c +++ b/src/libcharon/plugins/smp/smp.c @@ -302,7 +302,7 @@ static void request_query_config(xmlTextReaderPtr reader, xmlTextWriterPtr write ike_cfg_t *ike_cfg; linked_list_t *list; - if (peer_cfg->get_ike_version(peer_cfg) != 2) + if (peer_cfg->get_ike_version(peer_cfg) != IKEV2) { /* only IKEv2 connections yet */ continue; } -- cgit v1.2.3 From cf1772f68544828e13be59415262995e85ef3436 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 18 Nov 2011 10:08:18 +0100 Subject: Do not ignore configs for IKEv1 in charon anymore --- src/libcharon/plugins/smp/smp.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/libcharon/plugins/smp/smp.c') diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c index 2743b7224..0db287480 100644 --- a/src/libcharon/plugins/smp/smp.c +++ b/src/libcharon/plugins/smp/smp.c @@ -302,11 +302,6 @@ static void request_query_config(xmlTextReaderPtr reader, xmlTextWriterPtr write ike_cfg_t *ike_cfg; linked_list_t *list; - if (peer_cfg->get_ike_version(peer_cfg) != IKEV2) - { /* only IKEv2 connections yet */ - continue; - } - /* */ xmlTextWriterStartElement(writer, "peerconfig"); xmlTextWriterWriteElement(writer, "name", peer_cfg->get_name(peer_cfg)); -- cgit v1.2.3 From ac009df132e9b7a66962e1cf860cd2e2f40be60e Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Sat, 17 Dec 2011 13:31:27 +0100 Subject: Pass IKE version to peer config enumerator, filter configs --- src/libcharon/plugins/smp/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcharon/plugins/smp/smp.c') diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c index 0db287480..c2fe11f74 100644 --- a/src/libcharon/plugins/smp/smp.c +++ b/src/libcharon/plugins/smp/smp.c @@ -294,7 +294,7 @@ static void request_query_config(xmlTextReaderPtr reader, xmlTextWriterPtr write xmlTextWriterStartElement(writer, "configlist"); enumerator = charon->backends->create_peer_cfg_enumerator(charon->backends, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, IKE_ANY); while (enumerator->enumerate(enumerator, &peer_cfg)) { enumerator_t *children; -- cgit v1.2.3