Add a new wifi error type for association failure

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

diff --git a/include/wifi-manager.h b/include/wifi-manager.h
index 4ab34ca3642d06c0e7cb383d958cc047d64ab2c9..8c81d49151d908496ebec11f93825167f69d95ad 100644 (file)
--- a/include/wifi-manager.h
+++ b/include/wifi-manager.h
@@ -183,6 +183,10 @@ typedef enum {
         */
        WIFI_MANAGER_ERROR_NOT_INITIALIZED = TIZEN_ERROR_WIFI_MANAGER|0x14,
 
+       /**
+        * Association failed (Since 7.0)
+        */
+       WIFI_MANAGER_ERROR_ASSOCIATION_FAILED = TIZEN_ERROR_WIFI_MANAGER|0x15,
 } wifi_manager_error_e;
 
 
@@ -919,6 +923,7 @@ typedef void(*wifi_manager_deactivated_cb)(wifi_manager_error_e result, void *us
  *              #WIFI_MANAGER_ERROR_CONNECT_FAILED           Connect failed \n
  *              #WIFI_MANAGER_ERROR_LOGIN_FAILED             Login failed \n
  *              #WIFI_MANAGER_ERROR_AUTHENTICATION_FAILED    Authentication failed \n
+ *              #WIFI_MANAGER_ERROR_ASSOCIATION_FAILED       Association failed \n
  *              #WIFI_MANAGER_ERROR_INVALID_KEY              Invalid key \n
  *              #WIFI_MANAGER_ERROR_PIN_MISSING              PIN missing \n
  *              #WIFI_MANAGER_ERROR_WPS_OVERLAP              WPS Overlap \n

diff --git a/packaging/capi-network-wifi-manager.spec b/packaging/capi-network-wifi-manager.spec
index 62a4a332ba0a752298a9db8813f0255064643cf7..85dc46ec346c5d4446cc72f7da97fba6673a5389 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.19
+Version:       1.3.20
 Release:       0
 Group:         System/Network
 License:       Apache-2.0

diff --git a/src/wifi_ap.c b/src/wifi_ap.c
index c84313a4790e41331e8f36f85b449341b0cc1f75..0fbfd69da26b2a344661a88a7a345428b34774d9 100644 (file)
--- a/src/wifi_ap.c
+++ b/src/wifi_ap.c
@@ -297,10 +297,11 @@ wifi_manager_error_e __wifi_convert_to_ap_error_state(net_error_state_type_e err
                ap_error_state = WIFI_MANAGER_ERROR_LOGIN_FAILED;
                break;
        case NET_STATE_ERROR_AUTH_FAILED:
-               /* fall through */
-       case NET_STATE_ERROR_ASSOC_FAILED:
                ap_error_state = WIFI_MANAGER_ERROR_AUTHENTICATION_FAILED;
                break;
+       case NET_STATE_ERROR_ASSOC_FAILED:
+               ap_error_state = WIFI_MANAGER_ERROR_ASSOCIATION_FAILED;
+               break;
        case NET_STATE_ERROR_INVALID_KEY:
                ap_error_state = WIFI_MANAGER_ERROR_INVALID_KEY;
                break;

diff --git a/src/wifi_internal.c b/src/wifi_internal.c
index e12e61e2aa5cf5c321d768adc8e7c6496262b8e6..7030dd4a70cedb6015da8c126d41bf6f1e755b42 100644 (file)
--- a/src/wifi_internal.c
+++ b/src/wifi_internal.c
@@ -82,9 +82,9 @@ static wifi_manager_error_e __convert_to_ap_error_type(net_err_e err_type)
        case NET_ERR_CONNECTION_LOGIN_FAILED:
                return WIFI_MANAGER_ERROR_LOGIN_FAILED;
        case NET_ERR_CONNECTION_AUTH_FAILED:
-               /* fall through */
-       case NET_ERR_CONNECTION_ASSOC_FAILED:
                return WIFI_MANAGER_ERROR_AUTHENTICATION_FAILED;
+       case NET_ERR_CONNECTION_ASSOC_FAILED:
+               return WIFI_MANAGER_ERROR_ASSOCIATION_FAILED;
        case NET_ERR_CONNECTION_INVALID_KEY:
                return WIFI_MANAGER_ERROR_INVALID_KEY;
        case NET_ERR_IN_PROGRESS:
@@ -143,6 +143,8 @@ static const char *__convert_ap_error_type_to_string(wifi_manager_error_e err_ty
                return "LOGIN_FAILED";
        case WIFI_MANAGER_ERROR_AUTHENTICATION_FAILED:
                return "AUTH_FAILED";
+       case WIFI_MANAGER_ERROR_ASSOCIATION_FAILED:
+               return "ASSOC_FAILED";
        case WIFI_MANAGER_ERROR_NO_REPLY:
                return "NO_REPLY";
        case WIFI_MANAGER_ERROR_SECURITY_RESTRICTED:

diff --git a/tools/connection-tool/wifi_connect_tool.c b/tools/connection-tool/wifi_connect_tool.c
index d5a8c110a681e76361c8713a72e5f34ff9171a6c..34dd0f9c270ef4997a93e2f784ec65762bdca760 100644 (file)
--- a/tools/connection-tool/wifi_connect_tool.c
+++ b/tools/connection-tool/wifi_connect_tool.c
@@ -114,6 +114,8 @@ static const char *__convert_error_to_string(int err)
                return "LOGIN_FAILED";
        case WIFI_MANAGER_ERROR_AUTHENTICATION_FAILED:
                return "AUTH_FAILED";
+       case WIFI_MANAGER_ERROR_ASSOCIATION_FAILED:
+               return "ASSOC_FAILED";
        case WIFI_MANAGER_ERROR_PIN_MISSING:
                return "PIN_MISSING";
        case WIFI_MANAGER_ERROR_WPS_OVERLAP:

diff --git a/tools/manager-test/wman_test_common.c b/tools/manager-test/wman_test_common.c
index 69d134f7cd063da88276db396ed6bbc363f1f817..d90df61f61a3fa28846b97fcf0b61d0a81196261 100644 (file)
--- a/tools/manager-test/wman_test_common.c
+++ b/tools/manager-test/wman_test_common.c
@@ -62,6 +62,8 @@ const char *wman_test_strerror(wifi_manager_error_e err_type)
                return "LOGIN_FAILED";
        case WIFI_MANAGER_ERROR_AUTHENTICATION_FAILED:
                return "AUTH_FAILED";
+       case WIFI_MANAGER_ERROR_ASSOCIATION_FAILED:
+               return "ASSOC_FAILED";
        case WIFI_MANAGER_ERROR_PIN_MISSING:
                return "PIN_MISSING";
        case WIFI_MANAGER_ERROR_WPS_OVERLAP:

diff --git a/tools/manager-tool/wifi_mgr_tool.c b/tools/manager-tool/wifi_mgr_tool.c
index 2e5cd982cd7b0213af2dee845058206a052ccdad..5c60514d18f9c9014e14a0baa8cd9864cca39b0e 100644 (file)
--- a/tools/manager-tool/wifi_mgr_tool.c
+++ b/tools/manager-tool/wifi_mgr_tool.c
@@ -682,6 +682,8 @@ const char *test_wifi_mgr_convert_error_to_string(wifi_manager_error_e err_type)
                return "LOGIN_FAILED";
        case WIFI_MANAGER_ERROR_AUTHENTICATION_FAILED:
                return "AUTH_FAILED";
+       case WIFI_MANAGER_ERROR_ASSOCIATION_FAILED:
+               return "ASSOC_FAILED";
        case WIFI_MANAGER_ERROR_PIN_MISSING:
                return "PIN_MISSING";
        case WIFI_MANAGER_ERROR_WPS_OVERLAP: