From patchwork Tue Mar 8 13:28:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz.Dziedzic@tieto.com X-Patchwork-Id: 594203 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E8983140B9A for ; Wed, 9 Mar 2016 00:29:09 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=tieto.com header.i=@tieto.com header.b=qNeoz3s6; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1adHh5-000621-E1; Tue, 08 Mar 2016 13:28:59 +0000 Received: from mail-lb0-x233.google.com ([2a00:1450:4010:c04::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1adHgw-0005cy-Nj for hostap@lists.infradead.org; Tue, 08 Mar 2016 13:28:55 +0000 Received: by mail-lb0-x233.google.com with SMTP id bc4so17944161lbc.2 for ; Tue, 08 Mar 2016 05:28:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fwl6qZADDPJgAG2hDBeTGYYGFQf3BpmjFUuN4+ieIaM=; b=qNeoz3s6J7yvCG2exv7Sou8V9F5KA/qP7R4xyDfIsnmEPIwwkzQFDVbKOhhcvm2bOK sOvGAfvfvEDNWB299qLqX2TwNWYons6IsvviFzaifo3q1PpVaYvpmrUx/fLIpwm4reyE K0QsL4kdt4aVqForZGGqNpTbaksUNc45qHct8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fwl6qZADDPJgAG2hDBeTGYYGFQf3BpmjFUuN4+ieIaM=; b=RsA+ztr+3KbhQkfVhSc9yHacuEozJ1977z/iXySYIsw9OeCnp6KbqggcvuRcAP/2ck 3MiM1YA1K0poR+DGdELpR6IIu7FEJRONcqvROBA3peKkESGUlO413m74tMQNH1ee+lgb UoPkzKNtmRNfH8/v/VtLRd2jB1Ks1FjSWvC6Bm7x15h1Z6Xtka9RC7Ztsk1uTJnMBpR1 2iuzGB/skQFwcfMrK7MxK+Oz26CHS5IbtyjvRojHosfPqEPfuJVbudUJRpKL58zFCvTM WkTiDTmdIK/X2rJPoA8tFXU7PVtzvTHitpNma6iR32ca9HGYYv9ZzhPBPwqEtcEgJPU9 K3Lg== X-Gm-Message-State: AD7BkJIiO8LuTie/z6Nx2g+woaHCdsOMYAvWXAmTFdbZGeZYJYae5CH9D0a2dkfiNhSolzRIg9Kn/Nw5f/KjXq+cgS659rD0Jb57MRW+q5bW5Pb5ZPlMxRkke4RZX5BQPtVeCsjxgHwR/psvopiLHIK9O9E/Aln0XKLWJgHcePucjU81OKwKqxYNF9KwKiT3m06n X-Received: by 10.25.206.135 with SMTP id e129mr10306041lfg.46.1457443708196; Tue, 08 Mar 2016 05:28:28 -0800 (PST) Received: from dell6430.guest.wifi ([91.198.246.8]) by smtp.gmail.com with ESMTPSA id r200sm468962lfr.47.2016.03.08.05.28.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Mar 2016 05:28:27 -0800 (PST) From: Janusz Dziedzic To: hostap@lists.infradead.org Subject: [PATCH 4/4] tests: hostapd/wpasupplicant improve dbg logs Date: Tue, 8 Mar 2016 14:28:05 +0100 Message-Id: <1457443685-854-4-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1457443685-854-1-git-send-email-janusz.dziedzic@tieto.com> References: <1457443685-854-1-git-send-email-janusz.dziedzic@tieto.com> X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160308_052851_332849_C558DC03 X-CRM114-Status: GOOD ( 10.63 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c04:0:0:0:233 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: j@w1.fi, Janusz Dziedzic MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Show more info when we are using remote wpaspy and UDP CTRL connection. Signed-off-by: Janusz Dziedzic --- tests/hwsim/hostapd.py | 34 ++++++++++++++++++---------------- tests/hwsim/wpasupplicant.py | 16 ++++++++++------ 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py index 400c89c..d2dbb0a 100644 --- a/tests/hwsim/hostapd.py +++ b/tests/hwsim/hostapd.py @@ -27,20 +27,23 @@ class HostapdGlobal: if hostname is None: self.ctrl = wpaspy.Ctrl(hapd_global) self.mon = wpaspy.Ctrl(hapd_global) + self.dbg = "" else: self.ctrl = wpaspy.Ctrl(hostname, port) self.mon = wpaspy.Ctrl(hostname, port) + self.dbg = hostname + "/" + str(port) self.mon.attach() - def request(self, cmd): - return self.ctrl.request(cmd) + def request(self, cmd, timeout=10): + logger.debug(self.dbg + ": CTRL(global): " + cmd) + return self.ctrl.request(cmd, timeout) def wait_event(self, events, timeout): start = os.times()[4] while True: while self.mon.pending(): ev = self.mon.recv() - logger.debug("(global): " + ev) + logger.debug(self.dbg + "(global): " + ev) for event in events: if event in ev: return ev @@ -52,42 +55,39 @@ class HostapdGlobal: break return None - def request(self, cmd): - return self.ctrl.request(cmd) - def add(self, ifname, driver=None): cmd = "ADD " + ifname + " " + hapd_ctrl if driver: cmd += " " + driver - res = self.ctrl.request(cmd) + res = self.request(cmd) if not "OK" in res: raise Exception("Could not add hostapd interface " + ifname) def add_iface(self, ifname, confname): - res = self.ctrl.request("ADD " + ifname + " config=" + confname) + res = self.request("ADD " + ifname + " config=" + confname) if not "OK" in res: raise Exception("Could not add hostapd interface") def add_bss(self, phy, confname, ignore_error=False): - res = self.ctrl.request("ADD bss_config=" + phy + ":" + confname) + res = self.request("ADD bss_config=" + phy + ":" + confname) if not "OK" in res: if not ignore_error: raise Exception("Could not add hostapd BSS") def remove(self, ifname): - self.ctrl.request("REMOVE " + ifname, timeout=30) + self.request("REMOVE " + ifname, timeout=30) def relog(self): - self.ctrl.request("RELOG") + self.request("RELOG") def flush(self): - self.ctrl.request("FLUSH") + self.request("FLUSH") def get_ctrl_iface_port(self, ifname): if self.hostname is None: return None - res = self.ctrl.request("INTERFACES ctrl") + res = self.request("INTERFACES ctrl") lines = res.splitlines() found = False for line in lines: @@ -117,9 +117,11 @@ class Hostapd: if hostname is None: self.ctrl = wpaspy.Ctrl(os.path.join(hapd_ctrl, ifname)) self.mon = wpaspy.Ctrl(os.path.join(hapd_ctrl, ifname)) + self.dbg = ifname else: self.ctrl = wpaspy.Ctrl(hostname, port) self.mon = wpaspy.Ctrl(hostname, port) + self.dbg = hostname + "/" + ifname self.mon.attach() self.bssid = None self.bssidx = bssidx @@ -138,7 +140,7 @@ class Hostapd: return self.bssid def request(self, cmd): - logger.debug(self.ifname + ": CTRL: " + cmd) + logger.debug(self.dbg + ": CTRL: " + cmd) return self.ctrl.request(cmd) def ping(self): @@ -201,14 +203,14 @@ class Hostapd: def dump_monitor(self): while self.mon.pending(): ev = self.mon.recv() - logger.debug(self.ifname + ": " + ev) + logger.debug(self.dbg + ": " + ev) def wait_event(self, events, timeout): start = os.times()[4] while True: while self.mon.pending(): ev = self.mon.recv() - logger.debug(self.ifname + ": " + ev) + logger.debug(self.dbg + ": " + ev) for event in events: if event in ev: return ev diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py index e9ea424..1c1ae04 100644 --- a/tests/hwsim/wpasupplicant.py +++ b/tests/hwsim/wpasupplicant.py @@ -33,9 +33,11 @@ class WpaSupplicant: if hostname != None: self.global_ctrl = wpaspy.Ctrl(hostname, global_port) self.global_mon = wpaspy.Ctrl(hostname, global_port) + self.global_dbg = hostname + "/" + str(global_port) + "/" else: self.global_ctrl = wpaspy.Ctrl(global_iface) self.global_mon = wpaspy.Ctrl(global_iface) + self.global_dbg = "" self.global_mon.attach() else: self.global_mon = None @@ -60,9 +62,11 @@ class WpaSupplicant: self.ctrl = wpaspy.Ctrl(hostname, port) self.mon = wpaspy.Ctrl(hostname, port) self.host = remotehost.Host(hostname, ifname) + self.dbg = hostname + "/" + ifname else: self.ctrl = wpaspy.Ctrl(os.path.join(wpas_ctrl, ifname)) self.mon = wpaspy.Ctrl(os.path.join(wpas_ctrl, ifname)) + self.dbg = ifname self.mon.attach() def remove_ifname(self): @@ -131,7 +135,7 @@ class WpaSupplicant: self.global_request("INTERFACE_REMOVE " + ifname) def request(self, cmd, timeout=10): - logger.debug(self.ifname + ": CTRL: " + cmd) + logger.debug(self.dbg + ": CTRL: " + cmd) return self.ctrl.request(cmd, timeout=timeout) def global_request(self, cmd): @@ -139,7 +143,7 @@ class WpaSupplicant: self.request(cmd) else: ifname = self.ifname or self.global_iface - logger.debug(ifname + ": CTRL(global): " + cmd) + logger.debug(self.global_dbg + ifname + ": CTRL(global): " + cmd) return self.global_ctrl.request(cmd) def group_request(self, cmd): @@ -680,7 +684,7 @@ class WpaSupplicant: while True: while self.mon.pending(): ev = self.mon.recv() - logger.debug(self.ifname + ": " + ev) + logger.debug(self.dbg + ": " + ev) for event in events: if event in ev: return ev @@ -700,7 +704,7 @@ class WpaSupplicant: while True: while self.global_mon.pending(): ev = self.global_mon.recv() - logger.debug(self.ifname + "(global): " + ev) + logger.debug(self.global_dbg + self.ifname + "(global): " + ev) for event in events: if event in ev: return ev @@ -752,11 +756,11 @@ class WpaSupplicant: count_global = 0 while self.mon.pending(): ev = self.mon.recv() - logger.debug(self.ifname + ": " + ev) + logger.debug(self.dbg + ": " + ev) count_iface += 1 while self.global_mon and self.global_mon.pending(): ev = self.global_mon.recv() - logger.debug(self.ifname + "(global): " + ev) + logger.debug(self.global_dbg + self.ifname + "(global): " + ev) count_global += 1 return (count_iface, count_global)