From: Jouni Malinen <j@w1.fi>
Date: Mon, 30 Dec 2013 20:23:18 +0000 (+0200)
Subject: wpaspy: Fix tracking of attached status
X-Git-Tag: hostap_2_1~274
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b44db5f6d6698fe7cf7f603e3f99cfe169a8706d;p=thirdparty%2Fhostap.git

wpaspy: Fix tracking of attached status

The attached variable was initialized and checked, but never updated.
Fix that by updating it on successful ATTACH/DETACH command.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/wpaspy/wpaspy.py b/wpaspy/wpaspy.py
index 678695f19..9836c2df5 100644
--- a/wpaspy/wpaspy.py
+++ b/wpaspy/wpaspy.py
@@ -30,7 +30,11 @@ class Ctrl:
 
     def close(self):
         if self.attached:
-            self.detach()
+            try:
+                self.detach()
+            except Exception, e:
+                # Need to ignore this allow the socket to be closed
+                pass
         if self.started:
             self.s.close()
             os.unlink(self.local)
@@ -48,6 +52,7 @@ class Ctrl:
             return None
         res = self.request("ATTACH")
         if "OK" in res:
+            self.attached = True
             return None
         raise Exception("ATTACH failed")
 
@@ -56,6 +61,7 @@ class Ctrl:
             return None
         res = self.request("DETACH")
         if "OK" in res:
+            self.attached = False
             return None
         raise Exception("DETACH failed")