diff options
| author | Martin Willi <martin@revosec.ch> | 2012-09-17 14:30:35 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-09-18 17:17:48 +0200 |
| commit | 77c37ea5e0d60276847f316138b3ba8cedf49caf (patch) | |
| tree | 9567f8b175a16bfbd65f5139c9dd2dfed60262a7 /src | |
| parent | 336dd7a9c76c73bf36c99561012a559286bf9640 (diff) | |
| download | strongswan-77c37ea5e0d60276847f316138b3ba8cedf49caf.tar.bz2 strongswan-77c37ea5e0d60276847f316138b3ba8cedf49caf.tar.xz | |
As Unity responder, don't change the proposed TS at all, racoon doesn't like that
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/plugins/unity/unity_narrow.c | 11 | ||||
| -rw-r--r-- | src/libcharon/plugins/unity/unity_provider.c | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/libcharon/plugins/unity/unity_narrow.c b/src/libcharon/plugins/unity/unity_narrow.c index e081cb702..56de0028f 100644 --- a/src/libcharon/plugins/unity/unity_narrow.c +++ b/src/libcharon/plugins/unity/unity_narrow.c @@ -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; @@ -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) { @@ -128,15 +128,12 @@ METHOD(listener_t, narrow, bool, switch (type) { case NARROW_INITIATOR_PRE_AUTH: - narrow_pre(remote); + narrow_initiator_pre(remote); break; case NARROW_INITIATOR_POST_AUTH: narrow_initiator(this, ike_sa, child_sa->get_config(child_sa), remote); break; - case NARROW_RESPONDER: - narrow_pre(local); - break; case NARROW_RESPONDER_POST: narrow_responder_post(child_sa->get_config(child_sa), local); break; diff --git a/src/libcharon/plugins/unity/unity_provider.c b/src/libcharon/plugins/unity/unity_provider.c index 5ebde17d3..c7feb090c 100644 --- a/src/libcharon/plugins/unity/unity_provider.c +++ b/src/libcharon/plugins/unity/unity_provider.c @@ -133,6 +133,9 @@ METHOD(attribute_provider_t, create_attribute_enumerator, enumerator_t*, list->destroy(list); return NULL; } + DBG1(DBG_CFG, "sending %N: %#R", + configuration_attribute_type_names, UNITY_SPLIT_INCLUDE, list); + INIT(attr_enum, .public = { .enumerate = (void*)_attribute_enumerate, @@ -140,6 +143,7 @@ METHOD(attribute_provider_t, create_attribute_enumerator, enumerator_t*, }, .list = list, ); + return &attr_enum->public; } |