Fixed memory leak

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

diff --git a/src/network-state.c b/src/network-state.c
index f0c488f..9987d1f 100755 (executable)
--- a/src/network-state.c
+++ b/src/network-state.c
@@ -28,9 +28,6 @@
 #include <sys/ioctl.h>
 #include <ITapiSim.h>
 #include <TapiUtility.h>
-#include <bundle.h>
-#include <bundle_internal.h>
-#include <eventsystem.h>
 
 #include "log.h"
 #include "util.h"
@@ -478,8 +475,8 @@ static void __netconfig_update_default_connection_info(void)
                        netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS, VCONFKEY_NETWORK_WIFI);
                        netconfig_set_vconf_int("memory/private/wifi/frequency", freq);
 
-                       netconfig_set_system_event(SYS_EVENT_NETWORK_STATUS,
-                               EVT_KEY_NETWORK_STATUS, EVT_VAL_NETWORK_WIFI);
+                       netconfig_set_system_event(SYS_EVT_NETWORK_STATUS,
+                               EKEY_NETWORK_STATUS, EVAL_NETWORK_WIFI);
                } else if (netconfig_is_cellular_profile(profile)) {
 
                        if (!netconfig_is_cellular_internet_profile(profile)) {
@@ -489,20 +486,20 @@ static void __netconfig_update_default_connection_info(void)
 
                        netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS, VCONFKEY_NETWORK_CELLULAR);
 
-                       netconfig_set_system_event(SYS_EVENT_NETWORK_STATUS,
-                               EVT_KEY_NETWORK_STATUS, EVT_VAL_NETWORK_CELLULAR);
+                       netconfig_set_system_event(SYS_EVT_NETWORK_STATUS,
+                               EKEY_NETWORK_STATUS, EVAL_NETWORK_CELLULAR);
                } else if (netconfig_is_ethernet_profile(profile) == TRUE) {
                        netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS, VCONFKEY_NETWORK_ETHERNET);
-                       netconfig_set_system_event(SYS_EVENT_NETWORK_STATUS,
-                               EVT_KEY_NETWORK_STATUS, EVT_VAL_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_system_event(SYS_EVENT_NETWORK_STATUS,
-                               EVT_KEY_NETWORK_STATUS, EVT_VAL_NETWORK_BT);
+                       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_system_event(SYS_EVENT_NETWORK_STATUS,
-                               EVT_KEY_NETWORK_STATUS, EVT_VAL_NETWORK_DISCONNECTED);
+                       netconfig_set_system_event(SYS_EVT_NETWORK_STATUS,
+                               EKEY_NETWORK_STATUS, EVAL_NETWORK_DISCONNECTED);
                }
 
                if (g_strcmp0(old_ip, ip_addr) != 0 || old_ip == NULL) {
@@ -865,6 +862,8 @@ char *netconfig_get_ifname(const char *profile)
                        while (g_variant_iter_loop(next, "{sv}", &key1, &variant)) {
                                if (g_strcmp0(key1, "Interface") == 0) {
                                        value = g_variant_get_string(variant, NULL);
+                                       if (ifname)
+                                               g_free(ifname);
                                        ifname = g_strdup(value);
                                }
                        }