Removed len argument from proposal_get_token()
[strongswan.git] / src / conftest / hooks / unsort_message.c
index c12f556..1b2b302 100644 (file)
@@ -45,9 +45,9 @@ struct private_unsort_message_t {
 
 METHOD(listener_t, message, bool,
        private_unsort_message_t *this, ike_sa_t *ike_sa, message_t *message,
-       bool incoming)
+       bool incoming, bool plain)
 {
-       if (!incoming &&
+       if (!incoming && plain &&
                message->get_request(message) == this->req &&
                message->get_message_id(message) == this->id)
        {
@@ -85,7 +85,7 @@ METHOD(listener_t, message, bool,
                        }
                        else
                        {
-                               DBG1(DBG_CFG, "unkown payload to sort: '%s', skipped", name);
+                               DBG1(DBG_CFG, "unknown payload to sort: '%s', skipped", name);
                        }
                }
                order->destroy(order);
@@ -110,7 +110,7 @@ METHOD(hook_t, destroy, void,
 /**
  * Create the IKE_AUTH fill hook
  */
-hook_t *unsort_message_hook_create(void)
+hook_t *unsort_message_hook_create(char *name)
 {
        private_unsort_message_t *this;
 
@@ -122,11 +122,11 @@ hook_t *unsort_message_hook_create(void)
                        .destroy = _destroy,
                },
                .req = conftest->test->get_bool(conftest->test,
-                                                                               "hooks.unsort_message.request", TRUE),
+                                                                               "hooks.%s.request", TRUE, name),
                .id = conftest->test->get_int(conftest->test,
-                                                                               "hooks.unsort_message.id", 0),
+                                                                               "hooks.%s.id", 0, name),
                .order = conftest->test->get_str(conftest->test,
-                                                                               "hooks.unsort_message.order", ""),
+                                                                               "hooks.%s.order", "", name),
        );
 
        return &this->hook;