DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix reassociate dbus method

Browse source 
- Reassociate was only working when there was already a connect in
  place, which is not how the REASSOCIATE command from the ctrl
  interface works.

Signed-off-by: Fionn Cleary <fionn.cleary@streamunlimited.com>
This commit is contained in:
Fionn Cleary 2014-04-04 15:45:26 +02:00 • committed by Jouni Malinen
parent 2150c33337
commit 481e66b1f8
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wpa_supplicant/dbus/dbus_new.h
View file

@ -91,6 +91,8 @@ enum wpas_dbus_bss_prop {
#define WPAS_DBUS_ERROR_IFACE_EXISTS \ #define WPAS_DBUS_ERROR_IFACE_EXISTS \
WPAS_DBUS_NEW_INTERFACE ".InterfaceExists" WPAS_DBUS_NEW_INTERFACE ".InterfaceExists"
#define WPAS_DBUS_ERROR_IFACE_DISABLED \
WPAS_DBUS_NEW_INTERFACE ".InterfaceDisabled"
#define WPAS_DBUS_ERROR_IFACE_UNKNOWN \ #define WPAS_DBUS_ERROR_IFACE_UNKNOWN \
WPAS_DBUS_NEW_INTERFACE ".InterfaceUnknown" WPAS_DBUS_NEW_INTERFACE ".InterfaceUnknown"

10
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -1465,10 +1465,10 @@ err:
/** /**
* wpas_dbus_handler_reassociate - Reassociate to current AP * wpas_dbus_handler_reassociate - Reassociate
* @message: Pointer to incoming dbus message * @message: Pointer to incoming dbus message
* @wpa_s: wpa_supplicant structure for a network interface * @wpa_s: wpa_supplicant structure for a network interface
* Returns: NotConnected DBus error message if not connected * Returns: InterfaceDisabled DBus error message if disabled
* or NULL otherwise. * or NULL otherwise.
* *
* Handler function for "Reassociate" method call of network interface. * Handler function for "Reassociate" method call of network interface.
@ -1476,13 +1476,13 @@ err:
DBusMessage * wpas_dbus_handler_reassociate(DBusMessage *message, DBusMessage * wpas_dbus_handler_reassociate(DBusMessage *message,
struct wpa_supplicant *wpa_s) struct wpa_supplicant *wpa_s)
{ {
if (wpa_s->current_ssid != NULL) { if (wpa_s->wpa_state != WPA_INTERFACE_DISABLED) {
wpas_request_connection(wpa_s); wpas_request_connection(wpa_s);
return NULL; return NULL;
} }
return dbus_message_new_error(message, WPAS_DBUS_ERROR_NOT_CONNECTED, return dbus_message_new_error(message, WPAS_DBUS_ERROR_IFACE_DISABLED,
"This interface is not connected"); "This interface is disabled");
} }