1 files changed, 30 insertions, 14 deletions

diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index 67d1b45f1..73a23f4ea 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -398,11 +398,12 @@ static traffic_selector_t* select_ts(private_quick_mode_t *this, bool local,
 									 linked_list_t *supplied)
 {
 	traffic_selector_t *ts;
+	enumerator_t *enumerator;
 	linked_list_t *list;
 	host_t *host;
 
-	host = this->ike_sa->get_virtual_ip(this->ike_sa, local);
-	if (!host)
+	enumerator = this->ike_sa->create_virtual_ip_enumerator(this->ike_sa, local);
+	if (!enumerator->enumerate(enumerator, &host))
 	{
 		if (local)
 		{
@@ -413,6 +414,7 @@ static traffic_selector_t* select_ts(private_quick_mode_t *this, bool local,
 			host = this->ike_sa->get_other_host(this->ike_sa);
 		}
 	}
+	enumerator->destroy(enumerator);
 	list = this->config->get_traffic_selectors(this->config, local,
 											   supplied, host);
 	if (list->get_first(list, (void**)&ts) == SUCCESS)
@@ -831,6 +833,30 @@ static void check_for_rekeyed_child(private_quick_mode_t *this)
 	enumerator->destroy(enumerator);
 }
 
+/**
+ * Get host to use for dynamic traffic selectors
+ */
+static host_t *get_dynamic_host(ike_sa_t *ike_sa, bool local)
+{
+	enumerator_t *enumerator;
+	host_t *host;
+
+	enumerator = ike_sa->create_virtual_ip_enumerator(ike_sa, local);
+	if (!enumerator->enumerate(enumerator, &host))
+	{
+		if (local)
+		{
+			host = ike_sa->get_my_host(ike_sa);
+		}
+		else
+		{
+			host = ike_sa->get_other_host(ike_sa);
+		}
+	}
+	enumerator->destroy(enumerator);
+	return host;
+}
+
 METHOD(task_t, process_r, status_t,
 	private_quick_mode_t *this, message_t *message)
 {
@@ -841,7 +867,6 @@ METHOD(task_t, process_r, status_t,
 			sa_payload_t *sa_payload;
 			linked_list_t *tsi, *tsr, *list = NULL;
 			peer_cfg_t *peer_cfg;
-			host_t *me, *other;
 			u_int16_t group;
 			bool private;
 
@@ -849,16 +874,6 @@ METHOD(task_t, process_r, status_t,
 			{
 				return FAILED;
 			}
-			me = this->ike_sa->get_virtual_ip(this->ike_sa, TRUE);
-			if (!me)
-			{
-				me = this->ike_sa->get_my_host(this->ike_sa);
-			}
-			other = this->ike_sa->get_virtual_ip(this->ike_sa, FALSE);
-			if (!other)
-			{
-				other = this->ike_sa->get_other_host(this->ike_sa);
-			}
 			peer_cfg = this->ike_sa->get_peer_cfg(this->ike_sa);
 			tsi = linked_list_create();
 			tsr = linked_list_create();
@@ -866,7 +881,8 @@ METHOD(task_t, process_r, status_t,
 			tsr->insert_last(tsr, this->tsr);
 			this->tsi = this->tsr = NULL;
 			this->config = peer_cfg->select_child_cfg(peer_cfg, tsr, tsi,
-													  me, other);
+										get_dynamic_host(this->ike_sa, TRUE),
+										get_dynamic_host(this->ike_sa, FALSE));
 			if (this->config)
 			{
 				this->tsi = select_ts(this, FALSE, tsi);