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 <j@w1.fi>

diff --git a/wpa_supplicant/examples/wps-nfc.py b/wpa_supplicant/examples/wps-nfc.py
index 753e9d13c2f64ad5939c2e615e8a1cf2dfa09704..39c206f1809cc85bfc58391ac72da97993732e03 100755 (executable)
--- 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()