From: Martin Willi <martin@revosec.ch>
Date: Thu, 11 Nov 2010 15:12:58 +0000 (+0100)
Subject: Added hook to set arbitrary IKE major/minor versions in message headers
X-Git-Tag: 4.5.1~284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0a760795ee7f92bb8e3fc322701e785af743681;p=thirdparty%2Fstrongswan.git

Added hook to set arbitrary IKE major/minor versions in message headers
---

diff --git a/src/conftest/Makefile.am b/src/conftest/Makefile.am
index f18646fe4b..58758ac1fd 100644
--- a/src/conftest/Makefile.am
+++ b/src/conftest/Makefile.am
@@ -5,7 +5,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_payload.c hooks/set_critical.c hooks/force_cookie.c
+	hooks/add_payload.c hooks/set_critical.c hooks/force_cookie.c \
+	hooks/set_ike_version.c
 
 INCLUDES = \
 	-I$(top_srcdir)/src/libstrongswan \
diff --git a/src/conftest/hooks/set_ike_version.c b/src/conftest/hooks/set_ike_version.c
new file mode 100644
index 0000000000..545bfdd16c
--- /dev/null
+++ b/src/conftest/hooks/set_ike_version.c
@@ -0,0 +1,100 @@
+/*
+ * 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_set_ike_version_t private_set_ike_version_t;
+
+/**
+ * Private data of an set_ike_version_t object.
+ */
+struct private_set_ike_version_t {
+
+	/**
+	 * Implements the hook_t interface.
+	 */
+	hook_t hook;
+
+	/**
+	 * Alter requests or responses?
+	 */
+	bool req;
+
+	/**
+	 * ID of message to alter.
+	 */
+	int id;
+
+	/**
+	 * Major version to set
+	 */
+	int major;
+
+	/**
+	 * Minor version to set
+	 */
+	int minor;
+};
+
+METHOD(listener_t, message, bool,
+	private_set_ike_version_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)
+	{
+		DBG1(DBG_CFG, "setting IKE version of message ID %d to %d.%d",
+			 this->id, this->major, this->minor);
+		message->set_major_version(message, this->major);
+		message->set_minor_version(message, this->minor);
+	}
+	return TRUE;
+}
+
+METHOD(hook_t, destroy, void,
+	private_set_ike_version_t *this)
+{
+	free(this);
+}
+
+/**
+ * Create the IKE_AUTH fill hook
+ */
+hook_t *set_ike_version_hook_create(char *name)
+{
+	private_set_ike_version_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),
+		.major = conftest->test->get_int(conftest->test,
+										"hooks.%s.major", 2, name),
+		.minor = conftest->test->get_int(conftest->test,
+										"hooks.%s.minor", 0, name),
+	);
+
+	return &this->hook;
+}