Cleanup driver and wpa_supplicant when tech power on is failed

[platform/core/connectivity/net-config.git] / src / network-state.c

diff --git a/src/network-state.c b/src/network-state.c
index a614685..27692cf 100755 (executable)
--- a/src/network-state.c
+++ b/src/network-state.c
@@ -763,21 +763,21 @@ static void __netconfig_update_default_connection_info(void)
                builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
 
                if (ip_addr != NULL) {
-                       netconfig_set_vconf_str(VCONFKEY_NETWORK_IP, ip_addr);
+                       netconfig_set_vconf_str(VCONFKEY_NETWORK_IP, ip_addr, TRUE);
                        g_variant_builder_add(builder, "{sv}", "IPv4Address",
                                                                  g_variant_new_string(ip_addr));
                } else {
-                       netconfig_set_vconf_str(VCONFKEY_NETWORK_IP, "");
+                       netconfig_set_vconf_str(VCONFKEY_NETWORK_IP, "", TRUE);
                        g_variant_builder_add(builder, "{sv}", "IPv4Address",
                                                                  g_variant_new_string(""));
                }
 
                if (ip_addr6 != NULL) {
-                       netconfig_set_vconf_str(VCONFKEY_NETWORK_IP6, ip_addr6);
+                       netconfig_set_vconf_str(VCONFKEY_NETWORK_IP6, ip_addr6, TRUE);
                        g_variant_builder_add(builder, "{sv}", "IPv6Address",
                                                                  g_variant_new_string(ip_addr6));
                } else {
-                       netconfig_set_vconf_str(VCONFKEY_NETWORK_IP6, "");
+                       netconfig_set_vconf_str(VCONFKEY_NETWORK_IP6, "", TRUE);
                        g_variant_builder_add(builder, "{sv}", "IPv6Address",
                                                                  g_variant_new_string(""));
                }
@@ -803,29 +803,29 @@ static void __netconfig_update_default_connection_info(void)
        if (profile == NULL && old_network_status != VCONFKEY_NETWORK_OFF) {
                builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
 
-               netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS, VCONFKEY_NETWORK_OFF);
+               netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS, VCONFKEY_NETWORK_OFF, TRUE);
                g_variant_builder_add(builder, "{sv}", "NetworkStatus",
                                                          g_variant_new_int32(VCONFKEY_NETWORK_OFF));
 
-               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP, "");
+               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP, "", TRUE);
                g_variant_builder_add(builder, "{sv}", "IPv4Address",
                                                          g_variant_new_string(""));
 
-               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP6, "");
+               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP6, "", TRUE);
                g_variant_builder_add(builder, "{sv}", "IPv6Address",
                                                          g_variant_new_string(""));
 
-               netconfig_set_vconf_str(VCONFKEY_NETWORK_PROXY, "");
+               netconfig_set_vconf_str(VCONFKEY_NETWORK_PROXY, "", TRUE);
                g_variant_builder_add(builder, "{sv}", "ProxyAddress",
                                                          g_variant_new_string(""));
 
                params = g_variant_new("(@a{sv})", g_variant_builder_end(builder));
 
-               netconfig_set_vconf_int(VCONFKEY_NETWORK_CONFIGURATION_CHANGE_IND, 0);
+               netconfig_set_vconf_int(VCONFKEY_NETWORK_CONFIGURATION_CHANGE_IND, 0, TRUE);
                netconfig_dbus_emit_signal(NULL, NETCONFIG_NETWORK_PATH,
                                                   NETCONFIG_NETWORK_INTERFACE, "NetworkConfigChanged",
                                                   params);
-               netconfig_set_vconf_int("memory/private/wifi/frequency", 0);
+               netconfig_set_vconf_int("memory/private/wifi/frequency", 0, TRUE);
 
                g_variant_builder_unref(builder);
 
@@ -842,11 +842,10 @@ static void __netconfig_update_default_connection_info(void)
                builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
 
                if (netconfig_is_wifi_profile(profile) == TRUE) {
-                       netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS,
-                                                                       VCONFKEY_NETWORK_WIFI);
+                       netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS, VCONFKEY_NETWORK_WIFI, TRUE);
                        g_variant_builder_add(builder, "{sv}", "NetworkStatus",
                                                          g_variant_new_int32(VCONFKEY_NETWORK_WIFI));
-                       netconfig_set_vconf_int("memory/private/wifi/frequency", freq);
+                       netconfig_set_vconf_int("memory/private/wifi/frequency", freq, TRUE);
 
                        netconfig_set_system_event(SYS_EVT_NETWORK_STATUS,
                                EKEY_NETWORK_STATUS, EVAL_NETWORK_WIFI);
@@ -863,8 +862,7 @@ static void __netconfig_update_default_connection_info(void)
                                return;
                        }
 
-                       netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS,
-                                                                       VCONFKEY_NETWORK_CELLULAR);
+                       netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS, VCONFKEY_NETWORK_CELLULAR, TRUE);
                        g_variant_builder_add(builder, "{sv}", "NetworkStatus",
                                                          g_variant_new_int32(VCONFKEY_NETWORK_CELLULAR));
 
