From: Jouni Malinen <j@w1.fi>
Date: Tue, 31 Dec 2013 13:43:17 +0000 (+0200)
Subject: wpaspy: Do not leave socket files behind if connection fails
X-Git-Tag: hostap_2_1~273
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=d52747c99e27d520a5f00f5207042f6f4bf0d838

wpaspy: Do not leave socket files behind if connection fails

Ctrl::__init__ needs to handle socket.connect() exceptions and unlink
the client socket file on failures.

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

diff --git a/wpaspy/wpaspy.py b/wpaspy/wpaspy.py
index 9836c2d..7c2314d 100644
--- a/wpaspy/wpaspy.py
+++ b/wpaspy/wpaspy.py
@@ -22,7 +22,12 @@ class Ctrl:
         self.local = "/tmp/wpa_ctrl_" + str(os.getpid()) + '-' + str(counter)
         counter += 1
         self.s.bind(self.local)
-        self.s.connect(self.dest)
+        try:
+            self.s.connect(self.dest)
+        except Exception, e:
+            self.s.close()
+            os.unlink(self.local)
+            raise
         self.started = True
 
     def __del__(self):