From 3de54af7ec3b1abc6c6fa8c214e00258d4e1999e Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Wed, 21 Mar 2012 15:41:45 +0100
Subject: [PATCH] Define a special XFRM mark_t.value that dynamically uses the
 CHILD_SA reqid

---
 src/libcharon/sa/child_sa.c        | 9 +++++++++
 src/libhydra/kernel/kernel_ipsec.h | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/src/libcharon/sa/child_sa.c b/src/libcharon/sa/child_sa.c
index 2130a5998..ee3733a33 100644
--- a/src/libcharon/sa/child_sa.c
+++ b/src/libcharon/sa/child_sa.c
@@ -1079,6 +1079,15 @@ child_sa_t * child_sa_create(host_t *me, host_t* other,
 		this->reqid = rekey ? rekey : ++reqid;
 	}
 
+	if (this->mark_in.value == MARK_REQID)
+	{
+		this->mark_in.value = this->reqid;
+	}
+	if (this->mark_out.value == MARK_REQID)
+	{
+		this->mark_out.value = this->reqid;
+	}
+
 	/* MIPv6 proxy transport mode sets SA endpoints to TS hosts */
 	if (config->get_mode(config) == MODE_TRANSPORT &&
 		config->use_proxy_mode(config))
diff --git a/src/libhydra/kernel/kernel_ipsec.h b/src/libhydra/kernel/kernel_ipsec.h
index 7af76a321..852f0560c 100644
--- a/src/libhydra/kernel/kernel_ipsec.h
+++ b/src/libhydra/kernel/kernel_ipsec.h
@@ -171,6 +171,11 @@ struct mark_t {
 	u_int32_t mask;
 };
 
+/**
+ * Special mark value that uses the reqid of the CHILD_SA as mark
+ */
+#define MARK_REQID (0xFFFFFFFF)
+
 /**
  * Interface to the ipsec subsystem of the kernel.
  *