From patchwork Fri Mar 4 09:20:32 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: 591857 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 ABCA31402A8 for ; Fri, 4 Mar 2016 20:26:10 +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=0xReywMR; 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 1ablzo-00051A-R4; Fri, 04 Mar 2016 09:26:04 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ablvS-0001yW-MN for hostap@bombadil.infradead.org; Fri, 04 Mar 2016 09:21:34 +0000 Received: from mail-lb0-x232.google.com ([2a00:1450:4010:c04::232]) by merlin.infradead.org with esmtps (Exim 4.85 #2 (Red Hat Linux)) id 1ablvQ-0007zY-1V for hostap@lists.infradead.org; Fri, 04 Mar 2016 09:21:33 +0000 Received: by mail-lb0-x232.google.com with SMTP id bc4so53972138lbc.2 for ; Fri, 04 Mar 2016 01:21:10 -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=YibjxAsgOEmDzjrssh/JxRT1IVuy8RsxpEMPsRaTxjE=; b=0xReywMRuDKSN7EEJ0qGjY319/LyDj7jmuw021aXjwzDubk6YLReq55Aj7GJejg758 A27fIt71BxuqPRhi+owCe7Yy3FQFCIQ9Jh3edqYba8+vHAz7sWwILy410HFcBHaOsbpc y9DEyrxhhTu0BDgWsJNdk5U6X3y79Lu3zWHHg= 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=YibjxAsgOEmDzjrssh/JxRT1IVuy8RsxpEMPsRaTxjE=; b=iJKaM+4nRWDi1hktJQRsL0JTURknTsLbYk51IQIFIqs3lhqiUdrwA4e/ie7XxloVC3 7lqPrNivbYN7njEQ8rGKENQ6Q8OoUWA2U61L5lRDxwA7VVuc9nGFXTr8Afx8kRVGC7Gq Xmc/cktiTqR6ImUFevGccVtplWMW143NBY8I8wnZkahExRorRaRXAm4dSHPLRt/0QMTW AfQTjpLhCdiO/tQGQh+O3/SZP9gsYZZlMZE/0rLGX79KOdzFttc5jdOUyHFSgEPYkOj5 TIS1CG1mg41iA6IHzYkvTo0gVlgo4LDhm03/b49Xhst79f2/IpPB8DlEgQ2qoD+qpNw2 6VTA== X-Gm-Message-State: AD7BkJImxggeJtsqPs0gv55tvC2pNJnFvLATvyhaje85CN7ZeL0MNpEhPWZVRTYq2MgJPwS7ArKaRIhVYu8WEazjvEHZFYi00SmpG5R5U1R6UNkAtl5OMPmvPUi1x/G7vE9nVAO3iA2mjZ5RzYPvL9ut1iF/enrjfWrfRwhwhYL1TOmJRlXMjuoKBQcC2y7JIeKh X-Received: by 10.112.209.68 with SMTP id mk4mr2671034lbc.45.1457083268601; Fri, 04 Mar 2016 01:21:08 -0800 (PST) Received: from dell6430.guest.wifi ([91.198.246.8]) by smtp.gmail.com with ESMTPSA id r191sm437001lfe.28.2016.03.04.01.21.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Mar 2016 01:21:07 -0800 (PST) From: Janusz Dziedzic To: hostap@lists.infradead.org Subject: [PATCH v5 16/25] wpaspy: add support for UDP connection Date: Fri, 4 Mar 2016 10:20:32 +0100 Message-Id: <1457083241-7492-17-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1457083241-7492-1-git-send-email-janusz.dziedzic@tieto.com> References: <1457083241-7492-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-20160304_042132_562884_166B8808 X-CRM114-Status: GOOD ( 10.75 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.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:232 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 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 hostname and port could be specyfied when using wpaspy.Ctrl So, we can connect to remote clients now. This could be tested also using test.py application eg. ./test.py Signed-off-by: Janusz Dziedzic --- wpaspy/test.py | 23 +++++++++++++++++----- wpaspy/wpaspy.py | 60 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 65 insertions(+), 18 deletions(-) diff --git a/wpaspy/test.py b/wpaspy/test.py index 493af7a..9141a8d 100755 --- a/wpaspy/test.py +++ b/wpaspy/test.py @@ -7,13 +7,23 @@ # See README for more details. import os +import sys import time import wpaspy wpas_ctrl = '/var/run/wpa_supplicant' -def wpas_connect(): +def wpas_connect(host=None, port=9877): ifaces = [] + + if host != None: + try: + wpas = wpaspy.Ctrl(host, port) + return wpas + except: + print "Could not connect to host: ", host + return None + if os.path.isdir(wpas_ctrl): try: ifaces = [os.path.join(wpas_ctrl, i) for i in os.listdir(wpas_ctrl)] @@ -34,15 +44,15 @@ def wpas_connect(): return None -def main(): +def main(host=None, port=9877): print "Testing wpa_supplicant control interface connection" - wpas = wpas_connect() + wpas = wpas_connect(host, port) if wpas is None: return print "Connected to wpa_supplicant" print wpas.request('PING') - mon = wpas_connect() + mon = wpas_connect(host, port) if mon is None: print "Could not open event monitor connection" return @@ -66,4 +76,7 @@ def main(): if __name__ == "__main__": - main() + if len(sys.argv) > 2: + main(host=sys.argv[1], port=int(sys.argv[2])) + else: + main() diff --git a/wpaspy/wpaspy.py b/wpaspy/wpaspy.py index 2f57d74..30bb652 100644 --- a/wpaspy/wpaspy.py +++ b/wpaspy/wpaspy.py @@ -7,27 +7,57 @@ # See README for more details. import os +import stat import socket import select counter = 0 class Ctrl: - def __init__(self, path): + def __init__(self, path, port=9877): global counter self.started = False self.attached = False - self.s = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) - self.dest = path - self.local = "/tmp/wpa_ctrl_" + str(os.getpid()) + '-' + str(counter) - counter += 1 - self.s.bind(self.local) + self.path = path + self.port = port + try: - self.s.connect(self.dest) - except Exception, e: - self.s.close() - os.unlink(self.local) - raise + mode = os.stat(path).st_mode + if stat.S_ISSOCK(mode): + self.udp = False + except: + self.udp = True + + + if self.udp == False: + self.s = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) + self.dest = path + self.local = "/tmp/wpa_ctrl_" + str(os.getpid()) + '-' + str(counter) + counter += 1 + self.s.bind(self.local) + try: + self.s.connect(self.dest) + except Exception, e: + self.s.close() + os.unlink(self.local) + raise + else: + try: + ai_list = socket.getaddrinfo(path, port, socket.AF_INET, socket.SOCK_DGRAM) + for af, socktype, proto, cn, sockaddr in ai_list: + self.sockaddr = sockaddr + break + self.s = socket.socket(af, socktype) + self.s.settimeout(5) + self.s.sendto("GET_COOKIE", sockaddr) + reply, server = self.s.recvfrom(4096) + self.cookie = reply + self.port = port + except: + print "connect exception ", path, str(port) + if self.s != None: + self.s.close() + raise self.started = True def __del__(self): @@ -43,11 +73,15 @@ class Ctrl: pass if self.started: self.s.close() - os.unlink(self.local) + if self.udp == False: + os.unlink(self.local) self.started = False def request(self, cmd, timeout=10): - self.s.send(cmd) + if self.udp == True: + self.s.sendto(self.cookie + cmd, self.sockaddr) + else: + self.s.send(cmd) [r, w, e] = select.select([self.s], [], [], timeout) if r: return self.s.recv(4096)