diff options
author | Saurav Babu <saurav.babu@samsung.com> | 2016-09-26 17:36:23 +0530 |
---|---|---|
committer | Saurav Babu <saurav.babu@samsung.com> | 2016-09-26 17:36:23 +0530 |
commit | 7ace8c778781a6d3e47010843d9bc5c0d337594d (patch) | |
tree | dfff580a2db4c19ab0ddacd65216283a9fef2151 /src | |
parent | 09b29b8220c7b3f150a34e232a5f358d5a1a8c6b (diff) | |
download | connman-7ace8c778781a6d3e47010843d9bc5c0d337594d.tar.gz connman-7ace8c778781a6d3e47010843d9bc5c0d337594d.tar.bz2 connman-7ace8c778781a6d3e47010843d9bc5c0d337594d.zip |
Remove Tizen specific hidden connection logicsubmit/tizen/20160928.053415accepted/tizen/wearable/20160929.081029accepted/tizen/tv/20160929.081156accepted/tizen/mobile/20160929.081112accepted/tizen/ivi/20160929.081222accepted/tizen/common/20160928.164122
Change-Id: I466d0a4d73ade1278211245fbc94ca2fffeb392f
Signed-off-by: Saurav Babu <saurav.babu@samsung.com>
Diffstat (limited to 'src')
-rwxr-xr-x | src/service.c | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/src/service.c b/src/service.c index 1eae3807..bd0c1ff6 100755 --- a/src/service.c +++ b/src/service.c @@ -4085,8 +4085,10 @@ static void set_error(struct connman_service *service, if (!service->path) return; +#if !defined TIZEN_EXT if (!allow_property_changed(service)) return; +#endif str = error2string(service->error); @@ -6002,34 +6004,6 @@ static int check_wpspin(struct connman_service *service, const char *wpspin) return 0; } -#if defined TIZEN_EXT -static int __connman_service_connect_hidden(struct connman_service *service, - const char *name, int name_len, - const char *identity, const char *passphrase, void *user_data) -{ - GList *list; - - for (list = service_list; list; list = list->next) { - struct connman_service *target = list->data; - const char *target_ssid = NULL; - unsigned int target_ssid_len = 0; - - if (service->network != NULL && - service->security == target->security) { - target_ssid = connman_network_get_blob(service->network, - "WiFi.SSID", &target_ssid_len); - if (target_ssid_len == name_len && - memcmp(target_ssid, name, name_len) == 0) { - return connman_network_connect_hidden(service->network, - (char *)identity, (char *)passphrase, user_data); - } - } - } - - return -ENOENT; -} -#endif - static void request_input_cb(struct connman_service *service, bool values_received, const char *name, int name_len, @@ -6062,14 +6036,6 @@ static void request_input_cb(struct connman_service *service, } if (service->hidden && name_len > 0 && name_len <= 32) { -#if defined TIZEN_EXT - /* TIZEN already has Wi-Fi hidden scan before this hidden connection */ - err = __connman_service_connect_hidden(service, name, name_len, - identity, passphrase, user_data); - if (err == 0 || err == -EALREADY || err == -EINPROGRESS) - return; -#endif - device = connman_network_get_device(service->network); security = connman_network_get_string(service->network, "WiFi.Security"); |