From patchwork Tue Jan 28 14:54:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yegor Yefremov X-Patchwork-Id: 1230397 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=BBrWtubT; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.a=rsa-sha256 header.s=20161025 header.b=UqSAHvxC; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 486V5S0qfvz9sSh for ; Wed, 29 Jan 2020 01:54:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=mHhOI0Kzk2WNOCUpvhoYKGNPh4xcok7haUNnpZ8G6a8=; b=BBr WtubTLrZopHK13R6DwrXbr9dqc990CzdTE+aH7RKjY/aWzmjt4GDyOUKzuutv1z4pyoDgo+OIkIuw 4Pp4yiGm9piaaGqOBNjnZRAgiml+zJwqF+at4GtEu9Xh61bnTwEDmQ70sRTJqEkT1vI4nzfyt33JJ r/g9Q8upgSW6yZMo9CcmuS8QvoRgvCe9fos5NNuSW1a5ihjYzvRGZ3GMsqJg+YOxg0Qr8VKgHNn5S YVcQZOo6daFptm7OuXcC8IDPioxyg2nN/QKXfbgZci+rCIvPdApAibp9Aqx277Pbez20JIEe0FR9J KYE1jRVEeXMiVFiQE03tWWItFseXxBg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iwSGK-0004lV-AP; Tue, 28 Jan 2020 14:54:44 +0000 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iwSGF-0004l9-V6 for hostap@lists.infradead.org; Tue, 28 Jan 2020 14:54:41 +0000 Received: by mail-ed1-x543.google.com with SMTP id f8so15006869edv.2 for ; Tue, 28 Jan 2020 06:54:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=nz6LvqEXnBNyE3Pab97gf17VInOxb5iz21W6MH6lo+c=; b=UqSAHvxCqOxdlFnSmHXFY/YPKEkck8niZunS3oAlGO45sWkXmrO5RQPiDnGtPtWMUz nt76pIx24sSNa5RYWE71ff8kbPbyo9qA0mZY2VLsF9k2uSc0BfxR70RLeXdkhoXwt/az ro9kswKof69e3JoD1n0UKvnpkJHuMklgCNE8/gC5anDp7Gb5LNv5bHiRG6Zw/335hwGp qlxNqc/u6E7gG/IP8KbqCskcxLUOf7lKdB2e+z2isBTFIFpIxv42GvOlsWmAfak51UWH N9us8/xs/7AL6Mz/TdTJswfyGLWkEM/ZCDtOdDCYaIvvCcOxbt8Wi8jRXwkS3DttX28/ bvjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=nz6LvqEXnBNyE3Pab97gf17VInOxb5iz21W6MH6lo+c=; b=prZlWQGtOGVEhIYYnTbdS63e+qmS2AmREmVEg0wpJ+T5qncqrgpaKEh5jkkxU6l9NI aZdE3zTA3AXeoPbNjL7vkaxCOQ1wHUUq0ULJAMcEoleGwVJVGGLrasr6+ISySC1pmU4v EFquzg1FuQ0jvZTD1VZ+b8Nb45dEr84sqOzWhHZvPF1tkjNjqroexAHr4/zfMMsdOtP/ uKPCqzyuG9dKmCjs8/onj3z9i8Ows5VLgOeUydjp81yIahPwjiN9dd5IppRrLGiUHzM1 UUzqWB8eGv82P8NdITBk47f7gN3J85LQzgbd6fr8e14KKUWCPY+3GGnQyHc8yZyVRY/b 4XoA== X-Gm-Message-State: APjAAAXiK0LAlqwCI3qo9PaWqeOdvKu2PuZGwkIISeXCtLCaGc5wJXPY WCHoRPyepbzAcF4IfGtiuwD8PJHvTj0= X-Google-Smtp-Source: APXvYqxxin42tCL0HDFd1hCDzh5KcDwzCUNJXDrutSzHyT0H9ngJT+DJ9qfojo8R2DpIrc75RJ7NqQ== X-Received: by 2002:aa7:cd49:: with SMTP id v9mr3633879edw.269.1580223276063; Tue, 28 Jan 2020 06:54:36 -0800 (PST) Received: from development1.visionsystems.de (mail.visionsystems.de. [213.209.99.202]) by smtp.gmail.com with ESMTPSA id i9sm474459edb.55.2020.01.28.06.54.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jan 2020 06:54:35 -0800 (PST) From: yegorslists@googlemail.com To: hostap@lists.infradead.org Subject: [PATCH] wpas-dbus-new.py: fix python formatting Date: Tue, 28 Jan 2020 15:54:29 +0100 Message-Id: <20200128145429.29120-1-yegorslists@googlemail.com> X-Mailer: git-send-email 2.17.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200128_065440_031776_B3A53E4D X-CRM114-Status: GOOD ( 13.11 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:543 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yegorslists[at]googlemail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yegor Yefremov MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Yegor Yefremov Run autopep8 and changes some other warning manually. Signed-off-by: Yegor Yefremov --- wpa_supplicant/examples/wpas-dbus-new.py | 244 ++++++++++++----------- 1 file changed, 127 insertions(+), 117 deletions(-) diff --git a/wpa_supplicant/examples/wpas-dbus-new.py b/wpa_supplicant/examples/wpas-dbus-new.py index 6bf74ae44..6201c2ace 100755 --- a/wpa_supplicant/examples/wpas-dbus-new.py +++ b/wpa_supplicant/examples/wpas-dbus-new.py @@ -1,9 +1,10 @@ #!/usr/bin/python -import dbus -import sys, os +import os +import sys import time import gobject +import dbus from dbus.mainloop.glib import DBusGMainLoop WPAS_DBUS_SERVICE = "fi.w1.wpa_supplicant1" @@ -14,136 +15,145 @@ WPAS_DBUS_INTERFACES_INTERFACE = "fi.w1.wpa_supplicant1.Interface" WPAS_DBUS_INTERFACES_OPATH = "/fi/w1/wpa_supplicant1/Interfaces" WPAS_DBUS_BSS_INTERFACE = "fi.w1.wpa_supplicant1.BSS" + def byte_array_to_string(s): - import urllib - r = "" - for c in s: - if c >= 32 and c < 127: - r += "%c" % c - else: - r += urllib.quote(chr(c)) - return r + import urllib + r = "" + for c in s: + if c >= 32 and c < 127: + r += "%c" % c + else: + r += urllib.quote(chr(c)) + return r + def list_interfaces(wpas_obj): - ifaces = wpas_obj.Get(WPAS_DBUS_INTERFACE, 'Interfaces', - dbus_interface=dbus.PROPERTIES_IFACE) - for path in ifaces: - if_obj = bus.get_object(WPAS_DBUS_SERVICE, path) - ifname = if_obj.Get(WPAS_DBUS_INTERFACES_INTERFACE, 'Ifname', - dbus_interface=dbus.PROPERTIES_IFACE) - print(ifname) + ifaces = wpas_obj.Get(WPAS_DBUS_INTERFACE, 'Interfaces', + dbus_interface=dbus.PROPERTIES_IFACE) + for path in ifaces: + if_obj = bus.get_object(WPAS_DBUS_SERVICE, path) + ifname = if_obj.Get(WPAS_DBUS_INTERFACES_INTERFACE, 'Ifname', + dbus_interface=dbus.PROPERTIES_IFACE) + print(ifname) + def propertiesChanged(properties): - if properties.has_key("State"): - print("PropertiesChanged: State: %s" % (properties["State"])) + if "State" in properties: + print("PropertiesChanged: State: %s" % (properties["State"])) + def showBss(bss): - net_obj = bus.get_object(WPAS_DBUS_SERVICE, bss) - net = dbus.Interface(net_obj, WPAS_DBUS_BSS_INTERFACE) - - # Convert the byte-array for SSID and BSSID to printable strings - val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'BSSID', - dbus_interface=dbus.PROPERTIES_IFACE) - bssid = "" - for item in val: - bssid = bssid + ":%02x" % item - bssid = bssid[1:] - val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'SSID', - dbus_interface=dbus.PROPERTIES_IFACE) - ssid = byte_array_to_string(val) - - val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'WPA', - dbus_interface=dbus.PROPERTIES_IFACE) - wpa = "no" - if len(val["KeyMgmt"]) > 0: - wpa = "yes" - val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'RSN', - dbus_interface=dbus.PROPERTIES_IFACE) - wpa2 = "no" - if len(val["KeyMgmt"]) > 0: - wpa2 = "yes" - freq = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'Frequency', - dbus_interface=dbus.PROPERTIES_IFACE) - signal = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'Signal', - dbus_interface=dbus.PROPERTIES_IFACE) - val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'Rates', - dbus_interface=dbus.PROPERTIES_IFACE) - if len(val) > 0: - maxrate = val[0] / 1000000 - else: - maxrate = 0 - - print(" %s :: ssid='%s' wpa=%s wpa2=%s signal=%d rate=%d freq=%d" % (bssid, ssid, wpa, wpa2, signal, maxrate, freq)) + net_obj = bus.get_object(WPAS_DBUS_SERVICE, bss) + net = dbus.Interface(net_obj, WPAS_DBUS_BSS_INTERFACE) + + # Convert the byte-array for SSID and BSSID to printable strings + val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'BSSID', + dbus_interface=dbus.PROPERTIES_IFACE) + bssid = "" + for item in val: + bssid = bssid + ":%02x" % item + bssid = bssid[1:] + val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'SSID', + dbus_interface=dbus.PROPERTIES_IFACE) + ssid = byte_array_to_string(val) + + val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'WPA', + dbus_interface=dbus.PROPERTIES_IFACE) + wpa = "no" + if val["KeyMgmt"]: + wpa = "yes" + val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'RSN', + dbus_interface=dbus.PROPERTIES_IFACE) + wpa2 = "no" + if val["KeyMgmt"]: + wpa2 = "yes" + freq = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'Frequency', + dbus_interface=dbus.PROPERTIES_IFACE) + signal = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'Signal', + dbus_interface=dbus.PROPERTIES_IFACE) + val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'Rates', + dbus_interface=dbus.PROPERTIES_IFACE) + if val: + maxrate = val[0] / 1000000 + else: + maxrate = 0 + + print(" %s :: ssid='%s' wpa=%s wpa2=%s signal=%d rate=%d freq=%d" % + (bssid, ssid, wpa, wpa2, signal, maxrate, freq)) + def scanDone(success): - print("Scan done: success=%s" % success) - - res = if_obj.Get(WPAS_DBUS_INTERFACES_INTERFACE, 'BSSs', - dbus_interface=dbus.PROPERTIES_IFACE) + print("Scan done: success=%s" % success) + + res = if_obj.Get(WPAS_DBUS_INTERFACES_INTERFACE, 'BSSs', + dbus_interface=dbus.PROPERTIES_IFACE) + + print("Scanned wireless networks:") + for opath in res: + print(opath) + showBss(opath) - print("Scanned wireless networks:") - for opath in res: - print(opath) - showBss(opath) def bssAdded(bss, properties): - print("BSS added: %s" % (bss)) - showBss(bss) + print("BSS added: %s" % (bss)) + showBss(bss) + def bssRemoved(bss): - print("BSS removed: %s" % (bss)) + print("BSS removed: %s" % (bss)) + def main(): - dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) - global bus - bus = dbus.SystemBus() - wpas_obj = bus.get_object(WPAS_DBUS_SERVICE, WPAS_DBUS_OPATH) - - if len(sys.argv) != 2: - list_interfaces(wpas_obj) - os._exit(1) - - wpas = dbus.Interface(wpas_obj, WPAS_DBUS_INTERFACE) - bus.add_signal_receiver(scanDone, - dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE, - signal_name="ScanDone") - bus.add_signal_receiver(bssAdded, - dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE, - signal_name="BSSAdded") - bus.add_signal_receiver(bssRemoved, - dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE, - signal_name="BSSRemoved") - bus.add_signal_receiver(propertiesChanged, - dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE, - signal_name="PropertiesChanged") - - ifname = sys.argv[1] - - # See if wpa_supplicant already knows about this interface - path = None - try: - path = wpas.GetInterface(ifname) - except dbus.DBusException as exc: - if not str(exc).startswith("fi.w1.wpa_supplicant1.InterfaceUnknown:"): - raise exc - try: - path = wpas.CreateInterface({'Ifname': ifname, 'Driver': 'test'}) - time.sleep(1) - - except dbus.DBusException as exc: - if not str(exc).startswith("fi.w1.wpa_supplicant1.InterfaceExists:"): - raise exc - - global if_obj - if_obj = bus.get_object(WPAS_DBUS_SERVICE, path) - global iface - iface = dbus.Interface(if_obj, WPAS_DBUS_INTERFACES_INTERFACE) - iface.Scan({'Type': 'active'}) - - gobject.MainLoop().run() - - wpas.RemoveInterface(dbus.ObjectPath(path)) + dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) + global bus + bus = dbus.SystemBus() + wpas_obj = bus.get_object(WPAS_DBUS_SERVICE, WPAS_DBUS_OPATH) + + if len(sys.argv) != 2: + list_interfaces(wpas_obj) + os._exit(1) + + wpas = dbus.Interface(wpas_obj, WPAS_DBUS_INTERFACE) + bus.add_signal_receiver(scanDone, + dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE, + signal_name="ScanDone") + bus.add_signal_receiver(bssAdded, + dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE, + signal_name="BSSAdded") + bus.add_signal_receiver(bssRemoved, + dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE, + signal_name="BSSRemoved") + bus.add_signal_receiver(propertiesChanged, + dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE, + signal_name="PropertiesChanged") + + ifname = sys.argv[1] + + # See if wpa_supplicant already knows about this interface + path = None + try: + path = wpas.GetInterface(ifname) + except dbus.DBusException as exc: + if not str(exc).startswith("fi.w1.wpa_supplicant1.InterfaceUnknown:"): + raise exc + try: + path = wpas.CreateInterface({'Ifname': ifname, 'Driver': 'test'}) + time.sleep(1) + + except dbus.DBusException as exc: + if not str(exc).startswith("fi.w1.wpa_supplicant1.InterfaceExists:"): + raise exc + + global if_obj + if_obj = bus.get_object(WPAS_DBUS_SERVICE, path) + global iface + iface = dbus.Interface(if_obj, WPAS_DBUS_INTERFACES_INTERFACE) + iface.Scan({'Type': 'active'}) + + gobject.MainLoop().run() + + wpas.RemoveInterface(dbus.ObjectPath(path)) -if __name__ == "__main__": - main() +if __name__ == "__main__": + main()