diff options
| author | Martin Willi <martin@revosec.ch> | 2013-07-25 14:07:40 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-09-04 10:38:37 +0200 |
| commit | beffdc6ab8cb5139c9e0b0ee2e7585c5262e702f (patch) | |
| tree | 4651a6bfabd64582495c84a31fd94f76ddb53002 /src/libcharon/config/backend_manager.c | |
| parent | 62282ec0ed3c55a28aaa10ec8ed9682ac34f8c5d (diff) | |
| download | strongswan-beffdc6ab8cb5139c9e0b0ee2e7585c5262e702f.tar.bz2 strongswan-beffdc6ab8cb5139c9e0b0ee2e7585c5262e702f.tar.xz | |
ike-cfg: remove the to be obsoleted allow any parameter in get_my/other_addr
Diffstat (limited to 'src/libcharon/config/backend_manager.c')
| -rw-r--r-- | src/libcharon/config/backend_manager.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/libcharon/config/backend_manager.c b/src/libcharon/config/backend_manager.c index ca2505189..79f1d9fee 100644 --- a/src/libcharon/config/backend_manager.c +++ b/src/libcharon/config/backend_manager.c @@ -135,7 +135,6 @@ METHOD(backend_manager_t, get_ike_cfg, ike_cfg_t*, { ike_cfg_t *current, *found = NULL; char *my_addr, *other_addr; - bool my_allow_any, other_allow_any; enumerator_t *enumerator; ike_cfg_match_t match, best = MATCH_ANY; ike_data_t *data; @@ -159,11 +158,10 @@ METHOD(backend_manager_t, get_ike_cfg, ike_cfg_t*, match, me, other, ike_version_names, version); if (match) { - my_addr = current->get_my_addr(current, &my_allow_any); - other_addr = current->get_other_addr(current, &other_allow_any); - DBG2(DBG_CFG, " candidate: %s%s...%s%s, prio %d", - my_allow_any ? "%":"", my_addr, - other_allow_any ? "%":"", other_addr, match); + my_addr = current->get_my_addr(current); + other_addr = current->get_other_addr(current); + DBG2(DBG_CFG, " candidate: %s...%s, prio %d", + my_addr, other_addr, match); if (match > best) { DESTROY_IF(found); @@ -177,11 +175,10 @@ METHOD(backend_manager_t, get_ike_cfg, ike_cfg_t*, this->lock->unlock(this->lock); if (found) { - my_addr = found->get_my_addr(found, &my_allow_any); - other_addr = found->get_other_addr(found, &other_allow_any); - DBG2(DBG_CFG, "found matching ike config: %s%s...%s%s with prio %d", - my_allow_any ? "%":"", my_addr, - other_allow_any ? "%":"", other_addr, best); + my_addr = found->get_my_addr(found); + other_addr = found->get_other_addr(found); + DBG2(DBG_CFG, "found matching ike config: %s...%s with prio %d", + my_addr, other_addr, best); } return found; } |