tests: Add initial AP tests with hostapd

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/tests/hwsim/hwsim_utils.py b/tests/hwsim/hwsim_utils.py
index a289e51888e1cac7bf80c7c3e94295adfbd1d80d..b92a23657ab4f4f6bbad9050902425d71cdf6a9f 100644 (file)
--- a/tests/hwsim/hwsim_utils.py
+++ b/tests/hwsim/hwsim_utils.py
@@ -27,3 +27,8 @@ def test_connectivity_p2p(dev1, dev2):
     ifname1 = dev1.group_ifname if dev1.group_ifname else dev1.ifname
     ifname2 = dev2.group_ifname if dev2.group_ifname else dev2.ifname
     test_connectivity(ifname1, ifname2)
+
+def test_connectivity_sta(dev1, dev2):
+    ifname1 = dev1.ifname
+    ifname2 = dev2.ifname
+    test_connectivity(ifname1, ifname2)

diff --git a/tests/hwsim/run-all.sh b/tests/hwsim/run-all.sh
index 51f34cf140a6509ea0614b008bada374dfc78cdc..49376e6b03c8caaeb477e0f217b0cfae06cf3393 100755 (executable)
--- a/tests/hwsim/run-all.sh
+++ b/tests/hwsim/run-all.sh
@@ -3,6 +3,8 @@
 errors=0
 ./start-p2p.sh
 ./run-p2p-tests.py || errors=1
+./start-ap-wpa2-psk.sh
+./run-ap-wpa2-tests.py || errors=1
 ./stop-wifi.sh
 if [ $errors -gt 0 ]; then
     exit 1

