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

ike-cfg: remove the to be obsoleted allow any parameter in get_my/other_addr

Browse Source
This commit is contained in:
Martin Willi
2013-09-04 10:38:37 +02:00
parent 62282ec0ed
commit beffdc6ab8
7 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/config/backend_manager.c
+8 -11
View File
@@ -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;
}
src/libcharon/config/ike_cfg.c
+2 -10
View File
@@ -186,22 +186,14 @@ METHOD(ike_cfg_t, match_other, u_int,
}
METHOD(ike_cfg_t, get_my_addr, char*,
private_ike_cfg_t *this, bool *allow_any)
private_ike_cfg_t *this)
{
if (allow_any)
{
*allow_any = this->my_allow_any;
}
return this->me;
}
METHOD(ike_cfg_t, get_other_addr, char*,
private_ike_cfg_t *this, bool *allow_any)
private_ike_cfg_t *this)
{
if (allow_any)
{
*allow_any = this->other_allow_any;
}
return this->other;
}
src/libcharon/config/ike_cfg.h
+2 -4
View File
@@ -112,18 +112,16 @@ struct ike_cfg_t {
/**
* Get own address.
*
* @param allow_any allow any address to match
* @return string of address/DNS name
*/
char* (*get_my_addr) (ike_cfg_t *this, bool *allow_any);
char* (*get_my_addr) (ike_cfg_t *this);
/**
* Get peer's address.
*
* @param allow_any allow any address to match
* @return string of address/DNS name
*/
char* (*get_other_addr) (ike_cfg_t *this, bool *allow_any);
char* (*get_other_addr) (ike_cfg_t *this);
/**
* Get the port to use as our source port.