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

diff --git a/src/libcharon/plugins/unity/unity_narrow.c b/src/libcharon/plugins/unity/unity_narrow.c
index e081cb7..56de002 100644 (file)
--- 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;
 
 {
        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)
                {
                        case NARROW_INITIATOR_PRE_AUTH:
                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;
                                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;
                        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 5ebde17..c7feb09 100644 (file)
--- 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;
        }
                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,
        INIT(attr_enum,
                .public = {
                        .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;
 }