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

P2P: Use a variable for generated PIN to allow multiple uses

Browse source 
In order to pass the same PIN to multiple notifications in the future,
generate it centrally.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2011-02-02 17:12:37 +02:00 committed by Jouni Malinen
parent 0c11c63375
commit bbeee9b0db
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
wpa_supplicant/p2p_supplicant.c
View file

@ -1798,10 +1798,11 @@ int wpas_p2p_service_del_upnp(struct wpa_supplicant *wpa_s, u8 version,
static void wpas_prov_disc_local_display(struct wpa_supplicant *wpa_s, static void wpas_prov_disc_local_display(struct wpa_supplicant *wpa_s,
const u8 *peer, const char *params) const u8 *peer, const char *params,
unsigned int generated_pin)
{ {
wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_SHOW_PIN MACSTR " %08d%s", wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_SHOW_PIN MACSTR " %08d%s",
MAC2STR(peer), wps_generate_pin(), params); MAC2STR(peer), generated_pin, params);
} }
@ -1822,6 +1823,7 @@ void wpas_prov_disc_req(void *ctx, const u8 *peer, u16 config_methods,
char devtype[WPS_DEV_TYPE_BUFSIZE]; char devtype[WPS_DEV_TYPE_BUFSIZE];
char params[200]; char params[200];
u8 empty_dev_type[8]; u8 empty_dev_type[8];
unsigned int generated_pin = 0;
if (pri_dev_type == NULL) { if (pri_dev_type == NULL) {
os_memset(empty_dev_type, 0, sizeof(empty_dev_type)); os_memset(empty_dev_type, 0, sizeof(empty_dev_type));
@ -1836,9 +1838,11 @@ void wpas_prov_disc_req(void *ctx, const u8 *peer, u16 config_methods,
dev_name, supp_config_methods, dev_capab, group_capab); dev_name, supp_config_methods, dev_capab, group_capab);
params[sizeof(params) - 1] = '\0'; params[sizeof(params) - 1] = '\0';
if (config_methods & WPS_CONFIG_DISPLAY) if (config_methods & WPS_CONFIG_DISPLAY) {
wpas_prov_disc_local_display(wpa_s, peer, params); generated_pin = wps_generate_pin();
else if (config_methods & WPS_CONFIG_KEYPAD) wpas_prov_disc_local_display(wpa_s, peer, params,
generated_pin);
} else if (config_methods & WPS_CONFIG_KEYPAD)
wpas_prov_disc_local_keypad(wpa_s, peer, params); wpas_prov_disc_local_keypad(wpa_s, peer, params);
else if (config_methods & WPS_CONFIG_PUSHBUTTON) else if (config_methods & WPS_CONFIG_PUSHBUTTON)
wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_PBC_REQ MACSTR wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_PBC_REQ MACSTR
@ -1849,11 +1853,14 @@ void wpas_prov_disc_req(void *ctx, const u8 *peer, u16 config_methods,
void wpas_prov_disc_resp(void *ctx, const u8 *peer, u16 config_methods) void wpas_prov_disc_resp(void *ctx, const u8 *peer, u16 config_methods)
{ {
struct wpa_supplicant *wpa_s = ctx; struct wpa_supplicant *wpa_s = ctx;
unsigned int generated_pin = 0;
if (config_methods & WPS_CONFIG_DISPLAY) if (config_methods & WPS_CONFIG_DISPLAY)
wpas_prov_disc_local_keypad(wpa_s, peer, ""); wpas_prov_disc_local_keypad(wpa_s, peer, "");
else if (config_methods & WPS_CONFIG_KEYPAD) else if (config_methods & WPS_CONFIG_KEYPAD) {
wpas_prov_disc_local_display(wpa_s, peer, ""); generated_pin = wps_generate_pin();
else if (config_methods & WPS_CONFIG_PUSHBUTTON) wpas_prov_disc_local_display(wpa_s, peer, "", generated_pin);
} else if (config_methods & WPS_CONFIG_PUSHBUTTON)
wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_PBC_RESP MACSTR, wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_PBC_RESP MACSTR,
MAC2STR(peer)); MAC2STR(peer));