Support association failed error

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

diff --git a/packaging/capi-network-wifi-manager.spec b/packaging/capi-network-wifi-manager.spec
index 111eeb7..61ea80b 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.13
+Version:       1.3.14
 Release:       0
 Group:         System/Network
 License:       Apache-2.0

diff --git a/src/network_error.h b/src/network_error.h
index 3c1aefb..af6afd7 100644 (file)
--- a/src/network_error.h
+++ b/src/network_error.h
@@ -44,6 +44,7 @@ typedef enum {
        NET_ERR_CONNECTION_WPS_OVERLAP = -890,                  /** Connection failure : wps overlap */
        NET_ERR_CONNECTION_WPS_TIMEOUT = -889,                  /** Connection failure : wps timeout */
        NET_ERR_CONNECTION_WPS_WEP_PROHIBITED = -888,   /** Connection failure : wps wep prohibited */
+       NET_ERR_CONNECTION_ASSOC_FAILED = -887,                 /** Connection failure : association failed */
 
        /* Other Error */
        NET_ERR_ACCESS_DENIED = -799,                                   /** Access(permission) denied */

diff --git a/src/network_interface.c b/src/network_interface.c
index a1cf43e..1ef627f 100644 (file)
--- a/src/network_interface.c
+++ b/src/network_interface.c
@@ -225,6 +225,8 @@ static inline int _net_extract_cinfo_error(const gchar *value)
                return NET_STATE_ERROR_CONNECT_FAILED;
        else if (g_strcmp0(value, "auth-failed") == 0)
                return NET_STATE_ERROR_AUTH_FAILED;
+       else if (g_strcmp0(value, "assoc-failed") == 0)
+               return NET_STATE_ERROR_ASSOC_FAILED;
        else if (g_strcmp0(value, "login-failed") == 0)
                return NET_STATE_ERROR_LOGIN_FAILED;
        else if (g_strcmp0(value, "dhcp-failed") == 0)

diff --git a/src/network_interface.h b/src/network_interface.h
index 75e68b2..fbbb8ce 100644 (file)
--- a/src/network_interface.h
+++ b/src/network_interface.h
@@ -106,6 +106,7 @@ typedef enum {
        NET_STATE_ERROR_LOGIN_FAILED    = 0x05,
        NET_STATE_ERROR_AUTH_FAILED             = 0x06,
        NET_STATE_ERROR_INVALID_KEY             = 0x07,
+       NET_STATE_ERROR_ASSOC_FAILED    = 0x08,
 } net_error_state_type_e;
 
 typedef enum {

diff --git a/src/network_internal.c b/src/network_internal.c
index e6ea11f..b9b3606 100644 (file)
--- a/src/network_internal.c
+++ b/src/network_internal.c
@@ -198,6 +198,8 @@ char* _net_print_error(net_err_e error)
                return "NET_ERR_CONNECTION_LOGIN_FAILED";
        case NET_ERR_CONNECTION_AUTH_FAILED:
                return "NET_ERR_CONNECTION_AUTH_FAILED";
+       case NET_ERR_CONNECTION_ASSOC_FAILED:
+               return "NET_ERR_CONNECTION_ASSOC_FAILED";
        case NET_ERR_CONNECTION_INVALID_KEY:
                return "NET_ERR_CONNECTION_INVALID_KEY";
 

diff --git a/src/network_signal.c b/src/network_signal.c
index d4f02ea..2e2ef0d 100644 (file)
--- a/src/network_signal.c
+++ b/src/network_signal.c
@@ -57,6 +57,8 @@ static int string2error(const char *error)
                return NET_ERR_CONNECTION_LOGIN_FAILED;
        else if (g_strcmp0(error, "auth-failed") == 0)
                return NET_ERR_CONNECTION_AUTH_FAILED;
+       else if (g_strcmp0(error, "assoc-failed") == 0)
+               return NET_ERR_CONNECTION_ASSOC_FAILED;
        else if (g_strcmp0(error, "invalid-key") == 0)
                return NET_ERR_CONNECTION_INVALID_KEY;
 

diff --git a/src/wifi_ap.c b/src/wifi_ap.c
index c3fd5ad..45e8dbd 100644 (file)
--- a/src/wifi_ap.c
+++ b/src/wifi_ap.c
@@ -297,6 +297,8 @@ 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_INVALID_KEY:

diff --git a/src/wifi_internal.c b/src/wifi_internal.c
index 0fc278e..3a1cc7d 100644 (file)
--- a/src/wifi_internal.c
+++ b/src/wifi_internal.c
@@ -82,6 +82,8 @@ 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_INVALID_KEY:
                return WIFI_MANAGER_ERROR_INVALID_KEY;