From ea9e047bc5324880650021e865dd06f158b5c607 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Fri, 9 Dec 2011 16:19:54 +0100
Subject: [PATCH] Use virtual IP to substitute dynamic traffic selectors in
 quick mode

---
 src/libcharon/sa/tasks/quick_mode.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/libcharon/sa/tasks/quick_mode.c b/src/libcharon/sa/tasks/quick_mode.c
index 6b6a93505..0a625c31b 100644
--- a/src/libcharon/sa/tasks/quick_mode.c
+++ b/src/libcharon/sa/tasks/quick_mode.c
@@ -296,13 +296,17 @@ static traffic_selector_t* select_ts(private_quick_mode_t *this, bool initiator)
 	linked_list_t *list;
 	host_t *host;
 
-	if (initiator)
+	host = this->ike_sa->get_virtual_ip(this->ike_sa, initiator);
+	if (!host)
 	{
-		host = this->ike_sa->get_my_host(this->ike_sa);
-	}
-	else
-	{
-		host = this->ike_sa->get_other_host(this->ike_sa);
+		if (initiator)
+		{
+			host = this->ike_sa->get_my_host(this->ike_sa);
+		}
+		else
+		{
+			host = this->ike_sa->get_other_host(this->ike_sa);
+		}
 	}
 	list = this->config->get_traffic_selectors(this->config, initiator,
 											   NULL, host);