Replace vconf key with the value defined by vconf-internal-keys package

Change-Id: Ibc7c8ca24af0a876567250c46356641d4755b92d
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/include/wifi-direct-ipc.h b/include/wifi-direct-ipc.h
index 152caa5..e9d51db 100755 (executable)
--- a/include/wifi-direct-ipc.h
+++ b/include/wifi-direct-ipc.h
@@ -55,11 +55,6 @@ typedef unsigned int ipv4_addr_t;
 #define WIFI_DIRECT_MAX_SERVICES_LEN 1024
 #define WIFI_DIRECT_MAX_SERVICE_NAME_LEN 256
 
-#define VCONFKEY_IFNAME "memory/private/wifi_direct_manager/p2p_ifname"
-#define VCONFKEY_LOCAL_IP "memory/private/wifi_direct_manager/p2p_local_ip"
-#define VCONFKEY_SUBNET_MASK "memory/private/wifi_direct_manager/p2p_subnet_mask"
-#define VCONFKEY_GATEWAY "memory/private/wifi_direct_manager/p2p_gateway"
-
 /**
  * Wi-Fi Direct connection state
  */

diff --git a/include/wifi-direct-util.h b/include/wifi-direct-util.h
index 4e03953..e43c161 100755 (executable)
--- a/include/wifi-direct-util.h
+++ b/include/wifi-direct-util.h
@@ -40,9 +40,6 @@
 #define IP2SECSTR(a) (a)[0], (a)[3]
 #define IPSECSTR "%d..%d"
 
