[SPIN] Indicate auth-failed error.

desc: In case of wifi connection if Association fail,
indicate "auth-failed" error.

Change-Id: Ie08088f3e5b5ff940d0e4290814c266d28e59b15
Signed-off-by: Niraj Kumar Goit <niraj.g@samsung.com>

diff --git a/plugins/wifi.c b/plugins/wifi.c
index b4abd21ddf0d7cfcabd789333f93a9c6ec03ccea..2e9d1eb278af60d8e7e6329417a17657df9cf6df 100755 (executable)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -2549,7 +2549,7 @@ static bool handle_wifi_assoc_retry(struct connman_network *network,
                 * however QA team recommends that the invalid-key error
                 * might be better to display for user experience.
                 */
-               connman_network_set_error(network, CONNMAN_NETWORK_ERROR_INVALID_KEY);
+               connman_network_set_error(network, CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
 
                return false;
        }

diff --git a/src/network.c b/src/network.c
index 610c136966a7a0b39401777d9131aa6b3fe74d82..c39760409864c824c0125c99664d740854d46f52 100755 (executable)
--- a/src/network.c
+++ b/src/network.c
@@ -1377,8 +1377,13 @@ static void set_associate_error(struct connman_network *network)
 
        service = connman_service_lookup_from_network(network);
 
+#if defined TIZEN_EXT
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_AUTH_FAILED);
+#else
        __connman_service_indicate_error(service,
                                        CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
+#endif
 }
 
 static void set_configure_error(struct connman_network *network)

diff --git a/src/service.c b/src/service.c
index 814092695b1c7e5eb8bcb64248d7058c4f1c6862..a2108bb3637eda4b7f499cdabc986d3ae909a2bb 100755 (executable)
--- a/src/service.c
+++ b/src/service.c
@@ -4295,6 +4295,9 @@ static GList *preferred_tech_list_get(void)
                                 */
                                if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR)
                                        break;
+
+                               if (service->type == CONNMAN_SERVICE_TYPE_BLUETOOTH)
+                                       break;
 #endif
                                return NULL;
                        }
@@ -5995,7 +5998,14 @@ static void report_error_cb(void *user_context, bool retry,
                /* It is not relevant to stay on Failure state
                 * when failing is due to wrong user input */
                __connman_service_clear_error(service);
+#if defined TIZEN_EXT
+               /* Reseting the state back in case of failure state */
+               service->state_ipv4 = service->state_ipv6 =
+                               CONNMAN_SERVICE_STATE_IDLE;
 
+               if (service->error != CONNMAN_SERVICE_ERROR_AUTH_FAILED)
+                       set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN);
+#endif
                service_complete(service);
                __connman_connection_update_gateway();
        }