From ec4f5a37b8fc3612be2353133be97af92c8a4667 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 4 Nov 2012 15:53:33 +0200 Subject: [PATCH] WPS: Move wpactrl setup into a separate function This makes it easier to share this functionality for new NFC use cases. Signed-hostap: Jouni Malinen --- wpa_supplicant/examples/wps-nfc.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/wpa_supplicant/examples/wps-nfc.py b/wpa_supplicant/examples/wps-nfc.py index 753e9d13c..39c206f18 100755 --- a/wpa_supplicant/examples/wps-nfc.py +++ b/wpa_supplicant/examples/wps-nfc.py @@ -17,26 +17,34 @@ import wpactrl wpas_ctrl = '/var/run/wpa_supplicant' -def wpas_tag_read(message): +def wpas_connect(): ifaces = [] if os.path.isdir(wpas_ctrl): try: ifaces = [os.path.join(wpas_ctrl, i) for i in os.listdir(wpas_ctrl)] except OSError, error: print "Could not find wpa_supplicant: ", error - return + return None if len(ifaces) < 1: print "No wpa_supplicant control interface found" - return + return None for ctrl in ifaces: try: wpas = wpactrl.WPACtrl(ctrl) - print wpas.request("WPS_NFC_TAG_READ " + message.encode("hex")) + return wpas except wpactrl.error, error: print "Error: ", error pass + return None + + +def wpas_tag_read(message): + wpas = wpas_connect() + if (wpas == None): + return + print wpas.request("WPS_NFC_TAG_READ " + message.encode("hex")) def main(): clf = nfc.ContactlessFrontend()