diff options
| author | hyunuktak <hyunuk.tak@samsung.com> | 2016-07-05 15:08:44 +0900 |
|---|---|---|
| committer | hyunuktak <hyunuk.tak@samsung.com> | 2016-07-05 15:08:50 +0900 |
| commit | 36491bda01888633c150676417a7e9de7686a795 (patch) | |
| tree | 579116abb733e6af229fe1fa3bcadc76e8cf96c1 /src | |
| parent | 339667a208a0bd79e6a49f283110271b5dd5c976 (diff) | |
| download | connman-36491bda01888633c150676417a7e9de7686a795.tar.gz connman-36491bda01888633c150676417a7e9de7686a795.tar.bz2 connman-36491bda01888633c150676417a7e9de7686a795.zip | |
Fixed some issuessubmit/tizen/20160705.082658accepted/tizen/wearable/20160705.101859accepted/tizen/tv/20160705.101845accepted/tizen/mobile/20160705.101933accepted/tizen/ivi/20160705.101849accepted/tizen/common/20160705.170548
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 <hyunuk.tak@samsung.com>
Diffstat (limited to 'src')
| -rwxr-xr-x | src/connman.h | 2 | ||||
| -rwxr-xr-x | src/service.c | 20 |
2 files changed, 5 insertions, 17 deletions
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, |