Log peer cfg enumeration externally for flexibility

diff --git a/src/libcharon/config/backend_manager.c b/src/libcharon/config/backend_manager.c
index c84da2504ac734d6c6fe6e52a1f1c273df9b631e..5fe137ed5de58022e0c298050079df5eea40a465 100644 (file)
--- a/src/libcharon/config/backend_manager.c
+++ b/src/libcharon/config/backend_manager.c
@@ -347,9 +347,6 @@ METHOD(backend_manager_t, create_peer_cfg_enumerator, enumerator_t*,
                return enumerator;
        }
 
-       DBG1(DBG_CFG, "looking for peer configs matching %H[%Y]...%H[%Y]",
-                me, my_id, other, other_id);
-
        configs = linked_list_create();
        /* only once allocated helper list for sorting */
        helper = linked_list_create();

diff --git a/src/libcharon/sa/tasks/ike_auth.c b/src/libcharon/sa/tasks/ike_auth.c
index 4a92385eea8fe3881fa3792cb222fe4a1c417363..39d865c9f33441494d0796e889c5fbad97f48c19 100644 (file)
--- a/src/libcharon/sa/tasks/ike_auth.c
+++ b/src/libcharon/sa/tasks/ike_auth.c
@@ -269,6 +269,8 @@ static bool load_cfg_candidates(private_ike_auth_t *this)
        my_id = this->ike_sa->get_my_id(this->ike_sa);
        other_id = this->ike_sa->get_other_id(this->ike_sa);
 
+       DBG1(DBG_CFG, "looking for peer configs matching %H[%Y]...%H[%Y]",
+                me, my_id, other, other_id);
        enumerator = charon->backends->create_peer_cfg_enumerator(charon->backends,
                                                                                                        me, other, my_id, other_id);
        while (enumerator->enumerate(enumerator, &peer_cfg))

diff --git a/src/libcharon/sa/tasks/main_mode.c b/src/libcharon/sa/tasks/main_mode.c
index dbdc0c07e046c22e135b5c65bc2ac8ac660d2b20..240f7f383d5ba2a3fdfd5f530304587d69b95b80 100755 (executable)
--- a/src/libcharon/sa/tasks/main_mode.c
+++ b/src/libcharon/sa/tasks/main_mode.c
@@ -334,10 +334,13 @@ static peer_cfg_t *select_config(private_main_mode_t *this, identification_t *id
 {
        enumerator_t *enumerator;
        peer_cfg_t *current, *found = NULL;
+       host_t *me, *other;
 
+       me = this->ike_sa->get_my_host(this->ike_sa);
+       other = this->ike_sa->get_other_host(this->ike_sa);
+       DBG1(DBG_CFG, "looking for peer configs matching %H...%H[%Y]", me, other, id);
        enumerator = charon->backends->create_peer_cfg_enumerator(charon->backends,
-                                               this->ike_sa->get_my_host(this->ike_sa),
-                                               this->ike_sa->get_other_host(this->ike_sa), NULL, id);
+                                                                                                               me, other, NULL, id);
        while (enumerator->enumerate(enumerator, &current))
        {
                if (get_auth_method(this, current) == this->auth_method)