summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiraj Kumar Goit <niraj.g@samsung.com>2016-06-15 16:47:40 (GMT)
committerNiraj Kumar Goit <niraj.g@samsung.com>2016-06-17 10:34:29 (GMT)
commit814e3cff8ca46e92090d2f9e2abcede7471de2c3 (patch)
treee0f785ae8572e4c21eb7bb3560c60d4b852e893e
parent834326ac086f2c94dec541a10707da61fc6db991 (diff)
downloadconnman-814e3cff8ca46e92090d2f9e2abcede7471de2c3.zip
connman-814e3cff8ca46e92090d2f9e2abcede7471de2c3.tar.gz
connman-814e3cff8ca46e92090d2f9e2abcede7471de2c3.tar.bz2
[SPIN] Indicate auth-failed error.refs/changes/58/74758/2
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>
-rwxr-xr-xplugins/wifi.c2
-rwxr-xr-xsrc/network.c5
-rwxr-xr-xsrc/service.c10
3 files changed, 16 insertions, 1 deletions
diff --git a/plugins/wifi.c b/plugins/wifi.c
index b4abd21..2e9d1eb 100755
--- 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 610c136..c397604 100755
--- 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 8140926..a2108bb 100755
--- 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();
}