provider: Return VPN gateway IP address
authorJukka Rissanen <jukka.rissanen@linux.intel.com>
Thu, 23 Aug 2012 11:19:35 +0000 (14:19 +0300)
committerPatrik Flykt <patrik.flykt@linux.intel.com>
Thu, 23 Aug 2012 12:11:43 +0000 (15:11 +0300)
If 'provider->host_ip[0]' is set, it contains the
resolved IP address. If not set, the 'Host' property
already contains an IP address.

src/provider.c

index 251d0b0..3af6f19 100644 (file)
@@ -1099,7 +1099,13 @@ const char *connman_provider_get_string(struct connman_provider *provider,
                return provider->name;
        else if (g_str_equal(key, "Host") == TRUE)
                return provider->host;
-       else if (g_str_equal(key, "VPN.Domain") == TRUE)
+       else if (g_str_equal(key, "HostIP") == TRUE) {
+               if (provider->host_ip == NULL ||
+                               provider->host_ip[0] == NULL)
+                       return provider->host;
+               else
+                       return provider->host_ip[0];
+       } else if (g_str_equal(key, "VPN.Domain") == TRUE)
                return provider->domain;
 
        return g_hash_table_lookup(provider->setting_strings, key);