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

As Unity responder, don't change the proposed TS at all, racoon doesn't like that

Browse Source
This commit is contained in:
Martin Willi
2012-09-18 17:17:48 +02:00
parent 336dd7a9c7
commit 77c37ea5e0
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/unity/unity_narrow.c
+4 -7
View File
@@ -78,9 +78,9 @@ static void narrow_initiator(private_unity_narrow_t *this, ike_sa_t *ike_sa,
} }
/** /**
* As responder/responder, bump up TS to 0.0.0.0/0 for on-the-wire bits * As initiator, bump up TS to 0.0.0.0/0 for on-the-wire bits
*/ */
static void narrow_pre(linked_list_t *list) static void narrow_initiator_pre(linked_list_t *list)
{ {
traffic_selector_t *ts; traffic_selector_t *ts;
@@ -98,7 +98,7 @@ static void narrow_pre(linked_list_t *list)
} }
/** /**
* As responder, rarrow down TS to configuration for installation * As responder, narrow down TS to configuration for installation
*/ */
static void narrow_responder_post(child_cfg_t *child_cfg, linked_list_t *local) static void narrow_responder_post(child_cfg_t *child_cfg, linked_list_t *local)
{ {
@@ -128,15 +128,12 @@ METHOD(listener_t, narrow, bool,
switch (type) switch (type)
{ {
case NARROW_INITIATOR_PRE_AUTH: case NARROW_INITIATOR_PRE_AUTH:
narrow_pre(remote); narrow_initiator_pre(remote);
break; break;
case NARROW_INITIATOR_POST_AUTH: case NARROW_INITIATOR_POST_AUTH:
narrow_initiator(this, ike_sa, narrow_initiator(this, ike_sa,
child_sa->get_config(child_sa), remote); child_sa->get_config(child_sa), remote);
break; break;
case NARROW_RESPONDER:
narrow_pre(local);
break;
case NARROW_RESPONDER_POST: case NARROW_RESPONDER_POST:
narrow_responder_post(child_sa->get_config(child_sa), local); narrow_responder_post(child_sa->get_config(child_sa), local);
break; break;
src/libcharon/plugins/unity/unity_provider.c
+4
View File
@@ -133,6 +133,9 @@ METHOD(attribute_provider_t, create_attribute_enumerator, enumerator_t*,
list->destroy(list); list->destroy(list);
return NULL; return NULL;
} }
DBG1(DBG_CFG, "sending %N: %#R",
configuration_attribute_type_names, UNITY_SPLIT_INCLUDE, list);
INIT(attr_enum, INIT(attr_enum,
.public = { .public = {
.enumerate = (void*)_attribute_enumerate, .enumerate = (void*)_attribute_enumerate,
@@ -140,6 +143,7 @@ METHOD(attribute_provider_t, create_attribute_enumerator, enumerator_t*,
}, },
.list = list, .list = list,
); );
return &attr_enum->public; return &attr_enum->public;
} }