Pass a list instead of a single virtual IP to attribute enumerators

src/libcharon/plugins/android/android_handler.c

@@ -196,7 +196,7 @@ METHOD(enumerator_t, enumerate_dns, bool,
 }
 
 METHOD(attribute_handler_t, create_attribute_enumerator, enumerator_t *,
-	android_handler_t *this, identification_t *id, host_t *vip)
+	android_handler_t *this, identification_t *id, linked_list_t *vips)
 {
 	enumerator_t *enumerator;
 

src/libcharon/plugins/dhcp/dhcp_provider.c

@@ -130,17 +130,24 @@ METHOD(attribute_provider_t, release_address, bool,
 
 METHOD(attribute_provider_t, create_attribute_enumerator, enumerator_t*,
 	private_dhcp_provider_t *this, char *pool, identification_t *id,
-	host_t *vip)
+	linked_list_t *vips)
 {
-	dhcp_transaction_t *transaction;
+	dhcp_transaction_t *transaction = NULL;
+	enumerator_t *enumerator;
+	host_t *vip;
 
-	if (!vip)
-	{
-		return NULL;
-	}
 	this->mutex->lock(this->mutex);
-	transaction = this->transactions->get(this->transactions,
-										  (void*)hash_id_host(id, vip));
+	enumerator = vips->create_enumerator(vips);
+	while (enumerator->enumerate(enumerator, &vip))
+	{
+		transaction = this->transactions->get(this->transactions,
+											  (void*)hash_id_host(id, vip));
+		if (transaction)
+		{
+			break;
+		}
+	}
+	enumerator->destroy(enumerator);
 	if (!transaction)
 	{
 		this->mutex->unlock(this->mutex);

src/libcharon/plugins/stroke/stroke_attribute.c

@@ -149,7 +149,7 @@ static bool attr_filter(void *lock, host_t **in,
 
 METHOD(attribute_provider_t, create_attribute_enumerator, enumerator_t*,
 	private_stroke_attribute_t *this, char *pool, identification_t *id,
-	host_t *vip)
+	linked_list_t *vips)
 {
 	ike_sa_t *ike_sa;
 	peer_cfg_t *peer_cfg;

src/libcharon/plugins/stroke/stroke_handler.c

@@ -94,7 +94,8 @@ static bool attr_filter(void *lock, host_t **in,
 }
 
 METHOD(attribute_handler_t, create_attribute_enumerator, enumerator_t*,
-	private_stroke_handler_t *this, identification_t *server, host_t *vip)
+	private_stroke_handler_t *this, identification_t *server,
+	linked_list_t *vips)
 {
 	ike_sa_t *ike_sa;
 	peer_cfg_t *peer_cfg;