Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Remove file socket on thread finishes"

Browse Source 
This reverts commit 8c55630e9b.
This commit is contained in:
Mygod
2017-12-06 16:31:06 -08:00
parent 8c55630e9b
commit 8e126511de
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt
+15 -20
View File
@@ -42,28 +42,24 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() {
*/
protected abstract fun accept(socket: LocalSocket)
override fun run() {
while (!socketFile.delete()) Thread.sleep(100)
try {
while (!socketFile.delete()) Thread.sleep(100)
val localSocket = LocalSocket()
localSocket.bind(LocalSocketAddress(socketFile.absolutePath, LocalSocketAddress.Namespace.FILESYSTEM))
serverSocket.set(LocalServerSocket(localSocket.fileDescriptor))
} catch (e: IOException) {
Log.e(tag, "unable to bind", e)
return
}
while (true) {
val serverSocket = serverSocket.get() ?: return
try {
val localSocket = LocalSocket()
localSocket.bind(LocalSocketAddress(socketFile.absolutePath, LocalSocketAddress.Namespace.FILESYSTEM))
serverSocket.set(LocalServerSocket(localSocket.fileDescriptor))
serverSocket.accept()
} catch (e: IOException) {
Log.e(tag, "unable to bind", e)
return
}
while (true) {
val serverSocket = serverSocket.get() ?: return
try {
serverSocket.accept()
} catch (e: IOException) {
Log.e(tag, "Error when accept socket", e)
app.track(e)
null
}?.use(this::accept)
}
} finally {
stopThread()
Log.e(tag, "Error when accept socket", e)
app.track(e)
null
}?.use(this::accept)
}
}
@@ -71,7 +67,6 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() {
val old = serverSocket.getAndSet(null) ?: return
try {
old.close()
if (!socketFile.delete()) socketFile.deleteOnExit()
} catch (_: Exception) { } // ignore
}
}