From 36491bda01888633c150676417a7e9de7686a795 Mon Sep 17 00:00:00 2001 From: hyunuktak Date: Tue, 5 Jul 2016 15:08:44 +0900 Subject: Fixed some issues Removed to set autoconnect when 4way handshake failed Release passphrase of service when indicate error occurred for invalid key Change-Id: Id748ddcd21ad896f0d8e91ce4711a4c9c0df6d96 Signed-off-by: hyunuktak --- src/connman.h | 2 -- src/service.c | 20 +++++--------------- 2 files changed, 5 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/connman.h b/src/connman.h index e3296a7a..56f9dd9d 100755 --- a/src/connman.h +++ b/src/connman.h @@ -699,8 +699,6 @@ bool __connman_service_wps_enabled(struct connman_service *service); #if defined TIZEN_EXT void __connman_service_set_storage_reload(struct connman_service *service, bool storage_reload); -void __connman_service_set_autoconnect(struct connman_service *service, - bool autoconnect); #endif int __connman_service_set_favorite(struct connman_service *service, bool favorite); diff --git a/src/service.c b/src/service.c index 69fefe75..f77f0339 100755 --- a/src/service.c +++ b/src/service.c @@ -5930,21 +5930,6 @@ void __connman_service_set_search_domains(struct connman_service *service, searchdomain_add_all(service); } -#if defined TIZEN_EXT -void __connman_service_set_autoconnect(struct connman_service *service, - bool autoconnect) -{ - if (service == NULL) - return; - - if (service->autoconnect != autoconnect) { - DBG("updated autoconnect flag (%d)", autoconnect); - service->autoconnect = autoconnect; - service_save(service); - } -} -#endif - static void service_complete(struct connman_service *service) { reply_pending(service, EIO); @@ -6647,6 +6632,11 @@ int __connman_service_indicate_error(struct connman_service *service, service->error == CONNMAN_SERVICE_ERROR_CONNECT_FAILED) __connman_service_disconnect_default(service); + if (service->type == CONNMAN_SERVICE_TYPE_WIFI && + service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY) { + g_free(service->passphrase); + service->passphrase = NULL; + } #endif __connman_service_ipconfig_indicate_state(service, -- cgit v1.2.3