ike: Use address family of local address when resolving remote host

If static local addresses are configured we should use their address family
as a hint when resolving the remote address.
We don't do this if %any is configured as this might break existing
configurations (%any4 and %any6 are however used as hint).

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 3aafa4c13b177fb73dc2311cec044f73358e1411..0c13c587c48779bb1059b39f94ce0fc14ecacc79 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Tobias Brunner
+ * Copyright (C) 2006-2015 Tobias Brunner
  * Copyright (C) 2006 Daniel Roethlisberger
  * Copyright (C) 2005-2009 Martin Willi
  * Copyright (C) 2005 Jan Hutter
@@ -1200,6 +1200,19 @@ static void resolve_hosts(private_ike_sa_t *this)
                        break;
        }
 
+       /* if an IP address is set locally, use the same family to resolve remote */
+       if (family == AF_UNSPEC && !this->remote_host)
+       {
+               if (this->local_host)
+               {
+                       family = this->local_host->get_family(this->local_host);
+               }
+               else
+               {
+                       family = ike_cfg_get_family(this->ike_cfg, TRUE);
+               }
+       }
+
        if (this->remote_host)
        {
                host = this->remote_host->clone(this->remote_host);