Fix a potential issue in localSocket

shadowsocks · Dec 11, 2017 · 9aa0a4e · 9aa0a4e
1 parent aa53318
commit 9aa0a4e
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt b/mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt
@@ -41,22 +41,25 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() {
      * Inherited class do not need to close input/output streams as they will be closed automatically.
      */
     protected abstract fun accept(socket: LocalSocket)
-    override final fun run() = LocalSocket().use { localSocket ->
-        val serverSocket = try {
-            localSocket.bind(LocalSocketAddress(socketFile.absolutePath, LocalSocketAddress.Namespace.FILESYSTEM))
-            LocalServerSocket(localSocket.fileDescriptor)
-        } catch (e: IOException) {
-            Log.e(tag, "unable to bind", e)
-            return
-        }
-        while (running) {
-            try {
-                serverSocket.accept()
+    override final fun run() {
+        socketFile.delete() // It's a must-have to close and reuse previous local socket.
+        LocalSocket().use { localSocket ->
+            val serverSocket = try {
+                localSocket.bind(LocalSocketAddress(socketFile.absolutePath, LocalSocketAddress.Namespace.FILESYSTEM))
+                LocalServerSocket(localSocket.fileDescriptor)
             } catch (e: IOException) {
-                Log.e(tag, "Error when accept socket", e)
-                app.track(e)
-                null
-            }?.use(this::accept)
+                Log.e(tag, "unable to bind", e)
+                return
+            }
+            while (running) {
+                try {
+                    serverSocket.accept()
+                } catch (e: IOException) {
+                    Log.e(tag, "Error when accept socket", e)
+                    app.track(e)
+                    null
+                }?.use(this::accept)
+            }
         }
     }