@@ -876,22 +874,19 @@ static void __netconfig_update_default_connection_info(void)
                                netconfig_clatd_enable();
                        }
                } else if (netconfig_is_ethernet_profile(profile) == TRUE) {
-                       netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS,
-                                                                       VCONFKEY_NETWORK_ETHERNET);
+                       netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS, VCONFKEY_NETWORK_ETHERNET, TRUE);
                        g_variant_builder_add(builder, "{sv}", "NetworkStatus",
                                                          g_variant_new_int32(VCONFKEY_NETWORK_ETHERNET));
                        netconfig_set_system_event(SYS_EVT_NETWORK_STATUS,
                                EKEY_NETWORK_STATUS, EVAL_NETWORK_ETHERNET);
                } else if (netconfig_is_bluetooth_profile(profile) == TRUE) {
-                       netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS,
-                                                                       VCONFKEY_NETWORK_BLUETOOTH);
+                       netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS, VCONFKEY_NETWORK_BLUETOOTH, TRUE);
                        g_variant_builder_add(builder, "{sv}", "NetworkStatus",
                                                          g_variant_new_int32(VCONFKEY_NETWORK_BLUETOOTH));
                        netconfig_set_system_event(SYS_EVT_NETWORK_STATUS,
                                EKEY_NETWORK_STATUS, EVAL_NETWORK_BT);
                } else{
-                       netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS,
-                                                                       VCONFKEY_NETWORK_OFF);
+                       netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS, VCONFKEY_NETWORK_OFF, TRUE);
                        g_variant_builder_add(builder, "{sv}", "NetworkStatus",
                                                          g_variant_new_int32(VCONFKEY_NETWORK_OFF));
                        netconfig_set_system_event(SYS_EVT_NETWORK_STATUS,
@@ -900,11 +895,11 @@ static void __netconfig_update_default_connection_info(void)
 
                if (g_strcmp0(old_ip, ip_addr) != 0 || old_ip == NULL) {
                        if (ip_addr != NULL) {
-                               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP, ip_addr);
+                               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP, ip_addr, TRUE);
                                g_variant_builder_add(builder, "{sv}", "IPv4Address",
                                                                  g_variant_new_string(ip_addr));
                        } else if (old_ip != NULL && strlen(old_ip) > 0) {
-                               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP, "");
+                               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP, "", TRUE);
                                g_variant_builder_add(builder, "{sv}", "IPv4Address",
                                                                  g_variant_new_string(""));
                        }
@@ -914,11 +909,11 @@ static void __netconfig_update_default_connection_info(void)
 
                if (g_strcmp0(old_ip6, ip_addr6) != 0 || old_ip6 == NULL) {
                        if (ip_addr6 != NULL) {
-                               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP6, ip_addr6);
+                               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP6, ip_addr6, TRUE);
                                g_variant_builder_add(builder, "{sv}", "IPv6Address",
                                                                  g_variant_new_string(ip_addr6));
                        } else if (old_ip6 != NULL && strlen(old_ip6) > 0) {
-                               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP6, "");
+                               netconfig_set_vconf_str(VCONFKEY_NETWORK_IP6, "", TRUE);
                                g_variant_builder_add(builder, "{sv}", "IPv6Address",
                                                                  g_variant_new_string(""));
                        }
@@ -928,11 +923,11 @@ static void __netconfig_update_default_connection_info(void)
 
                if (g_strcmp0(old_proxy, proxy_addr) != 0) {
                        if (proxy_addr == NULL) {
-                               netconfig_set_vconf_str(VCONFKEY_NETWORK_PROXY, "");
+                               netconfig_set_vconf_str(VCONFKEY_NETWORK_PROXY, "", TRUE);
                                g_variant_builder_add(builder, "{sv}", "ProxyAddress",
                                                                  g_variant_new_string(""));
                        } else {
-                               netconfig_set_vconf_str(VCONFKEY_NETWORK_PROXY, proxy_addr);
+                               netconfig_set_vconf_str(VCONFKEY_NETWORK_PROXY, proxy_addr, TRUE);
                                g_variant_builder_add(builder, "{sv}", "ProxyAddress",
                                                                  g_variant_new_string(proxy_addr));
                        }
@@ -942,7 +937,7 @@ static void __netconfig_update_default_connection_info(void)
 
                params = g_variant_new("(@a{sv})", g_variant_builder_end(builder));
 
-               netconfig_set_vconf_int(VCONFKEY_NETWORK_CONFIGURATION_CHANGE_IND, 1);
+               netconfig_set_vconf_int(VCONFKEY_NETWORK_CONFIGURATION_CHANGE_IND, 1, TRUE);
                netconfig_dbus_emit_signal(NULL, NETCONFIG_NETWORK_PATH,
                                                   NETCONFIG_NETWORK_INTERFACE, "NetworkConfigChanged",
                                                   params);