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

dpp-nfc: Do not hardcode netrole for NFC Tag writing cases

Browse source 
Allow netrole to be specified for NFC Tag writing cases. Previously,
this was hardcoded to use netrole=configurator when starting the listen
operation. Now the netrole parameter is not included by default, but any
netrole value can be specified with the new --netrole command line
argument.

In addition, fix the listening frequency for the case where a channel is
picked.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-07-23 01:30:30 +03:00 committed by Jouni Malinen
parent ebd5e764f9
commit 288c0ffaaa
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@ my_crn_ready = False
my_crn = None my_crn = None
peer_crn = None peer_crn = None
hs_sent = False hs_sent = False
netrole = None
mutex = threading.Lock() mutex = threading.Lock()
def summary(txt): def summary(txt):
@ -180,6 +181,7 @@ def dpp_bootstrap_gen(wpas, type="qrcode", chan=None, mac=None, info=None,
return int(res) return int(res)
def wpas_get_nfc_uri(start_listen=True, pick_channel=False, chan_override=None): def wpas_get_nfc_uri(start_listen=True, pick_channel=False, chan_override=None):
listen_freq = 2412
wpas = wpas_connect() wpas = wpas_connect()
if wpas is None: if wpas is None:
return None return None
@ -195,15 +197,23 @@ def wpas_get_nfc_uri(start_listen=True, pick_channel=False, chan_override=None):
if freq >= 2412 and freq <= 2462: if freq >= 2412 and freq <= 2462:
chan = "81/%d" % ((freq - 2407) / 5) chan = "81/%d" % ((freq - 2407) / 5)
summary("Use current AP operating channel (%d MHz) as the URI channel list (%s)" % (freq, chan)) summary("Use current AP operating channel (%d MHz) as the URI channel list (%s)" % (freq, chan))
listen_freq = freq
if chan is None and pick_channel: if chan is None and pick_channel:
chan = "81/6" chan = "81/6"
summary("Use channel 2437 MHz since no other preference provided") summary("Use channel 2437 MHz since no other preference provided")
listen_freq = 2437
own_id = dpp_bootstrap_gen(wpas, type="nfc-uri", chan=chan, mac=True) own_id = dpp_bootstrap_gen(wpas, type="nfc-uri", chan=chan, mac=True)
res = wpas.request("DPP_BOOTSTRAP_GET_URI %d" % own_id).rstrip() res = wpas.request("DPP_BOOTSTRAP_GET_URI %d" % own_id).rstrip()
if "FAIL" in res: if "FAIL" in res:
return None return None
if start_listen: if start_listen:
wpas.request("DPP_LISTEN 2412 netrole=configurator") cmd = "DPP_LISTEN %d" % listen_freq
global netrole
if netrole:
cmd += " netrole=" + netrole
res = wpas.request(cmd)
if "OK" not in res:
raise Exception("Failed to start listen operation (%s)" % cmd)
return res return res
def wpas_report_handover_req(uri): def wpas_report_handover_req(uri):
@ -770,6 +780,7 @@ def main():
parser.add_argument('--device', default='usb', help='NFC device to open') parser.add_argument('--device', default='usb', help='NFC device to open')
parser.add_argument('--chan', default=None, help='channel list') parser.add_argument('--chan', default=None, help='channel list')
parser.add_argument('--altchan', default=None, help='alternative channel list') parser.add_argument('--altchan', default=None, help='alternative channel list')
parser.add_argument('--netrole', default=None, help='netrole for Enrollee')
parser.add_argument('command', choices=['write-nfc-uri', parser.add_argument('command', choices=['write-nfc-uri',
'write-nfc-hs'], 'write-nfc-hs'],
nargs='?') nargs='?')
@ -782,9 +793,10 @@ def main():
global no_wait global no_wait
no_wait = args.no_wait no_wait = args.no_wait
global chanlist, altchanlist global chanlist, altchanlist, netrole
chanlist = args.chan chanlist = args.chan
altchanlist = args.altchan altchanlist = args.altchan
netrole = args.netrole
logging.basicConfig(level=args.loglevel) logging.basicConfig(level=args.loglevel)