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

tests: Modify gas_malformed_comeback_resp to allow GAS retries

Browse source 
This is in preparation of a wpa_supplicant change to allow GAS retries
which can result in the previous test case design showing failures due
to "unexpected" management frames (GAS Initial Request from the retry).

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-12-20 21:06:21 +02:00
parent a587666cba
commit f9a9304479
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tests/hwsim/test_gas.py
View file

@ -612,6 +612,13 @@ def init_gas(hapd, bssid, dev):
raise Exception("Unexpected dialog token change") raise Exception("Unexpected dialog token change")
return query, dialog_token return query, dialog_token
def allow_gas_initial_req(hapd, dialog_token):
msg = hapd.mgmt_rx(timeout=1)
if msg is not None:
gas = parse_gas(msg['payload'])
if gas['action'] != GAS_INITIAL_REQUEST or dialog_token == gas['dialog_token']:
raise Exception("Unexpected management frame")
def test_gas_malformed_comeback_resp(dev, apdev): def test_gas_malformed_comeback_resp(dev, apdev):
"""GAS malformed comeback response frames""" """GAS malformed comeback response frames"""
hapd = start_ap(apdev[0]) hapd = start_ap(apdev[0])
@ -671,9 +678,7 @@ def test_gas_malformed_comeback_resp(dev, apdev):
resp = action_response(query) resp = action_response(query)
resp['payload'] = anqp_initial_resp(dialog_token, 0) + struct.pack('<H', 0) resp['payload'] = anqp_initial_resp(dialog_token, 0) + struct.pack('<H', 0)
send_gas_resp(hapd, resp) send_gas_resp(hapd, resp)
ev = hapd.wait_event(["MGMT-RX"], timeout=1) allow_gas_initial_req(hapd, dialog_token)
if ev is not None:
raise Exception("Unexpected management frame")
expect_gas_result(dev[0], "TIMEOUT") expect_gas_result(dev[0], "TIMEOUT")
logger.debug("Too short comeback response") logger.debug("Too short comeback response")
@ -682,9 +687,7 @@ def test_gas_malformed_comeback_resp(dev, apdev):
resp['payload'] = struct.pack('<BBBH', ACTION_CATEG_PUBLIC, resp['payload'] = struct.pack('<BBBH', ACTION_CATEG_PUBLIC,
GAS_COMEBACK_RESPONSE, dialog_token, 0) GAS_COMEBACK_RESPONSE, dialog_token, 0)
send_gas_resp(hapd, resp) send_gas_resp(hapd, resp)
ev = hapd.wait_event(["MGMT-RX"], timeout=1) allow_gas_initial_req(hapd, dialog_token)
if ev is not None:
raise Exception("Unexpected management frame")
expect_gas_result(dev[0], "TIMEOUT") expect_gas_result(dev[0], "TIMEOUT")
logger.debug("Too short comeback response(2)") logger.debug("Too short comeback response(2)")
@ -694,9 +697,7 @@ def test_gas_malformed_comeback_resp(dev, apdev):
GAS_COMEBACK_RESPONSE, dialog_token, 0, 0x80, GAS_COMEBACK_RESPONSE, dialog_token, 0, 0x80,
0) 0)
send_gas_resp(hapd, resp) send_gas_resp(hapd, resp)
ev = hapd.wait_event(["MGMT-RX"], timeout=1) allow_gas_initial_req(hapd, dialog_token)
if ev is not None:
raise Exception("Unexpected management frame")
expect_gas_result(dev[0], "TIMEOUT") expect_gas_result(dev[0], "TIMEOUT")
logger.debug("Maximum comeback response fragment claiming more fragments") logger.debug("Maximum comeback response fragment claiming more fragments")