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

As initiator, narrow received Unity attributes to configured TS

Browse Source
This commit is contained in:
Martin Willi
2012-09-18 17:17:48 +02:00
parent b8db3775f3
commit 7a7deec283
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/unity/unity_narrow.c
+11 -4
View File
@@ -39,9 +39,10 @@ struct private_unity_narrow_t {
* Narrow TS as initiator to Unity Split-Include/Local-LAN * Narrow TS as initiator to Unity Split-Include/Local-LAN
*/ */
static void narrow_initiator(private_unity_narrow_t *this, ike_sa_t *ike_sa, static void narrow_initiator(private_unity_narrow_t *this, ike_sa_t *ike_sa,
linked_list_t *remote) child_cfg_t *cfg, linked_list_t *remote)
{ {
traffic_selector_t *current, *orig = NULL; traffic_selector_t *current, *orig = NULL;
linked_list_t *received, *selected;
enumerator_t *enumerator; enumerator_t *enumerator;
enumerator = this->handler->create_include_enumerator(this->handler, enumerator = this->handler->create_include_enumerator(this->handler,
@@ -55,11 +56,16 @@ static void narrow_initiator(private_unity_narrow_t *this, ike_sa_t *ike_sa,
break; break;
} }
} }
current = orig->get_subset(orig, current); /* narrow received Unity TS with the child configuration */
if (current) received = linked_list_create();
received->insert_last(received, current);
selected = cfg->get_traffic_selectors(cfg, FALSE, received, NULL);
while (selected->remove_first(selected, (void**)&current) == SUCCESS)
{ {
remote->insert_last(remote, current); remote->insert_last(remote, current);
} }
selected->destroy(selected);
received->destroy(received);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
if (orig) if (orig)
@@ -125,7 +131,8 @@ METHOD(listener_t, narrow, bool,
narrow_pre(remote); narrow_pre(remote);
break; break;
case NARROW_INITIATOR_POST_AUTH: case NARROW_INITIATOR_POST_AUTH:
narrow_initiator(this, ike_sa, remote); narrow_initiator(this, ike_sa,
child_sa->get_config(child_sa), remote);
break; break;
case NARROW_RESPONDER: case NARROW_RESPONDER:
narrow_pre(local); narrow_pre(local);