From fe98a03ff19905406e2d980a4879bdb71da432d7 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 3 Jul 2006 14:39:57 +0000
Subject: [PATCH] restored lost IKEv2 packet suppression

---
 src/pluto/demux.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/pluto/demux.c b/src/pluto/demux.c
index db7f1c4a6..eaacd3ed8 100644
--- a/src/pluto/demux.c
+++ b/src/pluto/demux.c
@@ -1196,6 +1196,19 @@ read_packet(struct msg_digest *md)
 	}
 #endif
 
+#define IKEV2_VERSION_OFFSET	17
+#define IKEV2_VERSION		0x20
+
+    /* ignore IKEv2 packets - they will be handled by charon */
+    if (pbs_room(&md->packet_pbs) > IKEV2_VERSION_OFFSET
+    &&  md->packet_pbs.start[IKEV2_VERSION_OFFSET] == IKEV2_VERSION)
+    {
+	DBG(DBG_CONTROLMORE,
+	    DBG_log("  ignoring IKEv2 packet")
+	)
+	return FALSE;
+    }
+
     return TRUE;
 }