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

P2P: Fix wpas_p2p_nfc_auth_join()

Browse source 
Use the p2pdev pointer instead of the parent pointer to comply with the
flows when a dedicated P2P Device interface is used and
p2p_no_group_iface == 1 (in which case the parent of the reused
interface isn't necessary the same as p2pdev).

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
This commit is contained in:
Andrei Otcheretianski 2016-04-07 13:32:07 +03:00 committed by Jouni Malinen
parent 597cbc0075
commit 3c88d26941
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
wpa_supplicant/p2p_supplicant.c
View file

@ -8390,17 +8390,17 @@ static int wpas_p2p_nfc_auth_join(struct wpa_supplicant *wpa_s,
return -1; return -1;
} }
if (wpa_s->parent->p2p_oob_dev_pw_id != if (wpa_s->p2pdev->p2p_oob_dev_pw_id !=
DEV_PW_NFC_CONNECTION_HANDOVER && DEV_PW_NFC_CONNECTION_HANDOVER &&
!wpa_s->parent->p2p_oob_dev_pw) { !wpa_s->p2pdev->p2p_oob_dev_pw) {
wpa_printf(MSG_DEBUG, "P2P: No NFC Dev Pw known"); wpa_printf(MSG_DEBUG, "P2P: No NFC Dev Pw known");
return -1; return -1;
} }
res = wpas_ap_wps_add_nfc_pw( res = wpas_ap_wps_add_nfc_pw(
wpa_s, wpa_s->parent->p2p_oob_dev_pw_id, wpa_s, wpa_s->p2pdev->p2p_oob_dev_pw_id,
wpa_s->parent->p2p_oob_dev_pw, wpa_s->p2pdev->p2p_oob_dev_pw,
wpa_s->parent->p2p_peer_oob_pk_hash_known ? wpa_s->p2pdev->p2p_peer_oob_pk_hash_known ?
wpa_s->parent->p2p_peer_oob_pubkey_hash : NULL); wpa_s->p2pdev->p2p_peer_oob_pubkey_hash : NULL);
if (res) if (res)
return res; return res;
@ -8418,16 +8418,16 @@ static int wpas_p2p_nfc_auth_join(struct wpa_supplicant *wpa_s,
wpa_s->global->p2p_invite_group = wpa_s; wpa_s->global->p2p_invite_group = wpa_s;
persistent = ssid->p2p_persistent_group && persistent = ssid->p2p_persistent_group &&
wpas_p2p_get_persistent(wpa_s->parent, wpas_p2p_get_persistent(wpa_s->p2pdev,
params->peer->p2p_device_addr, params->peer->p2p_device_addr,
ssid->ssid, ssid->ssid_len); ssid->ssid, ssid->ssid_len);
wpa_s->parent->pending_invite_ssid_id = -1; wpa_s->p2pdev->pending_invite_ssid_id = -1;
return p2p_invite(wpa_s->global->p2p, params->peer->p2p_device_addr, return p2p_invite(wpa_s->global->p2p, params->peer->p2p_device_addr,
P2P_INVITE_ROLE_ACTIVE_GO, wpa_s->own_addr, P2P_INVITE_ROLE_ACTIVE_GO, wpa_s->own_addr,
ssid->ssid, ssid->ssid_len, ssid->frequency, ssid->ssid, ssid->ssid_len, ssid->frequency,
wpa_s->global->p2p_dev_addr, persistent, 0, wpa_s->global->p2p_dev_addr, persistent, 0,
wpa_s->parent->p2p_oob_dev_pw_id); wpa_s->p2pdev->p2p_oob_dev_pw_id);
} }