Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-28 18:28:23 -05:00
Code Issues Projects Releases Wiki Activity

tests: Put seeker into extended listen when deferred PD is expected

Browse Source 
Not doing so may result in a deferred PD flow failure (currently the
hwsim tests succeeded because seeker never stopped find, spending enough
time listening, so the follow-on PD would succeed).

Fix this by calling p2p_ext_listen when the seeker receives a deferred
PD failure event. Cancel extended listening when PD is done and also
stop find when seek is done.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
This commit is contained in:
Andrei Otcheretianski 2015-09-24 20:37:53 +03:00 committed by Jouni Malinen
parent a3dc75020a
commit 9773ea38cf
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/hwsim/test_p2ps.py
View File

@ -92,6 +92,7 @@ def p2ps_exact_seek(i_dev, r_dev, svc_name, srv_info=None,
if rcvd_svc_name != svc_name: if rcvd_svc_name != svc_name:
raise Exception("service name not matching") raise Exception("service name not matching")
i_dev.p2p_stop_find()
return [adv_id, rcvd_svc_name] return [adv_id, rcvd_svc_name]
def p2ps_nonexact_seek(i_dev, r_dev, svc_name, srv_info=None, adv_num=None): def p2ps_nonexact_seek(i_dev, r_dev, svc_name, srv_info=None, adv_num=None):
@ -123,6 +124,8 @@ def p2ps_nonexact_seek(i_dev, r_dev, svc_name, srv_info=None, adv_num=None):
adv_id = ev1.split(" ")[3] adv_id = ev1.split(" ")[3]
rcvd_svc_name = ev1.split(" ")[6] rcvd_svc_name = ev1.split(" ")[6]
ev_list.append(''.join([adv_id, ' ', rcvd_svc_name])) ev_list.append(''.join([adv_id, ' ', rcvd_svc_name]))
i_dev.p2p_stop_find()
return ev_list return ev_list
def p2ps_parse_event(ev, *args): def p2ps_parse_event(ev, *args):
@ -153,6 +156,10 @@ def p2ps_provision(seeker, advertiser, adv_id, auto_accept=True, method="1000",
if ev is None: if ev is None:
raise Exception("P2P-PROV-DISC-FAILURE timeout on seeker side") raise Exception("P2P-PROV-DISC-FAILURE timeout on seeker side")
# Put seeker into a listen state, since we expect the deferred flow to
# continue.
seeker.p2p_ext_listen(500, 500)
if method == "100": if method == "100":
ev = advertiser.wait_global_event(["P2P-PROV-DISC-ENTER-PIN"], ev = advertiser.wait_global_event(["P2P-PROV-DISC-ENTER-PIN"],
timeout=10) timeout=10)
@ -197,6 +204,7 @@ def p2ps_provision(seeker, advertiser, adv_id, auto_accept=True, method="1000",
if addr1 not in ev: if addr1 not in ev:
raise Exception("Unknown peer " + addr1) raise Exception("Unknown peer " + addr1)
seeker.p2p_cancel_ext_listen()
if pin is not None: if pin is not None:
return ev1, ev2, pin return ev1, ev2, pin
return ev1, ev2 return ev1, ev2