vpn-provider: Send domain name to connman when connection is ready

[platform/upstream/connman.git] / vpn / vpn-provider.c

diff --git a/vpn/vpn-provider.c b/vpn/vpn-provider.c
index 7bb3d81..513d926 100644 (file)
--- a/vpn/vpn-provider.c
+++ b/vpn/vpn-provider.c
@@ -408,6 +408,9 @@ static DBusMessage *set_property(DBusConnection *conn, DBusMessage *msg,
 
        DBG("conn %p", conn);
 
+       if (provider->immutable == TRUE)
+               return __connman_error_not_supported(msg);
+
        if (dbus_message_iter_init(msg, &iter) == FALSE)
                return __connman_error_invalid_arguments(msg);
 
@@ -458,6 +461,9 @@ static DBusMessage *clear_property(DBusConnection *conn, DBusMessage *msg,
 
        DBG("conn %p", conn);
 
+       if (provider->immutable == TRUE)
+               return __connman_error_not_supported(msg);
+
        dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &name,
                                                        DBUS_TYPE_INVALID);
 
@@ -828,7 +834,16 @@ static int vpn_provider_save(struct vpn_provider *provider)
 {
        GKeyFile *keyfile;
 
-       DBG("provider %p", provider);
+       DBG("provider %p immutable %s", provider,
+                                       provider->immutable ? "yes" : "no");
+
+       if (provider->immutable == TRUE) {
+               /*
+                * Do not save providers that are provisioned via .config
+                * file.
+                */
+               return -EPERM;
+       }
 
        keyfile = g_key_file_new();
        if (keyfile == NULL)
@@ -1219,6 +1234,27 @@ static const char *state2string(enum vpn_provider_state state)
        return NULL;
 }
 
+static void append_nameservers(DBusMessageIter *iter, char **servers)
+{
+       int i;
+
+       DBG("%p", servers);
+
+       for (i = 0; servers[i] != NULL; i++) {
+               DBG("servers[%d] %s", i, servers[i]);
+               dbus_message_iter_append_basic(iter,
+                                       DBUS_TYPE_STRING, &servers[i]);
+       }
+}
+
+static void append_dns(DBusMessageIter *iter, void *user_data)
+{
+       struct vpn_provider *provider = user_data;
+
+       if (provider->nameservers != NULL)
+               append_nameservers(iter, provider->nameservers);
+}
+
 static int provider_indicate_state(struct vpn_provider *provider,
                                enum vpn_provider_state state)
 {
@@ -1246,6 +1282,19 @@ static int provider_indicate_state(struct vpn_provider *provider,
                        connman_dbus_property_changed_dict(provider->path,
                                        VPN_CONNECTION_INTERFACE, "IPv6",
                                        append_ipv6, provider);
+
+               connman_dbus_property_changed_array(provider->path,
+                                               VPN_CONNECTION_INTERFACE,
+                                               "Nameservers",
+                                               DBUS_TYPE_STRING,
+                                               append_dns, provider);
+
+               if (provider->domain != NULL)
+                       connman_dbus_property_changed_basic(provider->path,
+                                               VPN_CONNECTION_INTERFACE,
+                                               "Domain",
+                                               DBUS_TYPE_STRING,
+                                               &provider->domain);
        }
 
        if (old_state != state)
@@ -1263,27 +1312,6 @@ static int provider_indicate_state(struct vpn_provider *provider,
        return 0;
 }
 
-static void append_nameservers(DBusMessageIter *iter, char **servers)
-{
-       int i;
-
-       DBG("%p", servers);
-
-       for (i = 0; servers[i] != NULL; i++) {
-               DBG("servers[%d] %s", i, servers[i]);
-               dbus_message_iter_append_basic(iter,
-                                       DBUS_TYPE_STRING, &servers[i]);
-       }
-}
-
-static void append_dns(DBusMessageIter *iter, void *user_data)
-{
-       struct vpn_provider *provider = user_data;
-
-       if (provider->nameservers != NULL)
-               append_nameservers(iter, provider->nameservers);
-}
-
 static void append_state(DBusMessageIter *iter,
                                        struct vpn_provider *provider)
 {
@@ -1998,8 +2026,7 @@ int __vpn_provider_create_from_config(GHashTable *settings,
                provider->config_file = g_strdup(config_ident);
                provider->config_entry = g_strdup(config_entry);
 
-               if (provider_register(provider) == 0)
-                       vpn_provider_load(provider);
+               provider_register(provider);
 
                provider_resolv_host_addr(provider);
        }
@@ -2015,6 +2042,8 @@ int __vpn_provider_create_from_config(GHashTable *settings,
        while (g_hash_table_iter_next(&hash, &key, &value) == TRUE)
                __vpn_provider_set_string_immutable(provider, key, value);
 
+       provider->immutable = TRUE;
+
        vpn_provider_save(provider);
 
        err = provider_register(provider);
@@ -2123,7 +2152,7 @@ static int set_string(struct vpn_provider *provider,
                        return -EPERM;
                }
 
-               setting = g_try_new(struct vpn_setting, 1);
+               setting = g_try_new0(struct vpn_setting, 1);
                if (setting == NULL)
                        return -ENOMEM;