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

dpp-nfc: Try to request with alternative URL in additional cases

Browse source 
There was a race condition between the NFC handover requester and
selector role processing that ended up not sending out the alternative
proposal in some cases. Catch those at the end of
run_dpp_handover_client() processing (or immediately after returning
from that function without having sent out the alternative proposal).

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2022-12-20 17:29:19 +02:00 committed by Jouni Malinen
parent 8b36248cd2
commit 0f3f9cdcab
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wpa_supplicant/examples/dpp-nfc.py
View file

@ -359,7 +359,7 @@ def run_dpp_handover_client(handover, alt=False):
summary("NFC Handover Request message for DPP: " + str(message)) summary("NFC Handover Request message for DPP: " + str(message))
if handover.peer_crn is not None and not alt: if handover.peer_crn is not None and not alt:
summary("NFC handover request from peer was already received - do not send own") summary("NFC handover request from peer was already received - do not send own[1]")
return return
if handover.client: if handover.client:
summary("Use already started handover client") summary("Use already started handover client")
@ -382,7 +382,8 @@ def run_dpp_handover_client(handover, alt=False):
handover.client = client handover.client = client
if handover.peer_crn is not None and not alt: if handover.peer_crn is not None and not alt:
summary("NFC handover request from peer was already received - do not send own") summary("NFC handover request from peer was already received - do not send own[2] (except alt)")
run_client_alt(handover, alt)
return return
summary("Sending handover request") summary("Sending handover request")
@ -876,6 +877,11 @@ def llcp_worker(llc, try_alt):
if init_on_touch: if init_on_touch:
summary("Starting handover client (init_on_touch)") summary("Starting handover client (init_on_touch)")
dpp_handover_client(handover) dpp_handover_client(handover)
summary("llcp_worker init_on_touch processing completed: try_own={} hs_sent={} no_alt_proposal={} start_client_alt={}".format(handover.try_own, handover.hs_sent, handover.no_alt_proposal, handover.start_client_alt))
if handover.start_client_alt and not handover.hs_sent:
summary("Try alternative handover request before exiting llcp_worker")
handover.start_client_alt = False
dpp_handover_client(handover, alt=True)
summary("Exiting llcp_worker thread (init_on_touch)") summary("Exiting llcp_worker thread (init_on_touch)")
return return