From patchwork Fri Feb 26 09:38:39 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: 588726 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::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 35AEC140271 for ; Fri, 26 Feb 2016 20:40:19 +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=g6nx22kj; 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 1aZEsZ-0004p1-66; Fri, 26 Feb 2016 09:40:07 +0000 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aZEsE-0004B2-5e for hostap@lists.infradead.org; Fri, 26 Feb 2016 09:39:47 +0000 Received: by mail-wm0-x230.google.com with SMTP id c200so64326995wme.0 for ; Fri, 26 Feb 2016 01:39:26 -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=RSMalWJOcwt2MkmWjOk7rbECi3ACzyp8NOb+wtJ1n1E=; b=g6nx22kjgN3RvG6Rd5wYx/vibwfoXthbxkVIaLq6cl6g0rpOYmZ7hEfpnPFM7nuTRu SdhbZyjlZ2gp0glMxAUHq6uAp29+tmTBDdY/uGzRgfE8lVK79bt4FsTpZDqGhZG4VOIj y9hkYe7qPc6cI+a137HyT57NRh4eSaAvOZTCA= 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=RSMalWJOcwt2MkmWjOk7rbECi3ACzyp8NOb+wtJ1n1E=; b=FDRappXrgItT3ItzSFBee1toS0G/iSYW0BZ0PGhNG5G5T9KqPzA7iaDyB36+omlLkH I1gVnmDYi6gsy1q9ygASV4PsGxWNzV7hTr1VtMAzL8Yqi0pYgbnXIDP1qt5B8TzWZR0A 0Y5W685svYDwlNxC2g0oSLA1eqxVRmZOBAAo8nCSPtXnAFv+/aTqZvYFEolCZ52bPh/q RQAlw8VlwgFx53Fbq0eP+xX/Yrro/dwzN0oEeJpUAj4nP/5sF1nDYkyrSP1H2ffTa+6G 5+K5jTvFtnTJzVNjnQQRE1N5w3gOBhPoUE7igmGLFWNYrXVHqH6+Wap2mBX2muSsy6Ws baEA== X-Gm-Message-State: AD7BkJJ07LmphLw/89sWpaxOztGo1x5nvq7rjrX5i16tB2kP94Y1Hza9XSMwelnkfkXukJF76wlCi6M6gCddB1pzo2RIsulOf7Qx129sTTN+dLBIehR0oB7jGBzO8f2ozjpoc4xik4tCrC1ZAEEwODBSZulnBh9AIN5MmG4I+ATQ0m+Cj5cEQANdNadkvk/STRef X-Received: by 10.28.53.134 with SMTP id c128mr2143429wma.10.1456479565159; Fri, 26 Feb 2016 01:39:25 -0800 (PST) Received: from dell6430.guest.wifi ([91.198.246.8]) by smtp.gmail.com with ESMTPSA id z65sm1915950wmg.1.2016.02.26.01.39.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Feb 2016 01:39:24 -0800 (PST) From: Janusz Dziedzic To: hostap@lists.infradead.org Subject: [PATCH v4 24/29] tests: add terminate support for hostapd/wpa_supplicant Date: Fri, 26 Feb 2016 10:38:39 +0100 Message-Id: <1456479524-14185-25-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456479524-14185-1-git-send-email-janusz.dziedzic@tieto.com> References: <1456479524-14185-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-20160226_013946_458892_7BF480EC X-CRM114-Status: UNSURE ( 7.99 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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 Message has at least one valid DKIM or DK signature -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 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 Signed-off-by: Janusz Dziedzic --- tests/hwsim/hostapd.py | 20 ++++++++++++++++++++ tests/hwsim/wpasupplicant.py | 7 +++++++ 2 files changed, 27 insertions(+) diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py index e4d6bc8..3efebb9 100644 --- a/tests/hwsim/hostapd.py +++ b/tests/hwsim/hostapd.py @@ -102,6 +102,13 @@ class HostapdGlobal: words = line.split(":") return int(words[1]) + def terminate(self): + self.mon.detach() + self.mon.close() + self.mon = None + self.ctrl.terminate() + self.ctrl = None + class Hostapd: def __init__(self, ifname, bssidx=0, hostname=None, port=8877): self.host = wpaspy.Host(hostname, ifname) @@ -117,6 +124,14 @@ class Hostapd: self.bssid = None self.bssidx = bssidx + def close_ctrl(self): + if self.mon is not None: + self.mon.detach() + self.mon.close() + self.mon = None + self.ctrl.close() + self.ctrl = None + def own_addr(self): if self.bssid is None: self.bssid = self.get_status_field('bssid[%d]' % self.bssidx) @@ -366,6 +381,11 @@ def remove_bss(ifname, hostname=None, port=8878): hapd_global = HostapdGlobal(hostname=hostname, port=port) hapd_global.remove(ifname) +def terminate(hostname=None, port=8878): + logger.info("Terminating hostapd") + hapd_global = HostapdGlobal(hostname=hostname, port=port) + hapd_global.terminate() + def wpa2_params(ssid=None, passphrase=None): params = { "wpa": "2", "wpa_key_mgmt": "WPA-PSK", diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py index de814be..b167772 100644 --- a/tests/hwsim/wpasupplicant.py +++ b/tests/hwsim/wpasupplicant.py @@ -39,6 +39,13 @@ class WpaSupplicant: else: self.global_mon = None + def terminate(self): + if self.global_mon: + self.global_mon.detach() + self.global_mon = None + self.global_ctrl.terminate() + self.global_ctrl = None + def close_ctrl(self): if self.global_mon: self.global_mon.detach()