Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
8e126511
Commit
8e126511
authored
Dec 06, 2017
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Remove file socket on thread finishes"
This reverts commit
8c55630e
.
parent
8c55630e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
20 deletions
+15
-20
mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt
...ain/java/com/github/shadowsocks/bg/LocalSocketListener.kt
+15
-20
No files found.
mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt
View file @
8e126511
...
@@ -42,28 +42,24 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() {
...
@@ -42,28 +42,24 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() {
*/
*/
protected
abstract
fun
accept
(
socket
:
LocalSocket
)
protected
abstract
fun
accept
(
socket
:
LocalSocket
)
override
fun
run
()
{
override
fun
run
()
{
while
(!
socketFile
.
delete
())
Thread
.
sleep
(
100
)
try
{
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
{
try
{
val
localSocket
=
LocalSocket
()
serverSocket
.
accept
()
localSocket
.
bind
(
LocalSocketAddress
(
socketFile
.
absolutePath
,
LocalSocketAddress
.
Namespace
.
FILESYSTEM
))
serverSocket
.
set
(
LocalServerSocket
(
localSocket
.
fileDescriptor
))
}
catch
(
e
:
IOException
)
{
}
catch
(
e
:
IOException
)
{
Log
.
e
(
tag
,
"unable to bind"
,
e
)
Log
.
e
(
tag
,
"Error when accept socket"
,
e
)
return
app
.
track
(
e
)
}
null
while
(
true
)
{
}
?.
use
(
this
::
accept
)
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
()
}
}
}
}
...
@@ -71,7 +67,6 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() {
...
@@ -71,7 +67,6 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() {
val
old
=
serverSocket
.
getAndSet
(
null
)
?:
return
val
old
=
serverSocket
.
getAndSet
(
null
)
?:
return
try
{
try
{
old
.
close
()
old
.
close
()
if
(!
socketFile
.
delete
())
socketFile
.
deleteOnExit
()
}
catch
(
_
:
Exception
)
{
}
// ignore
}
catch
(
_
:
Exception
)
{
}
// ignore
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment