Return proper error code in TDLS disconnect operation

Change-Id: I2fc0391a500912a49157c0de014b5f85f615ab15
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>

diff --git a/packaging/capi-network-wifi-manager.spec b/packaging/capi-network-wifi-manager.spec
index 0884437adbd2d6497e7c07a2a286e934dc9bcbfd..558c226f16c49afc0b5339a8f2330e1bd7f36941 100755 (executable)
--- 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.2.5
+Version:       1.2.6
 Release:       1
 Group:         System/Network
 License:       Apache-2.0

diff --git a/src/network_dbus.c b/src/network_dbus.c
index 2e5e6c7cd500d00a59943d6df89540ecae6d683b..728bde93191cce0e1b9fe33442e3540c32374e0d 100755 (executable)
--- a/src/network_dbus.c
+++ b/src/network_dbus.c
@@ -2940,7 +2940,13 @@ int _net_dbus_tdls_disconnect(network_info_s *network_info, const char* peer_mac
        WIFI_LOG(WIFI_INFO, "[%s] success", method);
        WIFI_LOG(WIFI_INFO, ", status [%d]", ret);
 
-       if (ret)
+       /**
+        * Below are the expected error codes
+        * 0x00 - NETCONFIG_ERROR_TDLS_NO_ERROR
+        * 0x01 - NETCONFIG_ERROR_INTERNAL
+        * 0x04 - NETCONFIG_ERROR_TDLS_ALREADY_DONE
+        */
+       if (ret == 0x00 || ret == 0x04)
                Error = NET_ERR_NONE;
        else
                Error = NET_ERR_UNKNOWN;
@@ -3017,7 +3023,12 @@ int _net_dbus_tdls_connect(network_info_s *network_info, const char *peer_mac_ad
        WIFI_LOG(WIFI_INFO, "[%s] success", method);
        WIFI_LOG(WIFI_INFO, ", status [%d]", ret);
 
-       if (ret)
+       /**
+        * Below are the expected error codes
+        * 0x00 - NETCONFIG_ERROR_TDLS_NO_ERROR
+        * 0x01 - NETCONFIG_ERROR_INTERNAL
+        */
+       if (ret == 0x00)
                Error = NET_ERR_NONE;
        else
                Error = NET_ERR_UNKNOWN;
@@ -3057,11 +3068,17 @@ int _net_dbus_tdls_discover(network_info_s *network_info, const char *peer_mac_a
        WIFI_LOG(WIFI_INFO, "[%s] success", method);
        WIFI_LOG(WIFI_INFO, ", status [%d]", ret);
 
+       /**
+        * Below are the expected error codes
+        * 0x00 - NETCONFIG_ERROR_TDLS_NO_ERROR
+        * 0x01 - NETCONFIG_ERROR_INTERNAL
+        * 0x04 - NETCONFIG_ERROR_TDLS_ALREADY_DONE
+        */
        if (ret == 0x00)
                Error = NET_ERR_NONE;
        else if (ret == 0x01)
                Error = NET_ERR_FAIL_TDLS_DISCOVER;
-       else if (ret == 0x04) /*0x04: TDLS Discovery in Progress at lower layer*/
+       else if (ret == 0x04) /* 0x04: TDLS Discovery in Progress at lower layer */
                Error = NET_ERR_IN_PROGRESS;
        else
                Error = NET_ERR_UNKNOWN;