diff --git a/tests/hwsim/test_ap_wpa2.py b/tests/hwsim/test_ap_wpa2.py
new file mode 100644 (file)
index 0000000..e0bbebf
--- /dev/null
+++ b/tests/hwsim/test_ap_wpa2.py
@@ -0,0 +1,120 @@
+#!/usr/bin/python
+#
+# Tests with a WPA2-PSK AP
+# Copyright (c) 2013, Jouni Malinen <j@w1.fi>
+#
+# This software may be distributed under the terms of the BSD license.
+# See README for more details.
+
+import time
+import subprocess
+import logging
+logger = logging.getLogger(__name__)
+
+import hwsim_utils
+
+def connect_sta(sta):
+    logger.info("Connect STA " + sta.ifname + " to AP")
+    id = sta.add_network()
+    sta.set_network_quoted(id, "ssid", "test-wpa2-psk")
+    sta.set_network_quoted(id, "psk", "12345678")
+    sta.connect_network(id)
+
+def connect_2sta(dev):
+    connect_sta(dev[0])
+    connect_sta(dev[1])
+    hwsim_utils.test_connectivity_sta(dev[0], dev[1])
+    hwsim_utils.test_connectivity(dev[0].ifname, "wlan2")
+    hwsim_utils.test_connectivity(dev[1].ifname, "wlan2")
+
+def test_ap_wpa2_psk_2sta(dev):
+    """WPA2-PSK AP and two stations"""
+    connect_2sta(dev)
+
+def wlantest_tdls(field, bssid, addr1, addr2):
+    res = subprocess.check_output(["../../wlantest/wlantest_cli",
+                                   "get_tdls_counter", field, bssid, addr1,
+                                   addr2]);
+    if "FAIL" in res:
+        raise Exception("wlantest_cli command failed")
+    return int(res)
+
+def wlantest_tdls_clear(bssid, addr1, addr2):
+    subprocess.call(["../../wlantest/wlantest_cli",
+                     "clear_tdls_counters", bssid, addr1, addr2]);
+
+def wlantest_setup():
+    subprocess.call(["../../wlantest/wlantest_cli", "flush"]);
+    subprocess.call(["../../wlantest/wlantest_cli", "add_passphrase",
+                     "12345678"]);
+
+def setup_tdls(sta0, sta1, bssid, reverse=False):
+    logger.info("Setup TDLS")
+    addr0 = sta0.p2p_interface_addr()
+    addr1 = sta1.p2p_interface_addr()
+    sta0.tdls_setup(addr1)
+    time.sleep(1)
+    if reverse:
+        addr1 = sta0.p2p_interface_addr()
+        addr0 = sta1.p2p_interface_addr()
+    hwsim_utils.test_connectivity_sta(sta0, sta1)
+    conf = wlantest_tdls("setup_conf_ok", bssid, addr0, addr1);
+    if conf == 0:
+        raise Exception("No TDLS Setup Confirm (success) seen")
+    dl = wlantest_tdls("valid_direct_link", bssid, addr0, addr1);
+    if dl == 0:
+        raise Exception("No valid frames through direct link")
+    wlantest_tdls_clear(bssid, addr0, addr1);
+
+def teardown_tdls(sta0, sta1, bssid):
+    logger.info("Teardown TDLS")
+    addr0 = sta0.p2p_interface_addr()
+    addr1 = sta1.p2p_interface_addr()
+    sta0.tdls_teardown(addr1)
+    time.sleep(1)
+    teardown = wlantest_tdls("teardown", bssid, addr0, addr1);
+    if teardown == 0:
+        raise Exception("No TDLS Setup Teardown seen")
+    wlantest_tdls_clear(bssid, addr0, addr1);
+    hwsim_utils.test_connectivity_sta(sta0, sta1)
+    ap_path = wlantest_tdls("valid_ap_path", bssid, addr0, addr1);
+    if ap_path == 0:
+        raise Exception("No valid frames via AP path")
+    direct_link = wlantest_tdls("valid_direct_link", bssid, addr0, addr1);
+    if direct_link > 0:
+        raise Exception("Unexpected frames through direct link")
+    idirect_link = wlantest_tdls("invalid_direct_link", bssid, addr0, addr1);
+    if idirect_link > 0:
+        raise Exception("Unexpected frames through direct link (invalid)")
+
+def test_ap_wpa2_tdls(dev):
+    """WPA2-PSK AP and two stations using TDLS"""
+    bssid = "02:00:00:00:02:00"
+    wlantest_setup()
+    connect_2sta(dev)
+    setup_tdls(dev[0], dev[1], bssid)
+    teardown_tdls(dev[0], dev[1], bssid)
+    setup_tdls(dev[1], dev[0], bssid)
+    #teardown_tdls(dev[0], dev[1], bssid)
+
+def test_ap_wpa2_tdls_concurrent_init(dev):
+    """Concurrent TDLS setup initiation"""
+    bssid = "02:00:00:00:02:00"
+    wlantest_setup()
+    connect_2sta(dev)
+    dev[0].request("SET tdls_testing 0x80")
+    setup_tdls(dev[1], dev[0], bssid, reverse=True)
+
+def test_ap_wpa2_tdls_concurrent_init2(dev):
+    """Concurrent TDLS setup initiation (reverse)"""
+    bssid = "02:00:00:00:02:00"
+    wlantest_setup()
+    connect_2sta(dev)
+    dev[1].request("SET tdls_testing 0x80")
+    setup_tdls(dev[0], dev[1], bssid)
+
+def add_tests(tests):
+    tests.append(test_ap_wpa2_psk_2sta)
+    tests.append(test_ap_wpa2_tdls)
+    tests.append(test_ap_wpa2_tdls_concurrent_init)
+    tests.append(test_ap_wpa2_tdls_concurrent_init2)

diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py
index 3ec06d5c061a0aa54572f660bac8f9a296dd10f1..066274d0792c2ad37637131d7f3db259c9c03162 100644 (file)
--- a/tests/hwsim/wpasupplicant.py
+++ b/tests/hwsim/wpasupplicant.py
@@ -43,6 +43,8 @@ class WpaSupplicant:
         self.request("P2P_GROUP_REMOVE *")
         self.request("REMOVE_NETWORK *")
         self.request("REMOVE_CRED *")
+        self.request("SET tdls_disabled 0")
+        self.request("SET tdls_testing 0")
         self.group_ifname = None
 
     def add_network(self):
@@ -69,6 +71,20 @@ class WpaSupplicant:
             raise Exception("SET_NETWORK failed")
         return None
 
+    def select_network(self, id):
+        id = self.request("SELECT_NETWORK " + str(id))
+        if "FAIL" in id:
+            raise Exception("SELECT_NETWORK failed")
+        return None
+
+    def connect_network(self, id):
+        self.dump_monitor()
+        self.select_network(id)
+        ev = self.wait_event(["CTRL-EVENT-CONNECTED"], timeout=10)
+        if ev is None:
+            raise Exception("Association with the AP timed out")
+        self.dump_monitor()
+
     def get_status(self, field):
         res = self.request("STATUS")
         lines = res.splitlines()