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

dpp-nfc: Clean up debug prints when handover select is received

Browse source 
If the local device becomes the handover selector, make the debug log
entries about client functionality not receiving the response clearer
since that is not really an error case.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-05-15 14:20:26 +03:00 committed by Jouni Malinen
parent 5d49c1bf7c
commit 134ad50b0e
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,6 +37,7 @@ success_file = None
my_crn_ready = False my_crn_ready = False
my_crn = None my_crn = None
peer_crn = None peer_crn = None
hs_sent = False
mutex = threading.Lock() mutex = threading.Lock()
def summary(txt): def summary(txt):
@ -257,7 +258,7 @@ def dpp_handover_client(llc):
summary("Sending handover request") summary("Sending handover request")
global my_crn, my_crn_ready global my_crn, my_crn_ready, hs_sent
my_crn_ready = True my_crn_ready = True
if not client.send_records(message): if not client.send_records(message):
@ -269,9 +270,20 @@ def dpp_handover_client(llc):
my_crn, = struct.unpack('>H', crn) my_crn, = struct.unpack('>H', crn)
summary("Receiving handover response") summary("Receiving handover response")
message = client.recv_records(timeout=3.0) try:
message = client.recv_records(timeout=3.0)
except Exception as e:
# This is fine if we are the handover selector
if hs_sent:
summary("Client receive failed as expected since I'm the handover server: %s" % str(e))
else:
summary("Client receive failed: %s" % str(e))
message = None
if message is None: if message is None:
summary("No response received") if hs_sent:
summary("No response received as expected since I'm the handover server")
else:
summary("No response received")
client.close() client.close()
return return
summary("Received message: " + str(message)) summary("Received message: " + str(message))
@ -461,6 +473,7 @@ class HandoverServer(nfc.handover.HandoverServer):
cmd += " role=enrollee" cmd += " role=enrollee"
elif configurator_only: elif configurator_only:
cmd += " role=configurator" cmd += " role=configurator"
summary(cmd)
res = wpas.request(cmd) res = wpas.request(cmd)
if "OK" not in res: if "OK" not in res:
summary("Failed to start DPP listen") summary("Failed to start DPP listen")
@ -477,6 +490,8 @@ class HandoverServer(nfc.handover.HandoverServer):
self.success = True self.success = True
else: else:
self.try_own = True self.try_own = True
global hs_sent
hs_sent = True
return sel return sel
def clear_raw_mode(): def clear_raw_mode():
@ -660,11 +675,12 @@ 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, my_crn_ready global wait_connection, my_crn, peer_crn, my_crn_ready, hs_sent
wait_connection = False wait_connection = False
my_crn_ready = False my_crn_ready = False
my_crn = None my_crn = None
peer_crn = None peer_crn = None
hs_sent = False
global srv global srv
srv.start() srv.start()
if init_on_touch or not no_input: if init_on_touch or not no_input: