#
# GAS tests
# Copyright (c) 2013, Qualcomm Atheros, Inc.
+# Copyright (c) 2013-2014, Jouni Malinen <j@w1.fi>
#
# This software may be distributed under the terms of the BSD license.
# See README for more details.
params['hessid'] = bssid
hostapd.add_ap(apdev[0]['ifname'], params)
- dev[0].scan()
+ # get BSS entry available to allow GAS query
+ dev[0].scan(freq="2412")
logger.info("Request concurrent operations")
req = dev[0].request("GAS_REQUEST " + bssid + " 00 000102000101")
req = dev[0].request("GAS_REQUEST " + bssid + " 00 000102000801")
if "FAIL" in req:
raise Exception("GAS query request rejected")
- dev[0].request("SCAN")
+ dev[0].scan(no_wait=True)
req = dev[0].request("GAS_REQUEST " + bssid + " 00 000102000201")
if "FAIL" in req:
raise Exception("GAS query request rejected")
params['hessid'] = bssid
hostapd.add_ap(apdev[0]['ifname'], params)
- dev[0].scan()
+ dev[0].scan(freq="2412")
logger.debug("Start concurrent connect and GAS request")
dev[0].connect("test-gas", key_mgmt="WPA-EAP", eap="TTLS",
identity="DOMAIN\mschapv2 user", anonymous_identity="ttls",
password="password", phase2="auth=MSCHAPV2",
- ca_cert="auth_serv/ca.pem", wait_connect=False)
+ ca_cert="auth_serv/ca.pem", wait_connect=False,
+ scan_freq="2412")
req = dev[0].request("GAS_REQUEST " + bssid + " 00 000102000101")
if "FAIL" in req:
raise Exception("GAS query request rejected")
#!/usr/bin/python
#
# Python class for controlling wpa_supplicant
-# Copyright (c) 2013, Jouni Malinen <j@w1.fi>
+# Copyright (c) 2013-2014, Jouni Malinen <j@w1.fi>
#
# This software may be distributed under the terms of the BSD license.
# See README for more details.
self.select_network(id)
return id
- def scan(self, type=None, freq=None):
+ def scan(self, type=None, freq=None, no_wait=False):
if type:
cmd = "SCAN TYPE=" + type
else:
cmd = "SCAN"
if freq:
cmd = cmd + " freq=" + freq
- self.dump_monitor()
+ if not no_wait:
+ self.dump_monitor()
if not "OK" in self.request(cmd):
raise Exception("Failed to trigger scan")
+ if no_wait:
+ return
ev = self.wait_event(["CTRL-EVENT-SCAN-RESULTS"], 15)
if ev is None:
raise Exception("Scan timed out")