From f6420942cb18c478c4ed8c14733bcdd3bbc8f01f Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 19 Oct 2014 20:55:02 +0300 Subject: [PATCH] tests: Add own_addr() for both Hostapd and WpaSupplicant classes This makes it easier to use instances of control interfaces in common code without having to separately address hostapd and wpa_supplicant behavior differences. Signed-off-by: Jouni Malinen --- tests/hwsim/hostapd.py | 6 ++++++ tests/hwsim/wpasupplicant.py | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py index 97672aa2e..83defb08e 100644 --- a/tests/hwsim/hostapd.py +++ b/tests/hwsim/hostapd.py @@ -54,6 +54,12 @@ class Hostapd: self.ctrl = wpaspy.Ctrl(os.path.join(hapd_ctrl, ifname)) self.mon = wpaspy.Ctrl(os.path.join(hapd_ctrl, ifname)) self.mon.attach() + self.bssid = None + + def own_addr(self): + if self.bssid is None: + self.bssid = self.get_status_field('bssid[0]') + return self.bssid def request(self, cmd): logger.debug(self.ifname + ": CTRL: " + cmd) diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py index c58f1377a..da677cebb 100644 --- a/tests/hwsim/wpasupplicant.py +++ b/tests/hwsim/wpasupplicant.py @@ -335,6 +335,13 @@ class WpaSupplicant: def p2p_interface_addr(self): return self.get_group_status_field("address") + def own_addr(self): + try: + res = self.p2p_interface_addr() + except: + res = self.p2p_dev_addr() + return res + def p2p_listen(self): return self.global_request("P2P_LISTEN")