jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

WPS ER: Do not use SetSelectedRegistrar when learning/configuring AP

Browse source
This commit is contained in:
Jouni Malinen 2010-07-20 22:06:28 -07:00 committed by Jouni Malinen
parent ad4741183f
commit b68ccf4048
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/wps/wps_er.c
View file

@ -1366,6 +1366,11 @@ void wps_er_set_sel_reg(struct wps_er *er, int sel_reg, u16 dev_passwd_id,
struct wpabuf *msg; struct wpabuf *msg;
struct wps_er_ap *ap; struct wps_er_ap *ap;
if (er->skip_set_sel_reg) {
wpa_printf(MSG_DEBUG, "WPS ER: Skip SetSelectedRegistrar");
return;
}
msg = wpabuf_alloc(500); msg = wpabuf_alloc(500);
if (msg == NULL) if (msg == NULL)
return; return;
@ -1702,8 +1707,9 @@ int wps_er_learn(struct wps_er *er, const u8 *uuid, const u8 *pin,
if (wps_er_send_get_device_info(ap, wps_er_ap_learn_m1) < 0) if (wps_er_send_get_device_info(ap, wps_er_ap_learn_m1) < 0)
return -1; return -1;
/* TODO: add PIN without SetSelectedRegistrar trigger to all APs */ er->skip_set_sel_reg = 1;
wps_registrar_add_pin(er->wps->registrar, NULL, uuid, pin, pin_len, 0); wps_registrar_add_pin(er->wps->registrar, NULL, uuid, pin, pin_len, 0);
er->skip_set_sel_reg = 0;
return 0; return 0;
} }
@ -1763,8 +1769,9 @@ int wps_er_config(struct wps_er *er, const u8 *uuid, const u8 *pin,
if (wps_er_send_get_device_info(ap, wps_er_ap_config_m1) < 0) if (wps_er_send_get_device_info(ap, wps_er_ap_config_m1) < 0)
return -1; return -1;
/* TODO: add PIN without SetSelectedRegistrar trigger to all APs */ er->skip_set_sel_reg = 1;
wps_registrar_add_pin(er->wps->registrar, NULL, uuid, pin, pin_len, 0); wps_registrar_add_pin(er->wps->registrar, NULL, uuid, pin, pin_len, 0);
er->skip_set_sel_reg = 0;
return 0; return 0;
} }

1
src/wps/wps_er.h
View file

@ -91,6 +91,7 @@ struct wps_er {
void (*deinit_done_cb)(void *ctx); void (*deinit_done_cb)(void *ctx);
void *deinit_done_ctx; void *deinit_done_ctx;
struct in_addr filter_addr; struct in_addr filter_addr;
int skip_set_sel_reg;
}; };