Implemented a hook to unsort payloads in messages

src/conftest/Makefile.am

@@ -3,7 +3,7 @@ ipsec_PROGRAMS = conftest
 AM_CFLAGS = -rdynamic
 
 conftest_SOURCES = conftest.c conftest.h config.c config.h actions.c actions.h \
-	hooks/hook.h hooks/ike_auth_fill.c
+	hooks/hook.h hooks/ike_auth_fill.c hooks/unsort_message.c
 
 INCLUDES = \
 	-I$(top_srcdir)/src/libstrongswan \

src/conftest/hooks/unsort_message.c

@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "hook.h"
+
+typedef struct private_unsort_message_t private_unsort_message_t;
+
+/**
+ * Private data of an unsort_message_t object.
+ */
+struct private_unsort_message_t {
+
+	/**
+	 * Implements the hook_t interface.
+	 */
+	hook_t hook;
+
+	/**
+	 * Alter requests or responses?
+	 */
+	bool req;
+
+	/**
+	 * ID of message to alter.
+	 */
+	int id;
+
+	/**
+	 * Order of payloads we want
+	 */
+	char *order;
+};
+
+METHOD(listener_t, message, bool,
+	private_unsort_message_t *this, ike_sa_t *ike_sa, message_t *message,
+	bool incoming)
+{
+	if (!incoming &&
+		message->get_request(message) == this->req &&
+		message->get_message_id(message) == this->id)
+	{
+		enumerator_t *enumerator, *order;
+		linked_list_t *list;
+		payload_type_t type;
+		payload_t *payload;
+		char *name;
+
+		list = linked_list_create();
+		enumerator = message->create_payload_enumerator(message);
+		while (enumerator->enumerate(enumerator, &payload))
+		{
+			message->remove_payload_at(message, enumerator);
+			list->insert_last(list, payload);
+		}
+		enumerator->destroy(enumerator);
+
+		order = enumerator_create_token(this->order, ", ", " ");
+		while (order->enumerate(order, &name))
+		{
+			type = enum_from_name(payload_type_short_names, name);
+			if (type != -1)
+			{
+				enumerator = list->create_enumerator(list);
+				while (enumerator->enumerate(enumerator, &payload))
+				{
+					if (payload->get_type(payload) == type)
+					{
+						list->remove_at(list, enumerator);
+						message->add_payload(message, payload);
+					}
+				}
+				enumerator->destroy(enumerator);
+			}
+			else
+			{
+				DBG1(DBG_CFG, "unkown payload to sort: '%s', skipped", name);
+			}
+		}
+		order->destroy(order);
+
+		while (list->remove_first(list, (void**)&payload) == SUCCESS)
+		{
+			message->add_payload(message, payload);
+		}
+		list->destroy(list);
+
+		message->disable_sort(message);
+	}
+	return TRUE;
+}
+
+METHOD(hook_t, destroy, void,
+	private_unsort_message_t *this)
+{
+	free(this);
+}
+
+/**
+ * Create the IKE_AUTH fill hook
+ */
+hook_t *unsort_message_hook_create(void)
+{
+	private_unsort_message_t *this;
+
+	INIT(this,
+		.hook = {
+			.listener = {
+				.message = _message,
+			},
+			.destroy = _destroy,
+		},
+		.req = conftest->test->get_bool(conftest->test,
+										"hooks.unsort_message.request", TRUE),
+		.id = conftest->test->get_int(conftest->test,
+										"hooks.unsort_message.id", 0),
+		.order = conftest->test->get_str(conftest->test,
+										"hooks.unsort_message.order", ""),
+	);
+
+	return &this->hook;
+}