diff options
author | Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> | 2015-01-26 12:21:47 +0200 |
---|---|---|
committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2015-01-26 15:22:30 +0200 |
commit | a3914d0410fbb8755444581e48e717363d9b5035 (patch) | |
tree | b634cbd9795a0ba94b82aecbafd6eda680268377 /gsupplicant | |
parent | 82571d6542c15af2dc0304babb98d8542fc043f4 (diff) | |
download | connman-a3914d0410fbb8755444581e48e717363d9b5035.tar.gz |
wifi: Remove wpa_supplicant autoscan support
ConnMan's own autoscan mechanism has proven to work properly compared
to the mechanism in wpa_supplicant which does not support hidden
SSIDs. Thus remove the code used to enable wpa_supplicant autoscan.
Diffstat (limited to 'gsupplicant')
-rw-r--r-- | gsupplicant/gsupplicant.h | 5 | ||||
-rw-r--r-- | gsupplicant/supplicant.c | 66 |
2 files changed, 0 insertions, 71 deletions
diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h index 97c804a5..187dc654 100644 --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -225,11 +225,6 @@ int g_supplicant_interface_scan(GSupplicantInterface *interface, GSupplicantInterfaceCallback callback, void *user_data); -int g_supplicant_interface_autoscan(GSupplicantInterface *interface, - const char *autoscan_data, - GSupplicantInterfaceCallback callback, - void *user_data); - int g_supplicant_interface_p2p_find(GSupplicantInterface *interface, GSupplicantInterfaceCallback callback, void *user_data); diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index ef98894c..e02a8d57 100644 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -3449,14 +3449,6 @@ struct interface_scan_data { void *user_data; }; -struct interface_autoscan_data { - GSupplicantInterface *interface; - char *path; - GSupplicantInterfaceCallback callback; - const char *autoscan_params; - void *user_data; -}; - static void interface_create_data_free(struct interface_create_data *data) { g_free(data->ifname); @@ -3973,64 +3965,6 @@ int g_supplicant_interface_scan(GSupplicantInterface *interface, return ret; } -static void interface_autoscan_result(const char *error, - DBusMessageIter *iter, void *user_data) -{ - struct interface_autoscan_data *data = user_data; - int err = 0; - - if (error) { - SUPPLICANT_DBG("error %s", error); - err = -EIO; - } - - g_free(data->path); - - if (data->callback) - data->callback(err, data->interface, data->user_data); - - dbus_free(data); -} - -static void interface_autoscan_params(DBusMessageIter *iter, void *user_data) -{ - struct interface_autoscan_data *data = user_data; - - dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, - &data->autoscan_params); -} - -int g_supplicant_interface_autoscan(GSupplicantInterface *interface, - const char *autoscan_data, - GSupplicantInterfaceCallback callback, - void *user_data) -{ - struct interface_autoscan_data *data; - int ret; - - data = dbus_malloc0(sizeof(*data)); - if (!data) - return -ENOMEM; - - data->interface = interface; - data->path = g_strdup(interface->path); - data->callback = callback; - data->autoscan_params = autoscan_data; - data->user_data = user_data; - - ret = supplicant_dbus_method_call(interface->path, - SUPPLICANT_INTERFACE ".Interface", "AutoScan", - interface_autoscan_params, - interface_autoscan_result, data, - interface); - if (ret < 0) { - g_free(data->path); - dbus_free(data); - } - - return ret; -} - static int parse_supplicant_error(DBusMessageIter *iter) { int err = -ECANCELED; |