denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cosmetics in debug output

Browse Source
This commit is contained in:
Andreas Steffen
2008-11-11 06:19:37 +00:00
parent c198fc5548
commit 8ac4651ac3
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/config/backend_manager.c
+11 -6
View File
@@ -175,7 +175,7 @@ static ike_cfg_t *get_ike_cfg(private_backend_manager_t *this,
data->me = me; data->me = me;
data->other = other; data->other = other;
DBG2(DBG_CFG, "looking for a config for %H...%H", me, other); DBG2(DBG_CFG, "looking for an ike config for %H...%H", me, other);
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
enumerator = enumerator_create_nested( enumerator = enumerator_create_nested(
@@ -188,8 +188,8 @@ static ike_cfg_t *get_ike_cfg(private_backend_manager_t *this,
if (match) if (match)
{ {
DBG2(DBG_CFG, " candidate: %s...%s, prio %d", DBG2(DBG_CFG, " candidate: %s...%s, prio %d",
current->get_my_addr(current), current->get_other_addr(current), current->get_my_addr(current),
match); current->get_other_addr(current), match);
if (match > best) if (match > best)
{ {
DESTROY_IF(found); DESTROY_IF(found);
@@ -201,6 +201,11 @@ static ike_cfg_t *get_ike_cfg(private_backend_manager_t *this,
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
if (found)
{
DBG2(DBG_CFG, "found matching ike config: %s...%s with prio %d",
found->get_my_addr(found), found->get_other_addr(found), best);
}
return found; return found;
} }
@@ -227,7 +232,7 @@ static peer_cfg_t *get_peer_cfg(private_backend_manager_t *this, host_t *me,
ike_cfg_match_t best_ike = MATCH_NONE; ike_cfg_match_t best_ike = MATCH_NONE;
peer_data_t *data; peer_data_t *data;
DBG2(DBG_CFG, "looking for a config for %H[%D]...%H[%D]", DBG2(DBG_CFG, "looking for a peer config for %H[%D]...%H[%D]",
me, my_id, other, other_id); me, my_id, other, other_id);
data = malloc_thing(peer_data_t); data = malloc_thing(peer_data_t);
@@ -262,7 +267,7 @@ static peer_cfg_t *get_peer_cfg(private_backend_manager_t *this, host_t *me,
if (m1 && m2 && match_ike && if (m1 && m2 && match_ike &&
auth->complies(auth, current->get_auth(current))) auth->complies(auth, current->get_auth(current)))
{ {
DBG2(DBG_CFG, " candidate '%s': %D...%D, prio %d.%d", DBG2(DBG_CFG, " candidate \"%s\": %D...%D with prio %d.%d",
current->get_name(current), my_cand, other_cand, current->get_name(current), my_cand, other_cand,
match_peer, match_ike); match_peer, match_ike);
if (match_peer >= best_peer && match_ike > best_ike) if (match_peer >= best_peer && match_ike > best_ike)
@@ -277,7 +282,7 @@ static peer_cfg_t *get_peer_cfg(private_backend_manager_t *this, host_t *me,
} }
if (found) if (found)
{ {
DBG1(DBG_CFG, "found matching config \"%s\": %D...%D, prio %d.%d", DBG1(DBG_CFG, "found matching peer config \"%s\": %D...%D with prio %d.%d",
found->get_name(found), found->get_my_id(found), found->get_name(found), found->get_my_id(found),
found->get_other_id(found), best_peer, best_ike); found->get_other_id(found), best_peer, best_ike);
} }