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

dpp-nfc: Make handover request collision detection more robust

Browse source 
Wait up to 100 ms for own handover request transmission to succeed if
peer handover request is received, but own crn is not yet available.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-05-15 12:10:59 +03:00 committed by Jouni Malinen
parent 8791e7461c
commit d0e2d8091f
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@ continue_loop = True
terminate_now = False terminate_now = False
summary_file = None summary_file = None
success_file = None success_file = None
my_crn_ready = False
my_crn = None my_crn = None
peer_crn = None peer_crn = None
mutex = threading.Lock() mutex = threading.Lock()
@ -245,12 +246,15 @@ def dpp_handover_client(llc):
summary("Sending handover request") summary("Sending handover request")
global my_crn, my_crn_ready
my_crn_ready = True
if not client.send_records(message): if not client.send_records(message):
my_crn_ready = False
summary("Failed to send handover request") summary("Failed to send handover request")
client.close() client.close()
return return
global my_crn
my_crn, = struct.unpack('>H', crn) my_crn, = struct.unpack('>H', crn)
summary("Receiving handover response") summary("Receiving handover response")
@ -357,7 +361,7 @@ class HandoverServer(nfc.handover.HandoverServer):
print("\n") print("\n")
summary("HandoverServer - request received: " + str(records)) summary("HandoverServer - request received: " + str(records))
global my_crn, peer_crn global my_crn, peer_crn, my_crn_ready
for carrier in records: for carrier in records:
if not isinstance(carrier, ndef.HandoverRequestRecord): if not isinstance(carrier, ndef.HandoverRequestRecord):
@ -366,6 +370,12 @@ class HandoverServer(nfc.handover.HandoverServer):
peer_crn = carrier.collision_resolution_number peer_crn = carrier.collision_resolution_number
summary("peer_crn: %d" % peer_crn) summary("peer_crn: %d" % peer_crn)
if my_crn is None and my_crn_ready:
summary("Still trying to send own handover request - wait a moment to see if that succeeds before checking crn values")
for i in range(10):
if my_crn is not None:
break
time.sleep(0.01)
if my_crn is not None: if my_crn is not None:
summary("my_crn: %d" % my_crn) summary("my_crn: %d" % my_crn)
@ -635,8 +645,9 @@ def llcp_startup(llc):
def llcp_connected(llc): def llcp_connected(llc):
summary("P2P LLCP connected") summary("P2P LLCP connected")
global wait_connection, my_crn, peer_crn global wait_connection, my_crn, peer_crn, my_crn_ready
wait_connection = False wait_connection = False
my_crn_ready = False
my_crn = None my_crn = None
peer_crn = None peer_crn = None
global srv global srv