Added hook to log ID payload type and data

2 files changed, 88 insertions, 1 deletions

diff --git a/src/conftest/Makefile.am b/src/conftest/Makefile.am
index 7d18f8334..385d76108 100644
--- a/src/conftest/Makefile.am
+++ b/src/conftest/Makefile.am
@@ -7,7 +7,8 @@ conftest_SOURCES = conftest.c conftest.h config.c config.h actions.c actions.h \
 	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/set_ike_version.c hooks/pretend_auth.c hooks/set_length.c \
-	hooks/log_proposals.c hooks/set_proposal_number.c hooks/log_ke.c
+	hooks/log_proposals.c hooks/set_proposal_number.c hooks/log_ke.c \
+	hooks/log_id.c
 
 INCLUDES = \
 	-I$(top_srcdir)/src/libstrongswan \
diff --git a/src/conftest/hooks/log_id.c b/src/conftest/hooks/log_id.c
new file mode 100644
index 000000000..66a864edc
--- /dev/null
+++ b/src/conftest/hooks/log_id.c
@@ -0,0 +1,86 @@
+/*
+ * 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/id_payload.h>
+
+typedef struct private_log_id_t private_log_id_t;
+
+/**
+ * Private data of an log_id_t object.
+ */
+struct private_log_id_t {
+
+	/**
+	 * Implements the hook_t interface.
+	 */
+	hook_t hook;
+};
+
+METHOD(listener_t, message, bool,
+	private_log_id_t *this, ike_sa_t *ike_sa, message_t *message,
+	bool incoming)
+{
+	if (incoming)
+	{
+		enumerator_t *enumerator;
+		payload_t *payload;
+		id_payload_t *id;
+		chunk_t data;
+
+		enumerator = message->create_payload_enumerator(message);
+		while (enumerator->enumerate(enumerator, &payload))
+		{
+			if (payload->get_type(payload) == ID_INITIATOR ||
+				payload->get_type(payload) == ID_RESPONDER)
+			{
+				id = (id_payload_t*)payload;
+				data = id->get_data(id);
+
+				DBG1(DBG_CFG, "%N: %N %B",
+					 payload_type_short_names, payload->get_type(payload),
+					 id_type_names, id->get_id_type(id), &data);
+			}
+		}
+		enumerator->destroy(enumerator);
+	}
+	return TRUE;
+}
+
+METHOD(hook_t, destroy, void,
+	private_log_id_t *this)
+{
+	free(this);
+}
+
+/**
+ * Create the IKE_AUTH fill hook
+ */
+hook_t *log_id_hook_create(char *name)
+{
+	private_log_id_t *this;
+
+	INIT(this,
+		.hook = {
+			.listener = {
+				.message = _message,
+			},
+			.destroy = _destroy,
+		},
+	);
+
+	return &this->hook;
+}