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
b6880efd
Commit
b6880efd
authored
Jan 24, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Protect sockets concurrently
parent
075225db
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
17 deletions
+32
-17
core/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt
...ain/java/com/github/shadowsocks/bg/LocalSocketListener.kt
+1
-1
core/src/main/java/com/github/shadowsocks/bg/TrafficMonitor.kt
...src/main/java/com/github/shadowsocks/bg/TrafficMonitor.kt
+1
-1
core/src/main/java/com/github/shadowsocks/bg/VpnService.kt
core/src/main/java/com/github/shadowsocks/bg/VpnService.kt
+30
-15
No files found.
core/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt
View file @
b6880efd
...
@@ -45,7 +45,7 @@ abstract class LocalSocketListener(name: String, socketFile: File) : Thread(name
...
@@ -45,7 +45,7 @@ abstract class LocalSocketListener(name: String, socketFile: File) : Thread(name
final
override
fun
run
()
=
localSocket
.
use
{
final
override
fun
run
()
=
localSocket
.
use
{
while
(
running
)
{
while
(
running
)
{
try
{
try
{
serverSocket
.
accept
().
use
{
accept
(
it
)
}
accept
(
serverSocket
.
accept
())
}
catch
(
e
:
IOException
)
{
}
catch
(
e
:
IOException
)
{
if
(
running
)
printLog
(
e
)
if
(
running
)
printLog
(
e
)
continue
continue
...
...
core/src/main/java/com/github/shadowsocks/bg/TrafficMonitor.kt
View file @
b6880efd
...
@@ -30,7 +30,7 @@ import java.nio.ByteOrder
...
@@ -30,7 +30,7 @@ import java.nio.ByteOrder
class
TrafficMonitor
(
statFile
:
File
)
:
AutoCloseable
{
class
TrafficMonitor
(
statFile
:
File
)
:
AutoCloseable
{
private
val
thread
=
object
:
LocalSocketListener
(
"TrafficMonitor"
,
statFile
)
{
private
val
thread
=
object
:
LocalSocketListener
(
"TrafficMonitor"
,
statFile
)
{
override
fun
accept
(
socket
:
LocalSocket
)
{
override
fun
accept
(
socket
:
LocalSocket
)
=
socket
.
use
{
val
buffer
=
ByteArray
(
16
)
val
buffer
=
ByteArray
(
16
)
if
(
socket
.
inputStream
.
read
(
buffer
)
!=
16
)
throw
IOException
(
"Unexpected traffic stat length"
)
if
(
socket
.
inputStream
.
read
(
buffer
)
!=
16
)
throw
IOException
(
"Unexpected traffic stat length"
)
val
stat
=
ByteBuffer
.
wrap
(
buffer
).
order
(
ByteOrder
.
LITTLE_ENDIAN
)
val
stat
=
ByteBuffer
.
wrap
(
buffer
).
order
(
ByteOrder
.
LITTLE_ENDIAN
)
...
...
core/src/main/java/com/github/shadowsocks/bg/VpnService.kt
View file @
b6880efd
...
@@ -39,6 +39,7 @@ import com.github.shadowsocks.utils.Key
...
@@ -39,6 +39,7 @@ import com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.Subnet
import
com.github.shadowsocks.utils.Subnet
import
com.github.shadowsocks.utils.parseNumericAddress
import
com.github.shadowsocks.utils.parseNumericAddress
import
com.github.shadowsocks.utils.printLog
import
com.github.shadowsocks.utils.printLog
import
kotlinx.coroutines.*
import
java.io.Closeable
import
java.io.Closeable
import
java.io.File
import
java.io.File
import
java.io.FileDescriptor
import
java.io.FileDescriptor
...
@@ -79,8 +80,14 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
...
@@ -79,8 +80,14 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
}
}
private
inner
class
ProtectWorker
:
private
inner
class
ProtectWorker
:
LocalSocketListener
(
"ShadowsocksVpnThread"
,
File
(
Core
.
deviceStorage
.
noBackupFilesDir
,
"protect_path"
))
{
LocalSocketListener
(
"ShadowsocksVpnThread"
,
File
(
Core
.
deviceStorage
.
noBackupFilesDir
,
"protect_path"
)),
CoroutineScope
{
private
val
job
=
SupervisorJob
()
override
val
coroutineContext
get
()
=
Dispatchers
.
IO
+
job
+
CoroutineExceptionHandler
{
_
,
t
->
printLog
(
t
)
}
override
fun
accept
(
socket
:
LocalSocket
)
{
override
fun
accept
(
socket
:
LocalSocket
)
{
launch
{
socket
.
use
{
socket
.
inputStream
.
read
()
socket
.
inputStream
.
read
()
val
fd
=
socket
.
ancillaryFileDescriptors
!!
.
single
()
!!
val
fd
=
socket
.
ancillaryFileDescriptors
!!
.
single
()
!!
CloseableFd
(
fd
).
use
{
CloseableFd
(
fd
).
use
{
...
@@ -97,6 +104,14 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
...
@@ -97,6 +104,14 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
}
}
}
}
}
}
}
suspend
fun
shutdown
()
{
job
.
cancel
()
close
()
job
.
join
()
}
}
inner
class
NullConnectionException
:
NullPointerException
()
{
inner
class
NullConnectionException
:
NullPointerException
()
{
override
fun
getLocalizedMessage
()
=
getString
(
R
.
string
.
reboot_required
)
override
fun
getLocalizedMessage
()
=
getString
(
R
.
string
.
reboot_required
)
}
}
...
@@ -143,7 +158,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
...
@@ -143,7 +158,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
connectivity
.
unregisterNetworkCallback
(
defaultNetworkCallback
)
connectivity
.
unregisterNetworkCallback
(
defaultNetworkCallback
)
listeningForDefaultNetwork
=
false
listeningForDefaultNetwork
=
false
}
}
worker
?.
close
()
worker
?.
shutdown
()
worker
=
null
worker
=
null
super
.
killProcesses
()
super
.
killProcesses
()
conn
?.
close
()
conn
?.
close
()
...
...
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