Added a hook to inject custom payloads with critical bit

src/conftest/Makefile.am

@@ -4,7 +4,8 @@ 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/unsort_message.c \
-	hooks/add_notify.c hooks/unencrypted_notify.c hooks/ignore_message.c
+	hooks/add_notify.c hooks/unencrypted_notify.c hooks/ignore_message.c \
+	hooks/add_payload.c
 
 INCLUDES = \
 	-I$(top_srcdir)/src/libstrongswan \

src/conftest/hooks/add_payload.c

@@ -0,0 +1,128 @@
+/*
+ * 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"
+
+#include <encoding/payloads/unknown_payload.h>
+
+typedef struct private_add_payload_t private_add_payload_t;
+
+/**
+ * Private data of an add_payload_t object.
+ */
+struct private_add_payload_t {
+
+	/**
+	 * Implements the hook_t interface.
+	 */
+	hook_t hook;
+
+	/**
+	 * Alter requests or responses?
+	 */
+	bool req;
+
+	/**
+	 * ID of message to alter.
+	 */
+	int id;
+
+	/**
+	 * Payload type
+	 */
+	char *type;
+
+	/**
+	 * Payload data
+	 */
+	char *data;
+
+	/**
+	 * Set critical bit of the payload
+	 */
+	bool critical;
+};
+
+METHOD(listener_t, message, bool,
+	private_add_payload_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)
+	{
+		unknown_payload_t *payload;
+		chunk_t data = chunk_empty;
+		payload_type_t type;
+
+		type = atoi(this->type);
+		if (!type)
+		{
+			type = enum_from_name(payload_type_short_names, this->type);
+			if (type == -1)
+			{
+				DBG1(DBG_CFG, "unknown payload: '%s', skipped", this->type);
+				return TRUE;
+			}
+		}
+		if (strncasecmp(this->data, "0x", 2) == 0)
+		{
+			data = chunk_skip(chunk_create(this->data, strlen(this->data)), 2);
+			data = chunk_from_hex(data, NULL);
+		}
+		else if (data.len)
+		{
+			data = chunk_clone(chunk_create(this->data, strlen(this->data)));
+		}
+		payload = unknown_payload_create_data(type, this->critical, data);
+		message->add_payload(message, &payload->payload_interface);
+	}
+	return TRUE;
+}
+
+METHOD(hook_t, destroy, void,
+	private_add_payload_t *this)
+{
+	free(this);
+}
+
+/**
+ * Create the IKE_AUTH fill hook
+ */
+hook_t *add_payload_hook_create(char *name)
+{
+	private_add_payload_t *this;
+
+	INIT(this,
+		.hook = {
+			.listener = {
+				.message = _message,
+			},
+			.destroy = _destroy,
+		},
+		.req = conftest->test->get_bool(conftest->test,
+										"hooks.%s.request", TRUE, name),
+		.id = conftest->test->get_int(conftest->test,
+										"hooks.%s.id", 0, name),
+		.type = conftest->test->get_str(conftest->test,
+										"hooks.%s.type", "", name),
+		.data = conftest->test->get_str(conftest->test,
+										"hooks.%s.data", "", name),
+		.critical = conftest->test->get_bool(conftest->test,
+										"hooks.%s.critical", FALSE, name),
+	);
+
+	return &this->hook;
+}