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

WPS: Fix clearing of SetSelectedRegistrar with multiple interfaces

Browse source 
The SetSelectedRegistrar timeout was registered for each registrar
instance, but the only context pointer (struct subscription *) was
shared with each registrar which resulted in the timeout getting
cancelled for some of the registrar instances before the selected
registrar (ER) information was cleared.

In addition, when an ER unsubscribed from receiving events, the
selected registrar information got cleared only from a single
registrar.

Fix these issues by registering a pointer to the registrar
instance in the timeout and by iterating over all UPnP interfaces
when removing a subscription.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2012-02-13 23:02:57 +02:00 committed by Jouni Malinen
parent 2624ed4311
commit ff22d1e10e
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/wps/wps_upnp.c
View file

@ -550,10 +550,13 @@ static void upnp_wps_device_send_event(struct upnp_wps_device_sm *sm)
*/ */
void subscription_destroy(struct subscription *s) void subscription_destroy(struct subscription *s)
{ {
struct upnp_wps_device_interface *iface;
wpa_printf(MSG_DEBUG, "WPS UPnP: Destroy subscription %p", s); wpa_printf(MSG_DEBUG, "WPS UPnP: Destroy subscription %p", s);
subscr_addr_free_all(s); subscr_addr_free_all(s);
event_delete_all(s); event_delete_all(s);
upnp_er_remove_notification(s); dl_list_for_each(iface, &s->sm->interfaces,
struct upnp_wps_device_interface, list)
upnp_er_remove_notification(iface->wps->registrar, s);
os_free(s); os_free(s);
} }

16
src/wps/wps_upnp_ap.c
View file

@ -19,9 +19,10 @@
static void upnp_er_set_selected_timeout(void *eloop_ctx, void *timeout_ctx) static void upnp_er_set_selected_timeout(void *eloop_ctx, void *timeout_ctx)
{ {
struct subscription *s = eloop_ctx; struct subscription *s = eloop_ctx;
struct wps_registrar *reg = timeout_ctx;
wpa_printf(MSG_DEBUG, "WPS: SetSelectedRegistrar from ER timed out"); wpa_printf(MSG_DEBUG, "WPS: SetSelectedRegistrar from ER timed out");
s->selected_registrar = 0; s->selected_registrar = 0;
wps_registrar_selected_registrar_changed(s->reg); wps_registrar_selected_registrar_changed(reg);
} }
@ -40,7 +41,7 @@ int upnp_er_set_selected_registrar(struct wps_registrar *reg,
return -1; return -1;
s->reg = reg; s->reg = reg;
eloop_cancel_timeout(upnp_er_set_selected_timeout, s, NULL); eloop_cancel_timeout(upnp_er_set_selected_timeout, s, reg);
os_memset(s->authorized_macs, 0, sizeof(s->authorized_macs)); os_memset(s->authorized_macs, 0, sizeof(s->authorized_macs));
if (attr.selected_registrar == NULL || *attr.selected_registrar == 0) { if (attr.selected_registrar == NULL || *attr.selected_registrar == 0) {
@ -67,7 +68,7 @@ int upnp_er_set_selected_registrar(struct wps_registrar *reg,
#endif /* CONFIG_WPS2 */ #endif /* CONFIG_WPS2 */
} }
eloop_register_timeout(WPS_PBC_WALK_TIME, 0, eloop_register_timeout(WPS_PBC_WALK_TIME, 0,
upnp_er_set_selected_timeout, s, NULL); upnp_er_set_selected_timeout, s, reg);
} }
wps_registrar_selected_registrar_changed(reg); wps_registrar_selected_registrar_changed(reg);
@ -76,10 +77,11 @@ int upnp_er_set_selected_registrar(struct wps_registrar *reg,
} }
void upnp_er_remove_notification(struct subscription *s) void upnp_er_remove_notification(struct wps_registrar *reg,
struct subscription *s)
{ {
s->selected_registrar = 0; s->selected_registrar = 0;
eloop_cancel_timeout(upnp_er_set_selected_timeout, s, NULL); eloop_cancel_timeout(upnp_er_set_selected_timeout, s, reg);
if (s->reg) if (reg)
wps_registrar_selected_registrar_changed(s->reg); wps_registrar_selected_registrar_changed(reg);
} }

3
src/wps/wps_upnp_i.h
View file

@ -188,6 +188,7 @@ void event_send_stop_all(struct upnp_wps_device_sm *sm);
int upnp_er_set_selected_registrar(struct wps_registrar *reg, int upnp_er_set_selected_registrar(struct wps_registrar *reg,
struct subscription *s, struct subscription *s,
const struct wpabuf *msg); const struct wpabuf *msg);
void upnp_er_remove_notification(struct subscription *s); void upnp_er_remove_notification(struct wps_registrar *reg,
struct subscription *s);
#endif /* WPS_UPNP_I_H */ #endif /* WPS_UPNP_I_H */