-#define VCONFKEY_DHCPS_IP_LEASE "memory/private/wifi_direct_manager/dhcp_ip_lease"
-#define VCONFKEY_DHCPC_SERVER_IP "memory/private/wifi_direct_manager/dhcpc_server_ip"
-#define VCONFKEY_LOCAL_IP "memory/private/wifi_direct_manager/p2p_local_ip"
 #define DHCP_DUMP_FILE "/tmp/dhcp-client-table"
 #define MAX_DHCP_DUMP_SIZE 64    /* Single lease format: [99:66:dd:00:11:aa 192.168.16.20 00:00:60] */
 

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index c63353c..f7462b4 100755 (executable)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -1,6 +1,6 @@
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.170
+Version:       1.2.171
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/src/wifi-direct-iface.c b/src/wifi-direct-iface.c
index bbca221..8edc1b4 100755 (executable)
--- a/src/wifi-direct-iface.c
+++ b/src/wifi-direct-iface.c
@@ -1549,13 +1549,13 @@ static void __wfd_manager_config_iface_handler(const gchar *method_name,
                        char *get_str = NULL;
                        char subnet_mask[IPSTR_LEN+1] = {0, };
 
-                       get_str = vconf_get_str(VCONFKEY_SUBNET_MASK);
+                       get_str = vconf_get_str(VCONFKEY_WIFI_DIRECT_P2P_SUBNET_MASK);
                        if (!get_str) {
                                WDS_LOGE("Get Subnet Mask failed");
                                ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                                goto failed;
                        }
-                       WDS_LOGD("VCONFKEY_SUBNET_MASK(%s) : %s", VCONFKEY_SUBNET_MASK,
+                       WDS_LOGD("VCONFKEY_WIFI_DIRECT_P2P_SUBNET_MASK(%s) : %s", VCONFKEY_WIFI_DIRECT_P2P_SUBNET_MASK,
                                get_str);
                        ret = WIFI_DIRECT_ERROR_NONE;
                        g_strlcpy(subnet_mask, get_str, IPSTR_LEN + 1);
@@ -1566,13 +1566,13 @@ static void __wfd_manager_config_iface_handler(const gchar *method_name,
        } else if (!g_strcmp0(method_name, "GetGateway")) {
                        char *get_str = NULL;
                        char gateway_addr[IPSTR_LEN+1] = {0, };
-                       get_str = vconf_get_str(VCONFKEY_GATEWAY);
+                       get_str = vconf_get_str(VCONFKEY_WIFI_DIRECT_P2P_GATEWAY);
                        if (!get_str) {
                                WDS_LOGE("Get Gateway failed");
                                ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                                goto failed;
                        }
-                       WDS_LOGD("VCONFKEY_GATEWAY_ADDR(%s) : %s", VCONFKEY_GATEWAY,
+                       WDS_LOGD("VCONFKEY_WIFI_DIRECT_P2P_GATEWAY_ADDR(%s) : %s", VCONFKEY_WIFI_DIRECT_P2P_GATEWAY,
                                get_str);
                        ret = WIFI_DIRECT_ERROR_NONE;
                        g_strlcpy(gateway_addr, get_str, IPSTR_LEN + 1);

diff --git a/src/wifi-direct-util.c b/src/wifi-direct-util.c
index 92052c5..665782c 100755 (executable)
--- a/src/wifi-direct-util.c
+++ b/src/wifi-direct-util.c
@@ -762,8 +762,8 @@ static void _dhcps_ip_leased_cb(keynode_t *key, void* data)
        }
        fclose(fp);
 
-       vconf_ignore_key_changed(VCONFKEY_DHCPS_IP_LEASE, _dhcps_ip_leased_cb);
-       vconf_set_int(VCONFKEY_DHCPS_IP_LEASE, 0);
+       vconf_ignore_key_changed(VCONFKEY_WIFI_DIRECT_DHCP_IP_LEASE, _dhcps_ip_leased_cb);
+       vconf_set_int(VCONFKEY_WIFI_DIRECT_DHCP_IP_LEASE, 0);
 
        __WDS_LOG_FUNC_EXIT__;
        return;
@@ -846,7 +846,7 @@ int wfd_util_dhcps_start(char *ifname)
        char *const envs[] = { NULL };
        wfd_manager_s *manager = wfd_get_manager();
 
-       vconf_set_int(VCONFKEY_DHCPS_IP_LEASE, 0);
+       vconf_set_int(VCONFKEY_WIFI_DIRECT_DHCP_IP_LEASE, 0);
 
        rv = wfd_util_execute_file(path, args, envs);
 
@@ -859,10 +859,10 @@ int wfd_util_dhcps_start(char *ifname)
         * As we are GO so IP should be updated
         * before sending Group Created Event
         */
-       vconf_set_str(VCONFKEY_IFNAME, GROUP_IFNAME);
-       vconf_set_str(VCONFKEY_LOCAL_IP, "192.168.49.1");
-       vconf_set_str(VCONFKEY_SUBNET_MASK, "255.255.255.0");
-       vconf_set_str(VCONFKEY_GATEWAY, "192.168.49.1");
+       vconf_set_str(VCONFKEY_WIFI_DIRECT_P2P_IFNAME, GROUP_IFNAME);
+       vconf_set_str(VCONFKEY_WIFI_DIRECT_P2P_LOCAL_IP, "192.168.49.1");
+       vconf_set_str(VCONFKEY_WIFI_DIRECT_P2P_SUBNET_MASK, "255.255.255.0");
+       vconf_set_str(VCONFKEY_WIFI_DIRECT_P2P_GATEWAY, "192.168.49.1");
 
        WDS_LOGD("Successfully started wifi-direct-dhcp.sh server");
 
@@ -881,8 +881,8 @@ int wfd_util_dhcps_wait_ip_leased(wfd_device_s *peer)
                return -1;
        }
 
-       vconf_set_int(VCONFKEY_DHCPS_IP_LEASE, 0);
-       vconf_notify_key_changed(VCONFKEY_DHCPS_IP_LEASE, _dhcps_ip_leased_cb, peer);
+       vconf_set_int(VCONFKEY_WIFI_DIRECT_DHCP_IP_LEASE, 0);
+       vconf_notify_key_changed(VCONFKEY_WIFI_DIRECT_DHCP_IP_LEASE, _dhcps_ip_leased_cb, peer);
 
        __WDS_LOG_FUNC_EXIT__;
        return 0;
@@ -897,8 +897,8 @@ int wfd_util_dhcps_stop(char *ifname)
        char *const args[] = { "/usr/bin/wifi-direct-dhcp.sh", "stop", iface, NULL };
        char *const envs[] = { NULL };
 
-       vconf_ignore_key_changed(VCONFKEY_DHCPS_IP_LEASE, _dhcps_ip_leased_cb);
-       vconf_set_int(VCONFKEY_DHCPS_IP_LEASE, 0);
+       vconf_ignore_key_changed(VCONFKEY_WIFI_DIRECT_DHCP_IP_LEASE, _dhcps_ip_leased_cb);
+       vconf_set_int(VCONFKEY_WIFI_DIRECT_DHCP_IP_LEASE, 0);
 
        rv = wfd_util_execute_file(path, args, envs);
 
@@ -1019,21 +1019,21 @@ int wfd_util_dhcpc_get_server_ip(unsigned char* ip_addr)
        }
 
        while (count < 10) {
-               get_str = vconf_get_str(VCONFKEY_DHCPC_SERVER_IP);
+               get_str = vconf_get_str(VCONFKEY_WIFI_DIRECT_DHCPC_SERVER_IP);
                if (!get_str) {
-                       WDS_LOGE("Failed to get vconf value[%s]", VCONFKEY_DHCPC_SERVER_IP);
+                       WDS_LOGE("Failed to get vconf value[%s]", VCONFKEY_WIFI_DIRECT_DHCPC_SERVER_IP);
                        __WDS_LOG_FUNC_EXIT__;
                        return -1;
                }
 
                if (strcmp(get_str, ZEROIP) == 0) {
-                       WDS_LOGE("Failed to get vconf value[%s]", VCONFKEY_DHCPC_SERVER_IP);
+                       WDS_LOGE("Failed to get vconf value[%s]", VCONFKEY_WIFI_DIRECT_DHCPC_SERVER_IP);
                        g_free(get_str);
                        __WDS_LOG_FUNC_EXIT__;
                        return -1;
                }
 
-               WDS_LOGD("VCONFKEY_DHCPC_SERVER_IP(%s) : %s\n", VCONFKEY_DHCPC_SERVER_IP, get_str);
+               WDS_LOGD("VCONFKEY_WIFI_DIRECT_DHCPC_SERVER_IP(%s) : %s\n", VCONFKEY_WIFI_DIRECT_DHCPC_SERVER_IP, get_str);
                _txt_to_ip(get_str, ip_addr);
                g_free(get_str);
                if (*ip_addr)
@@ -1053,10 +1053,10 @@ static int _wfd_util_set_vconf_for_static_ip(const char *ifname, char *static_ip
        if (!ifname || !static_ip)
                return -1;
 
-       vconf_set_str(VCONFKEY_IFNAME, ifname);
-       vconf_set_str(VCONFKEY_LOCAL_IP, static_ip);
-       vconf_set_str(VCONFKEY_SUBNET_MASK, "255.255.255.0");
-       vconf_set_str(VCONFKEY_GATEWAY, "192.168.49.1");
+       vconf_set_str(VCONFKEY_WIFI_DIRECT_P2P_IFNAME, ifname);
+       vconf_set_str(VCONFKEY_WIFI_DIRECT_P2P_LOCAL_IP, static_ip);
+       vconf_set_str(VCONFKEY_WIFI_DIRECT_P2P_SUBNET_MASK, "255.255.255.0");
+       vconf_set_str(VCONFKEY_WIFI_DIRECT_P2P_GATEWAY, "192.168.49.1");
 
        __WDS_LOG_FUNC_EXIT__;