mode-config: Reassign migrated virtual IP if client requests %any

If we mistakenly detect a new IKE_SA as a reauthentication the client
won't request the previous virtual IP, but since we already migrated
it we already triggered the assign_vips() hook, so we should reassign
the migrated virtual IP.

Fixes #1152.

diff --git a/src/libcharon/sa/ikev1/tasks/mode_config.c b/src/libcharon/sa/ikev1/tasks/mode_config.c
index d0994a9616f2eb020bd18fcd56566c82d77bd035..a03477e187e1e25ed400c4fcad985344404f99e4 100644 (file)
--- a/src/libcharon/sa/ikev1/tasks/mode_config.c
+++ b/src/libcharon/sa/ikev1/tasks/mode_config.c
@@ -482,7 +482,9 @@ static host_t *assign_migrated_vip(linked_list_t *migrated, host_t *requested)
        enumerator = migrated->create_enumerator(migrated);
        while (enumerator->enumerate(enumerator, &vip))
        {
-               if (vip->ip_equals(vip, requested))
+               if (vip->ip_equals(vip, requested) ||
+                  (requested->is_anyaddr(requested) &&
+                       requested->get_family(requested) == vip->get_family(vip)))
                {
                        migrated->remove_at(migrated, enumerator);
                        found = vip;