diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/config/backend_manager.c | 3 | ||||
| -rw-r--r-- | src/libcharon/sa/tasks/ike_auth.c | 2 | ||||
| -rwxr-xr-x | src/libcharon/sa/tasks/main_mode.c | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/libcharon/config/backend_manager.c b/src/libcharon/config/backend_manager.c index c84da2504..5fe137ed5 100644 --- 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 4a92385ee..39d865c9f 100644 --- 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 dbdc0c07e..240f7f383 100755 --- 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, ¤t)) { if (get_auth_method(this, current) == this->auth_method) |