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

fixed peer_cfg lookup when omitting IDr

Browse Source
This commit is contained in:
Martin Willi
2008-03-19 10:08:59 +00:00
parent 081ae2eb61
commit 3c448f019b
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/config/backend_manager.c
+5
View File
@@ -216,7 +216,12 @@ static peer_cfg_t *get_peer_cfg(private_backend_manager_t *this,
my_candidate = current->get_my_id(current); my_candidate = current->get_my_id(current);
other_candidate = current->get_other_id(current); other_candidate = current->get_other_id(current);
/* own ID may have wildcards in both, config and request (missing IDr) */
m1 = my_candidate->matches(my_candidate, me); m1 = my_candidate->matches(my_candidate, me);
if (!m1)
{
m1 = me->matches(me, my_candidate);
}
m2 = other->matches(other, other_candidate); m2 = other->matches(other, other_candidate);
sum = m1 + m2; sum = m1 + m2;
src/charon/plugins/stroke/stroke.c
+13 -3
View File
@@ -1287,9 +1287,19 @@ static void peer_data_destroy(peer_data_t *data)
*/ */
static bool peer_filter(peer_data_t *data, peer_cfg_t **in, peer_cfg_t **out) static bool peer_filter(peer_data_t *data, peer_cfg_t **in, peer_cfg_t **out)
{ {
bool match_me = FALSE, match_other = FALSE;
if ((!data->me || data->me->matches(data->me, (*in)->get_my_id(*in))) && identification_t *me, *other;
(!data->other || data->other->matches(data->other, (*in)->get_other_id(*in))))
me = (*in)->get_my_id(*in);
other = (*in)->get_other_id(*in);
/* own ID may have wildcards in data (no IDr payload) or in config */
match_me = (!data->me || data->me->matches(data->me, me) ||
me->matches(me, data->me));
/* others ID has wildcards in config only */
match_other = (!data->other || data->other->matches(data->other, other));
if (match_me && match_other)
{ {
*out = *in; *out = *in;
return TRUE; return TRUE;