Improve APIs that inform DHCP status

Signal for DHCP start point has been added.
And undefine TIZEN_DA for extension APIs.

Change-Id: I64ab4d0f9a6b2feef1f541893c35a2d476790f52
Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>

diff --git a/include/wifi-manager-extension.h b/include/wifi-manager-extension.h
index 328dd04..2010a8b 100644 (file)
--- a/include/wifi-manager-extension.h
+++ b/include/wifi-manager-extension.h
@@ -79,14 +79,14 @@ typedef enum {
        WIFI_MANAGER_ROAM_SUCCESS,          /**< Wi-Fi Roaming is successful. */
 } wifi_manager_roam_e;
 
-#if defined TIZEN_DA
 /**
  * @brief Enumeration for the Wi-Fi DHCP state.
  * @since_tizen 7.5
  */
 typedef enum {
-       WIFI_MANAGER_DHCP_STATE_FAILED = -1,    /* DHCP Fail */
-       WIFI_MANAGER_DHCP_STATE_SUCCESS = 0,    /* DHCP Success */
+       WIFI_MANAGER_DHCP_STATE_UNKNOWN = 0,  /* Unknown state */
+       WIFI_MANAGER_DHCP_STATE_STARTED = 1,  /* DHCP is running */
+       WIFI_MANAGER_DHCP_STATE_FINISHED = 2, /* DHCP is finished */
 } wifi_manager_dhcp_state_e;
 
 /**
@@ -107,7 +107,6 @@ typedef enum {
        WIFI_MANAGER_PS_MODE_DEFAULT_ON,
        WIFI_MANAGER_PS_MODE_DYNAMIC,
 } wifi_manager_power_save_mode_e;
-#endif /* TIZEN_DA */
 
 /**
  * @brief The Wi-Fi netlink scan handle.
@@ -883,18 +882,20 @@ int wifi_manager_set_roaming_cb(wifi_manager_h wifi,
  */
 int wifi_manager_unset_roaming_cb(wifi_manager_h wifi);
 
-#if defined TIZEN_DA
 /**
  * @brief Called when the DHCP state is changed.
+ * @details The following error codes can be received: \n
+ *              #WIFI_MANAGER_ERROR_NONE                 Successful \n
+ *              #WIFI_MANAGER_ERROR_DHCP_FAILED          DHCP failed \n
  * @since_tizen 7.5
  * @param[in] state         The DHCP state
- * @param[in] lease_time    The DHCP lease time
+ * @param[in] error_code    The error code
  * @param[in] user_data     The user data passed from the callback registration function
- * @see wifi_manager_dhcp_set_event_cb()
- * @see wifi_manager_dhcp_unset_event_cb()
+ * @see wifi_manager_set_dhcp_state_changed_cb()
+ * @see wifi_manager_unset_dhcp_state_changed_cb()
  */
-
-typedef void(*wifi_manager_dhcp_event_cb)(wifi_manager_dhcp_state_e state, int lease_time, void *user_data);
+typedef void(*wifi_manager_dhcp_event_cb)(wifi_manager_dhcp_state_e state,
+                                                       wifi_manager_error_e error_code, void *user_data);
 
 /**
  * @brief set DHCP event callback
@@ -914,7 +915,7 @@ typedef void(*wifi_manager_dhcp_event_cb)(wifi_manager_dhcp_state_e state, int l
  * @retval #WIFI_MANAGER_ERROR_PERMISSION_DENIED     Permission Denied
  * @retval #WIFI_MANAGER_ERROR_NOT_SUPPORTED         Not supported
  */
-int wifi_manager_dhcp_set_event_cb(wifi_manager_h wifi, wifi_manager_dhcp_event_cb callback, void *user_data);
+int wifi_manager_set_dhcp_state_changed_cb(wifi_manager_h wifi, wifi_manager_dhcp_event_cb callback, void *user_data);
 
 /**
  * @brief unset DHCP event callback
@@ -932,7 +933,7 @@ int wifi_manager_dhcp_set_event_cb(wifi_manager_h wifi, wifi_manager_dhcp_event_
  * @retval #WIFI_MANAGER_ERROR_PERMISSION_DENIED     Permission Denied
  * @retval #WIFI_MANAGER_ERROR_NOT_SUPPORTED         Not supported
  */
