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

backends: use ike_cfg host matching functions

Browse Source
This commit is contained in:
Martin Willi
2013-09-04 10:38:37 +02:00
parent 6f666192bb
commit 62282ec0ed
1 changed files with 7 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/config/backend_manager.c
+7 -38
View File
@@ -84,10 +84,8 @@ static enumerator_t *ike_enum_create(backend_t *backend, ike_data_t *data)
static ike_cfg_match_t get_ike_match(ike_cfg_t *cand, host_t *me, host_t *other, static ike_cfg_match_t get_ike_match(ike_cfg_t *cand, host_t *me, host_t *other,
ike_version_t version) ike_version_t version)
{ {
host_t *me_cand, *other_cand;
char *my_addr, *other_addr;
bool my_allow_any, other_allow_any;
ike_cfg_match_t match = MATCH_NONE; ike_cfg_match_t match = MATCH_NONE;
int quality;
if (cand->get_version(cand) != IKE_ANY && if (cand->get_version(cand) != IKE_ANY &&
version != cand->get_version(cand)) version != cand->get_version(cand))
@@ -97,26 +95,12 @@ static ike_cfg_match_t get_ike_match(ike_cfg_t *cand, host_t *me, host_t *other,
if (me) if (me)
{ {
my_addr = cand->get_my_addr(cand, &my_allow_any); quality = cand->match_me(cand, me);
me_cand = host_create_from_dns(my_addr, me->get_family(me), 0); if (!quality)
if (!me_cand)
{ {
return MATCH_NONE; return MATCH_NONE;
} }
if (me_cand->ip_equals(me_cand, me)) match += quality * MATCH_ME;
{
match += MATCH_ME;
}
else if (my_allow_any || me_cand->is_anyaddr(me_cand))
{
match += MATCH_ANY;
}
else
{
me_cand->destroy(me_cand);
return MATCH_NONE;
}
me_cand->destroy(me_cand);
} }
else else
{ {
@@ -125,26 +109,12 @@ static ike_cfg_match_t get_ike_match(ike_cfg_t *cand, host_t *me, host_t *other,
if (other) if (other)
{ {
other_addr = cand->get_other_addr(cand, &other_allow_any); quality = cand->match_other(cand, other);
other_cand = host_create_from_dns(other_addr, other->get_family(other), 0); if (!quality)
if (!other_cand)
{ {
return MATCH_NONE; return MATCH_NONE;
} }
if (other_cand->ip_equals(other_cand, other)) match += quality * MATCH_OTHER;
{
match += MATCH_OTHER;
}
else if (other_allow_any || other_cand->is_anyaddr(other_cand))
{
match += MATCH_ANY;
}
else
{
other_cand->destroy(other_cand);
return MATCH_NONE;
}
other_cand->destroy(other_cand);
} }
else else
{ {
@@ -481,4 +451,3 @@ backend_manager_t *backend_manager_create()
return &this->public; return &this->public;
} }