From: Jouni Malinen <j@w1.fi>
Date: Thu, 2 Jan 2014 16:10:30 +0000 (+0200)
Subject: tests: Verify STA command output and EAPOL state
X-Git-Tag: hostap_2_1~234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dec879d5b7775871f73cd9e7ceafea10a4ec5a2;p=thirdparty%2Fhostap.git

tests: Verify STA command output and EAPOL state

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

diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py
index 9ac7c9c53..cf74a4731 100644
--- a/tests/hwsim/hostapd.py
+++ b/tests/hwsim/hostapd.py
@@ -179,8 +179,11 @@ class Hostapd:
         hdr = struct.pack('<HH6B6B6BH', *t)
         self.request("MGMT_TX " + binascii.hexlify(hdr + msg['payload']))
 
-    def get_sta(self, addr):
-        res = self.request("STA " + addr)
+    def get_sta(self, addr, info=None):
+        if info:
+            res = self.request("STA " + addr + " " + info)
+        else:
+            res = self.request("STA " + addr)
         lines = res.splitlines()
         vals = dict()
         first = True
diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py
index 1e5ad5d00..e11939eae 100644
--- a/tests/hwsim/test_ap_eap.py
+++ b/tests/hwsim/test_ap_eap.py
@@ -149,12 +149,23 @@ def test_ap_wpa2_eap_ttls_mschapv2(dev, apdev):
     """WPA2-Enterprise connection using EAP-TTLS/MSCHAPv2"""
     params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
     hostapd.add_ap(apdev[0]['ifname'], params)
+    hapd = hostapd.Hostapd(apdev[0]['ifname'])
     eap_connect(dev[0], "TTLS", "DOMAIN\mschapv2 user",
                 anonymous_identity="ttls", password="password",
                 ca_cert="auth_serv/ca.pem", phase2="auth=MSCHAPV2",
                 domain_suffix_match="w1.fi")
     hwsim_utils.test_connectivity(dev[0].ifname, apdev[0]['ifname'])
+    sta1 = hapd.get_sta(dev[0].p2p_interface_addr())
+    eapol1 = hapd.get_sta(dev[0].p2p_interface_addr(), info="eapol")
     eap_reauth(dev[0], "TTLS")
+    sta2 = hapd.get_sta(dev[0].p2p_interface_addr())
+    eapol2 = hapd.get_sta(dev[0].p2p_interface_addr(), info="eapol")
+    if int(sta2['dot1xAuthEapolFramesRx']) <= int(sta1['dot1xAuthEapolFramesRx']):
+        raise Exception("dot1xAuthEapolFramesRx did not increase")
+    if int(eapol2['authAuthEapStartsWhileAuthenticated']) < 1:
+        raise Exception("authAuthEapStartsWhileAuthenticated did not increase")
+    if int(eapol2['backendAuthSuccesses']) <= int(eapol1['backendAuthSuccesses']):
+        raise Exception("backendAuthSuccesses did not increase")
 
 def test_ap_wpa2_eap_ttls_eap_gtc(dev, apdev):
     """WPA2-Enterprise connection using EAP-TTLS/EAP-GTC"""