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

child_cfg matching code prefers a config containing the first proposed TS

Browse Source
This commit is contained in:
Martin Willi
2009-07-07 14:38:19 +02:00
parent 2d00984d73
commit 20188fcad4
1 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/config/peer_cfg.c
+47 -21
View File
@@ -250,22 +250,46 @@ static enumerator_t* create_child_cfg_enumerator(private_peer_cfg_t *this)
} }
/** /**
* Check if child_cfg contains traffic selectors * Check how good a list of TS matches a given child config
*/ */
static int contains_ts(child_cfg_t *child, bool mine, linked_list_t *ts, static int get_ts_match(child_cfg_t *cfg, bool local,
host_t *host) linked_list_t *sup_list, host_t *host)
{ {
linked_list_t *selected; linked_list_t *cfg_list;
int prio; enumerator_t *sup_enum, *cfg_enum;
traffic_selector_t *sup_ts, *cfg_ts;
int match = 0, round;
if (child->equal_traffic_selectors(child, mine, ts, host)) /* fetch configured TS list, narrowing dynamic TS */
cfg_list = cfg->get_traffic_selectors(cfg, local, NULL, host);
/* use a round counter to rate leading TS with higher priority */
round = sup_list->get_count(sup_list);
sup_enum = sup_list->create_enumerator(sup_list);
while (sup_enum->enumerate(sup_enum, &sup_ts))
{ {
return 2; cfg_enum = cfg_list->create_enumerator(cfg_list);
while (cfg_enum->enumerate(cfg_enum, &cfg_ts))
{
if (cfg_ts->equals(cfg_ts, sup_ts))
{ /* equality is honored better than matches */
match += round * 5;
}
else if (cfg_ts->is_contained_in(cfg_ts, sup_ts) ||
sup_ts->is_contained_in(sup_ts, cfg_ts))
{
match += round * 1;
}
}
cfg_enum->destroy(cfg_enum);
round--;
} }
selected = child->get_traffic_selectors(child, mine, ts, host); sup_enum->destroy(sup_enum);
prio = selected->get_count(selected) ? 1 : 0;
selected->destroy_offset(selected, offsetof(traffic_selector_t, destroy)); cfg_list->destroy_offset(cfg_list, offsetof(traffic_selector_t, destroy));
return prio;
return match;
} }
/** /**
@@ -279,21 +303,23 @@ static child_cfg_t* select_child_cfg(private_peer_cfg_t *this,
child_cfg_t *current, *found = NULL; child_cfg_t *current, *found = NULL;
enumerator_t *enumerator; enumerator_t *enumerator;
int best = 0; int best = 0;
DBG2(DBG_CFG, "looking for a child config for %#R=== %#R", my_ts, other_ts); DBG2(DBG_CFG, "looking for a child config for %#R=== %#R", my_ts, other_ts);
enumerator = create_child_cfg_enumerator(this); enumerator = create_child_cfg_enumerator(this);
while (enumerator->enumerate(enumerator, &current)) while (enumerator->enumerate(enumerator, &current))
{ {
int prio = contains_ts(current, TRUE, my_ts, my_host) + int my_prio, other_prio;
contains_ts(current, FALSE, other_ts, other_host);
my_prio = get_ts_match(current, TRUE, my_ts, my_host);
if (prio) other_prio = get_ts_match(current, FALSE, other_ts, other_host);
if (my_prio && other_prio)
{ {
DBG2(DBG_CFG, " candidate \"%s\" with prio %d", DBG2(DBG_CFG, " candidate \"%s\" with prio %d+%d",
current->get_name(current), prio); current->get_name(current), my_prio, other_prio);
if (prio > best) if (my_prio + other_prio > best)
{ {
best = prio; best = my_prio + other_prio;
DESTROY_IF(found); DESTROY_IF(found);
found = current->get_ref(current); found = current->get_ref(current);
} }