]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
dpp-nfc: Stop only_one run after failed handover attempt
authorJouni Malinen <jouni@codeaurora.org>
Thu, 30 Jul 2020 22:09:31 +0000 (01:09 +0300)
committerJouni Malinen <j@w1.fi>
Thu, 30 Jul 2020 22:09:31 +0000 (01:09 +0300)
Do not require connection handover to succeed before stopping the loop
in the only_one case.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
wpa_supplicant/examples/dpp-nfc.py

index fcb65698756784ec763edfaffd0ddaffd8c94682..02a7e2f45e8496854f019981a3bbd9e77f43390b 100755 (executable)
@@ -907,6 +907,7 @@ class ConnectionHandover():
         self.start_client_alt = False
         self.terminate_on_hs_send_completion = False
         self.try_own = False
+        self.connected = False
 
     def start_handover_server(self, llc):
         summary("Start handover server")
@@ -939,6 +940,7 @@ def llcp_startup(llc):
 def llcp_connected(llc):
     summary("P2P LLCP connected")
     global handover
+    handover.connected = True
     handover.srv.start()
     if init_on_touch or not no_input:
         handover.client_thread = threading.Thread(target=llcp_worker,
@@ -1129,8 +1131,8 @@ def main():
                 summary("clf.connect failed: " + str(e))
                 break
 
-            if only_one and handover.srv and handover.srv.success:
-                raise SystemExit
+            if only_one and handover.connected:
+                break
 
     except KeyboardInterrupt:
         raise SystemExit