diff options
author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2012-08-23 14:19:35 +0300 |
---|---|---|
committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-08-23 15:11:43 +0300 |
commit | bcb5fb24b08bf536e12526733c32f9af2c93dd0a (patch) | |
tree | 800175b539528eb38f6f78694e490f234db8194e /src/provider.c | |
parent | b852e57ba2f0c69688755aa1df97ec51f5988e3f (diff) | |
download | connman-bcb5fb24b08bf536e12526733c32f9af2c93dd0a.tar.gz connman-bcb5fb24b08bf536e12526733c32f9af2c93dd0a.tar.bz2 connman-bcb5fb24b08bf536e12526733c32f9af2c93dd0a.zip |
provider: Return VPN gateway IP address
If 'provider->host_ip[0]' is set, it contains the
resolved IP address. If not set, the 'Host' property
already contains an IP address.
Diffstat (limited to 'src/provider.c')
-rw-r--r-- | src/provider.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/provider.c b/src/provider.c index 251d0b05..3af6f19c 100644 --- a/src/provider.c +++ b/src/provider.c @@ -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); |