-int wifi_manager_dhcp_unset_event_cb(wifi_manager_h wifi);
+int wifi_manager_unset_dhcp_state_changed_cb(wifi_manager_h wifi);
 
 /**
  * @brief Gets power-save state.
@@ -1015,7 +1016,6 @@ int wifi_manager_get_power_save_mode(wifi_manager_h wifi, wifi_manager_power_sav
  * @retval #WIFI_MANAGER_ERROR_NOT_SUPPORTED        Not supported
  */
 int wifi_manager_set_power_save_mode(wifi_manager_h wifi, wifi_manager_power_save_mode_e ps_mode);
-#endif /* TIZEN_DA */
 
 /**
  * @}

diff --git a/packaging/capi-network-wifi-manager.spec b/packaging/capi-network-wifi-manager.spec
index b58e540..3737a3a 100644 (file)
--- a/packaging/capi-network-wifi-manager.spec
+++ b/packaging/capi-network-wifi-manager.spec
@@ -1,6 +1,6 @@
 Name:          capi-network-wifi-manager
 Summary:       Network Wi-Fi library in TIZEN C API
-Version:       1.3.22
+Version:       1.3.23
 Release:       0
 Group:         System/Network
 License:       Apache-2.0

diff --git a/src/network_dbus.c b/src/network_dbus.c
index f3baaec..77e7f65 100644 (file)
--- a/src/network_dbus.c
+++ b/src/network_dbus.c
@@ -1055,7 +1055,6 @@ static void __net_set_passpoint_reply(GObject *source_object, GAsyncResult *res,
 }
 
 //LCOV_EXCL_START
-#if defined TIZEN_DA
 static void __net_set_power_save_state_reply(GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
        __NETWORK_FUNC_ENTER__;
@@ -1109,7 +1108,6 @@ static void __net_set_power_save_mode_reply(GObject *source_object, GAsyncResult
 
        __NETWORK_FUNC_EXIT__;
 }
-#endif /* TIZEN_DA */
 //LCOV_EXCL_STOP
 
 static char *__net_make_group_name(unsigned char *raw_ssid,
@@ -4877,7 +4875,6 @@ int _net_dbus_get_vconf_value(network_info_s *network_info,
 }
 
 //LCOV_EXCL_START
-#if defined TIZEN_DA
 int _net_dbus_get_power_save_state(network_info_s *network_info, unsigned int *ps_state)
 {
        __NETWORK_FUNC_ENTER__;
@@ -4979,7 +4976,6 @@ int _net_dbus_set_power_save_mode(network_info_s *network_info, net_wifi_power_s
        __NETWORK_FUNC_EXIT__;
        return Error;
 }
-#endif /* TIZEN_DA */
 
 int _net_dbus_reset_wifi_config(network_info_s *network_info)
 {

diff --git a/src/network_dbus.h b/src/network_dbus.h
index eef0dd9..19f3d93 100644 (file)
--- a/src/network_dbus.h
+++ b/src/network_dbus.h
@@ -236,13 +236,11 @@ int _net_dbus_get_country_code(network_info_s *network_info, char **country);
 int _net_dbus_get_vconf_value(network_info_s *network_info,
                const char *key, const char *type, int *ret, int *int_value, char **str_value);
 
-#if defined TIZEN_DA
 int _net_dbus_get_power_save_state(network_info_s *network_info, unsigned int *ps_state);
 int _net_dbus_set_power_save_state(network_info_s *network_info, net_wifi_power_save_state_e ps_state);
 
 int _net_dbus_get_power_save_mode(network_info_s *network_info, unsigned int *ps_mode);
 int _net_dbus_set_power_save_mode(network_info_s *network_info, net_wifi_power_save_mode_e ps_mode);
-#endif /* TIZEN_DA */
 int _net_dbus_reset_wifi_config(network_info_s *network_info);
 
 #ifdef __cplusplus

diff --git a/src/network_info.h b/src/network_info.h
index b50085a..1a7141b 100644 (file)
--- a/src/network_info.h
+++ b/src/network_info.h
@@ -72,10 +72,8 @@ typedef enum {
        NET_EVENT_WIFI_DPP_REMOVED,
        NET_EVENT_WIFI_DPP_EVENT_IND, /* TODO: Make this in detail */
        NET_EVENT_WIFI_ROAM_STATE_IND,
-#if defined TIZEN_DA
        NET_EVENT_WIFI_TIMEOUT_RSP,
        NET_EVENT_WIFI_DHCP_STATE_IND,
-#endif /* TIZEN_DA */
 } net_event_e;
 
 typedef struct {
@@ -146,9 +144,7 @@ typedef struct {
        guint subscribe_id_connman_scanstarted;
        guint subscribe_id_connman_roaming;
        guint subscribe_id_netconfig_wifi;
-#if defined TIZEN_DA
        guint subscribe_id_connman_dhcp;
-#endif /* TIZEN_DA */
 
        char interface_name[NET_WLAN_IF_NAME_LEN];
        char mac_address[WIFI_MAC_ADDR_LEN + 1];

diff --git a/src/network_interface.c b/src/network_interface.c
index 93bd8f8..f96235b 100644 (file)
--- a/src/network_interface.c
+++ b/src/network_interface.c
@@ -4165,7 +4165,6 @@ int net_wifi_get_country_code(network_info_s *network_info, char **country)
 }
 
 //LCOV_EXCL_START
-#if defined TIZEN_DA
 int net_wifi_get_power_save_state(network_info_s *network_info, unsigned int *ps_state)
 {
        __NETWORK_FUNC_ENTER__;
@@ -4259,7 +4258,6 @@ int net_wifi_set_power_save_mode(network_info_s *network_info, net_wifi_power_sa
        __NETWORK_FUNC_EXIT__;
        return Error;
 }
-#endif /* TIZEN_DA */
 
 int net_wifi_reset_wifi_config(network_info_s *network_info)
 {

diff --git a/src/network_interface.h b/src/network_interface.h
index 1c4430d..f0b0a61 100644 (file)
--- a/src/network_interface.h
+++ b/src/network_interface.h
@@ -404,7 +404,6 @@ int net_wifi_get_random_mac_lifetime(network_info_s *network_info, unsigned int
 int net_wifi_set_country_code(network_info_s *network_info, const char *country);
 int net_wifi_get_country_code(network_info_s *network_info, char **country);
 
-#if defined TIZEN_DA
 typedef enum {
        WIFI_POWER_SAVE_OFF = 0x00,
        WIFI_POWER_SAVE_ON,
@@ -421,7 +420,6 @@ int net_wifi_set_power_save_state(network_info_s *network_info, net_wifi_power_s
 
 int net_wifi_get_power_save_mode(network_info_s *network_info, unsigned int *ps_mode);
 int net_wifi_set_power_save_mode(network_info_s *network_info, net_wifi_power_save_mode_e ps_mode);
-#endif /* TIZEN_DA */
 int net_wifi_reset_wifi_config(network_info_s *network_info);
 
 /**

diff --git a/src/network_internal.h b/src/network_internal.h
index ff68827..2da01f2 100644 (file)
--- a/src/network_internal.h
+++ b/src/network_internal.h
@@ -87,9 +87,7 @@ extern "C" {
 #define SIGNAL_SCAN_DONE                               "ScanDone"
 #define SIGNAL_SCAN_CHANGED                            "ScanChanged"
 #define SIGNAL_ROAMING_STATE_CHANGED   "RoamingStateChanged"
-#if defined TIZEN_DA
 #define SIGNAL_DHCP_CHANGED                            "DhcpChanged"
-#endif /* TIZEN_DA */
 
 #define CONNMAN_WIFI_TECHNOLOGY_PREFIX CONNMAN_PATH "/technology/wifi"
 

diff --git a/src/network_signal.c b/src/network_signal.c
index b3e13be..ead76a9 100644 (file)
--- a/src/network_signal.c
+++ b/src/network_signal.c
@@ -1957,13 +1957,14 @@ static int __net_handle_dpp_removed(network_info_s *network_info,
        return NET_ERR_NONE;
 }
 
-#if defined TIZEN_DA
 static int __net_handle_dhcp_changed(network_info_s *network_info, GVariant *param)
 {
        __NETWORK_FUNC_ENTER__;
 
        const char *key = NULL;
-       int value = 0;
+       const gchar *value = NULL;
+       int err = NET_ERR_UNKNOWN;
+       int dhcp_started = 0;
        GVariant *var;
        net_event_info_s *event_data = NULL;
 
@@ -1975,21 +1976,37 @@ static int __net_handle_dhcp_changed(network_info_s *network_info, GVariant *par
 
        g_variant_get(param, "(sv)", &key, &var);
 
-       if (g_strcmp0(key, "DHCP_SUCCESS") == 0 || g_strcmp0(key, "DHCP_FAIL") == 0) {
-               if (g_variant_is_of_type(var, G_VARIANT_TYPE_INT32))
-                       value = g_variant_get_int32(var);
+       if (g_strcmp0(key, "DHCP_STARTED") == 0) {
+               err = NET_ERR_NONE;
+               dhcp_started = 1;
+       } else if (g_strcmp0(key, "DHCP_SUCCESS") == 0) {
+               err = NET_ERR_NONE;
+               dhcp_started = 0;
+       } else if (g_strcmp0(key, "DHCP_FAIL") == 0) {
+               err = NET_ERR_CONNECTION_DHCP_FAILED;
+               dhcp_started = 0;
+       } else {
+               goto done;
+       }
 
-               WIFI_LOG(WIFI_INFO, "Key:[%s] value:[%d]", key, value);
+       if (g_variant_is_of_type(var, G_VARIANT_TYPE_STRING))
+               value = g_variant_get_string(var, NULL);
 
-               event_data->Event = NET_EVENT_WIFI_DHCP_STATE_IND;
-               event_data->Error = NET_ERR_NONE;
-               event_data->Datalength = sizeof(gint);
-               event_data->Data = &value;
+       WIFI_LOG(WIFI_INFO, "Key:[%s] value:[%s] ifname:[%s]",
+                       key, value, network_info->interface_name);
 
-               if (network_info->event_callback)
-                       network_info->event_callback(event_data, network_info->user_data);
-       }
+       if (g_strcmp0(network_info->interface_name, value) != 0)
+               goto done;
 
+       event_data->Event = NET_EVENT_WIFI_DHCP_STATE_IND;
+       event_data->Error = err;
+       event_data->Datalength = sizeof(int *);
+       event_data->Data = &dhcp_started;
+
+       if (network_info->event_callback)
+               network_info->event_callback(event_data, network_info->user_data);
+
+done:
        g_free(event_data);
 
        g_free((gchar *)key);
@@ -2000,7 +2017,6 @@ static int __net_handle_dhcp_changed(network_info_s *network_info, GVariant *par
        __NETWORK_FUNC_EXIT__;
        return NET_ERR_NONE;
 }
-#endif /* TIZEN_DA */
 
 static void __net_connman_manager_signal_filter(GDBusConnection *conn,
                const gchar *name, const gchar *path, const gchar *interface,
@@ -2014,10 +2030,8 @@ static void __net_connman_manager_signal_filter(GDBusConnection *conn,
                __net_handle_scan_done(network_info, param);
        else if (g_strcmp0(sig, SIGNAL_ROAMING_STATE_CHANGED) == 0)
                __net_handle_roaming_changed(network_info, param);
-#if defined TIZEN_DA
        else if (g_strcmp0(sig, SIGNAL_DHCP_CHANGED) == 0)
                __net_handle_dhcp_changed(network_info, param);
-#endif /* TIZEN_DA */
 }
 
 static void __net_netconfig_signal_filter(GDBusConnection *conn,
@@ -2381,7 +2395,6 @@ int _net_register_signal(network_info_s *network_info)
                        network_info,
                        NULL);
 
-#if defined TIZEN_DA
        /* Create connman service dhcp connection */
        network_info->subscribe_id_connman_dhcp = g_dbus_connection_signal_subscribe(
                        network_info->connection,
@@ -2394,7 +2407,6 @@ int _net_register_signal(network_info_s *network_info)
                        __net_connman_manager_signal_filter,
                        network_info,
                        NULL);
-#endif /* TIZEN_DA */
 
        /* LCOV_EXCL_START */
        if (network_info->subscribe_id_connman_state == 0 ||

diff --git a/src/wifi_internal.c b/src/wifi_internal.c
index e107d5d..0696213 100644 (file)
--- a/src/wifi_internal.c
+++ b/src/wifi_internal.c
@@ -1258,20 +1258,19 @@ static void __dpp_removed_cb(wifi_manager_handle_s *wifi_handle,
        g_p_dpp_current = NULL;
 }
 
-#if defined TIZEN_DA
-static void __dhcp_state_cb(wifi_manager_handle_s *wifi_handle, int lease_time)
+static void __dhcp_state_cb(wifi_manager_handle_s *wifi_handle, net_event_e err, int dhcp_started)
 {
        wifi_manager_dhcp_state_e state;
 
-       if (lease_time > 0)
-               state = WIFI_MANAGER_DHCP_STATE_SUCCESS;
+       if (dhcp_started)
+               state = WIFI_MANAGER_DHCP_STATE_STARTED;
        else
-               state = WIFI_MANAGER_DHCP_STATE_FAILED;
+               state = WIFI_MANAGER_DHCP_STATE_FINISHED;
 
        if (wifi_handle->dhcp_event_cb)
-               wifi_handle->dhcp_event_cb(state, lease_time, wifi_handle->dhcp_event_user_data);
+               wifi_handle->dhcp_event_cb(state,
+                               __convert_to_ap_error_type(err), wifi_handle->dhcp_event_user_data);
 }
-#endif /* TIZEN_DA */
 
 static void __roaming_state_changed_cb(wifi_manager_handle_s *wifi_handle,
                net_roam_event_info_s *roam_event_info)
@@ -1591,13 +1590,14 @@ static void _wifi_evt_cb(net_event_info_s *event_cb, void *user_data)
 
                __connected_cb(wifi_handle, result);
                break;
+#endif /* TIZEN_DA */
        case NET_EVENT_WIFI_DHCP_STATE_IND:
                {
-                       int *lease_time = (int *)event_cb->Data;
-                       __dhcp_state_cb(wifi_handle, *lease_time);
+                       net_event_e err = event_cb->Error;
+                       int *dhcp_started = (int *)event_cb->Data;
+                       __dhcp_state_cb(wifi_handle, err, *dhcp_started);
                }
                break;
-#endif /* TIZEN_DA */
        //LCOV_EXCL_STOP
        default:
                break;
@@ -4257,7 +4257,6 @@ int _wifi_get_country_code(wifi_manager_h wifi, char **country)
 }
 
 //LCOV_EXCL_START
-#if defined TIZEN_DA
 int _wifi_get_power_save_state(wifi_manager_h wifi, wifi_manager_power_save_state_e *ps_state)
 {
        int rv = 0;
@@ -4340,7 +4339,6 @@ int _wifi_set_power_save_mode(wifi_manager_h wifi, wifi_manager_power_save_mode_
 
        return WIFI_MANAGER_ERROR_NONE;
 }
-#endif /* TIZEN_DA */
 
 int _wifi_reset_wifi_config(wifi_manager_h wifi)
 {

diff --git a/src/wifi_internal.h b/src/wifi_internal.h
index cea5b4d..5cef866 100644 (file)
--- a/src/wifi_internal.h
+++ b/src/wifi_internal.h
@@ -263,10 +263,8 @@ typedef struct {
        void *dpp_event_user_data;
        wifi_manager_roaming_state_changed_cb roaming_state_changed_cb;
        void *roaming_state_changed_user_data;
-#if defined TIZEN_DA
        wifi_manager_dhcp_event_cb dhcp_event_cb;
        void *dhcp_event_user_data;
-#endif /* TIZEN_DA */
 
        network_info_s *network_info;
        char interface_name[NET_WLAN_IF_NAME_LEN];
@@ -604,13 +602,11 @@ int _wifi_get_random_mac_lifetime(wifi_manager_h wifi, unsigned int *lifetime);
 int _wifi_set_country_code(wifi_manager_h wifi, const char *country);
 int _wifi_get_country_code(wifi_manager_h wifi, char **country);
 
-#if defined TIZEN_DA
 int _wifi_get_power_save_state(wifi_manager_h wifi, wifi_manager_power_save_state_e *ps_state);
 int _wifi_set_power_save_state(wifi_manager_h wifi, wifi_manager_power_save_state_e ps_state);
 
 int _wifi_get_power_save_mode(wifi_manager_h wifi, wifi_manager_power_save_mode_e *ps_mode);
 int _wifi_set_power_save_mode(wifi_manager_h wifi, wifi_manager_power_save_mode_e ps_mode);
-#endif /* TIZEN_DA */
 int _wifi_reset_wifi_config(wifi_manager_h wifi);
 
 #ifdef __cplusplus

diff --git a/src/wifi_manager.c b/src/wifi_manager.c
index 84bab68..6fdd4d2 100644 (file)
--- a/src/wifi_manager.c
+++ b/src/wifi_manager.c
@@ -2280,7 +2280,6 @@ EXPORT_API int wifi_manager_unset_roaming_cb(wifi_manager_h wifi)
 }
 
 //LCOV_EXCL_START
-#if defined TIZEN_DA
 static int __wifi_set_dhcp_event_cb(wifi_manager_h wifi,
                        void *callback, void *user_data)
 {
@@ -2292,7 +2291,7 @@ static int __wifi_set_dhcp_event_cb(wifi_manager_h wifi,
        return WIFI_MANAGER_ERROR_NONE;
 }
 
-EXPORT_API int wifi_manager_dhcp_set_event_cb(wifi_manager_h wifi,
+EXPORT_API int wifi_manager_set_dhcp_state_changed_cb(wifi_manager_h wifi,
                wifi_manager_dhcp_event_cb callback, void *user_data)
 {
        __NETWORK_CAPI_FUNC_ENTER__;
@@ -2311,7 +2310,7 @@ EXPORT_API int wifi_manager_dhcp_set_event_cb(wifi_manager_h wifi,
        return __wifi_set_dhcp_event_cb(wifi, callback, user_data);
 }
 
-EXPORT_API int wifi_manager_dhcp_unset_event_cb(wifi_manager_h wifi)
+EXPORT_API int wifi_manager_unset_dhcp_state_changed_cb(wifi_manager_h wifi)
 {
        __NETWORK_CAPI_FUNC_ENTER__;
 
@@ -2418,5 +2417,4 @@ EXPORT_API int wifi_manager_set_power_save_mode(wifi_manager_h wifi, wifi_manage
        __NETWORK_CAPI_FUNC_EXIT__;
        return rv;
 }
-#endif /* TIZEN_DA */
 //LCOV_EXCL_STOP

diff --git a/tools/manager-test/wman_test_extension.c b/tools/manager-test/wman_test_extension.c
index 847304e..6a29433 100644 (file)
--- a/tools/manager-test/wman_test_extension.c
+++ b/tools/manager-test/wman_test_extension.c
@@ -896,7 +896,6 @@ void wman_test_print_connection_mode(wifi_manager_ap_h ap)
                printf("Fail to get operation mode\n");
 }
 
-#if defined TIZEN_DA
 int wman_test_get_power_save_state(wifi_manager_h wifi)
 {
        int rv;
@@ -984,4 +983,3 @@ int wman_test_set_power_save_mode(wifi_manager_h wifi)
 
        return 1;
 }
-#endif /* TIZEN_DA */

diff --git a/tools/manager-test/wman_test_extension.h b/tools/manager-test/wman_test_extension.h
index bdd4abf..e2af2f4 100644 (file)
--- a/tools/manager-test/wman_test_extension.h
+++ b/tools/manager-test/wman_test_extension.h
@@ -44,9 +44,8 @@ int wman_test_set_country_code(wifi_manager_h wifi);
 int wman_test_get_country_code(wifi_manager_h wifi);
 int wman_test_check_supported_security_type(wifi_manager_h wifi);
 void wman_test_print_connection_mode(wifi_manager_ap_h ap);
-#if defined TIZEN_DA
 int wman_test_get_power_save_state(wifi_manager_h wifi);
 int wman_test_set_power_save_state(wifi_manager_h wifi);
 int wman_test_get_power_save_mode(wifi_manager_h wifi);
 int wman_test_set_power_save_mode(wifi_manager_h wifi);
-#endif /* TIZEN_DA */
+

diff --git a/tools/manager-test/wman_test_main.c b/tools/manager-test/wman_test_main.c
index ed4d88c..4fc185f 100644 (file)
--- a/tools/manager-test/wman_test_main.c
+++ b/tools/manager-test/wman_test_main.c
@@ -162,15 +162,11 @@ static void __test_roaming_state_changed_callback(wifi_manager_roam_e state,
        printf(", cur_bssid: %s, dst_bssid: %s\n", cur_bssid, dst_bssid);
 }
 
-#if defined TIZEN_DA
-static void __test_dhcp_changed_callback(wifi_manager_dhcp_state_e state, int lease_time, void *user_data)
+static void __test_dhcp_changed_callback(wifi_manager_dhcp_state_e state, wifi_manager_error_e error_code, void *user_data)
 {
-       if (state == WIFI_MANAGER_DHCP_STATE_SUCCESS)
-               printf("[%s] DHCP state changed callback, state : Success, lease time : %d\n", (char *)user_data, lease_time);
-       else
-               printf("[%s] DHCP state changed callback, state : Fail\n", (char *)user_data);
+               printf("[%s] DHCP state changed callback, state : %d, error : %s\n",
+                               (char *)user_data, state, wman_test_strerror(error_code));
 }
-#endif /* TIZEN_DA */
 
 int wman_test_init(void)
 {
@@ -187,9 +183,7 @@ int wman_test_init(void)
                wifi_manager_tdls_set_discovered_cb(wifi, __test_tdls_discover_callback, "1");
                wifi_manager_set_module_state_changed_cb(wifi, __test_get_wifi_module_state_callback, "1");
                wifi_manager_set_roaming_cb(wifi, __test_roaming_state_changed_callback, "1");
-#if defined TIZEN_DA
-               wifi_manager_dhcp_set_event_cb(wifi, __test_dhcp_changed_callback, "1");
-#endif /* TIZEN_DA */
+               wifi_manager_set_dhcp_state_changed_cb(wifi, __test_dhcp_changed_callback, "1");
 
        } else {
                printf("[1] Wifi init failed [%s]\n", wman_test_strerror(rv));
@@ -206,9 +200,7 @@ int wman_test_init(void)
                wifi_manager_tdls_set_state_changed_cb(wifi2, __test_tdls_state_callback, "2");
                wifi_manager_tdls_set_discovered_cb(wifi, __test_tdls_discover_callback, "2");
                wifi_manager_set_module_state_changed_cb(wifi, __test_get_wifi_module_state_callback, "2");
-#if defined TIZEN_DA
-               wifi_manager_dhcp_set_event_cb(wifi2, __test_dhcp_changed_callback, "2");
-#endif /* TIZEN_DA */
+               wifi_manager_set_dhcp_state_changed_cb(wifi2, __test_dhcp_changed_callback, "2");
        } else {
                printf("[2] Wifi init failed [%s]\n", wman_test_strerror(rv));
                return -1;
@@ -331,12 +323,10 @@ gboolean test_thread(GIOChannel *source, GIOCondition condition, gpointer data)
                printf("^   - Set country code\n");
                printf("&   - Get country code\n");
                printf("*   - Check available security type\n");
-#if defined TIZEN_DA
                printf("(   - Get power-save state\n");
                printf(")   - Set power-save state\n");
                printf("-   - Get power-save mode\n");
                printf("=   - Set power-save mode\n");
-#endif /* TIZEN_DA */
                printf("[   - Get Interval of Auto Scan\n");
                printf("]   - Set Interval of Auto Scan\n");
                printf(";   - Remove All Wi-Fi configurations\n");
@@ -553,7 +543,6 @@ gboolean test_thread(GIOChannel *source, GIOCondition condition, gpointer data)
        case '*':
                rv = wman_test_check_supported_security_type(wifi);
                break;
-#if defined TIZEN_DA
        case '(':
                rv = wman_test_get_power_save_state(wifi);
                break;
@@ -566,7 +555,6 @@ gboolean test_thread(GIOChannel *source, GIOCondition condition, gpointer data)
        case '=':
                rv = wman_test_set_power_save_mode(wifi);
                break;
-#endif /* TIZEN_DA */
        case '[':
                rv = wman_test_get_autoscan_interval(wifi);
                break;