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
e19e6294
Commit
e19e6294
authored
Dec 06, 2017
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move catch blocks to child classes
This reverts commit
07a48bc2
and
f870093c
.
parent
c50ef11b
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
63 deletions
+36
-63
core/src/main/java/com/github/shadowsocks/JniHelper.java
core/src/main/java/com/github/shadowsocks/JniHelper.java
+0
-1
core/src/main/jni/jni-helper.cpp
core/src/main/jni/jni-helper.cpp
+0
-6
mobile/proguard-rules.pro
mobile/proguard-rules.pro
+0
-2
mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt
...ain/java/com/github/shadowsocks/bg/LocalSocketListener.kt
+13
-42
mobile/src/main/java/com/github/shadowsocks/bg/TrafficMonitorThread.kt
...in/java/com/github/shadowsocks/bg/TrafficMonitorThread.kt
+11
-5
mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt
mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt
+12
-7
No files found.
core/src/main/java/com/github/shadowsocks/JniHelper.java
View file @
e19e6294
...
...
@@ -70,5 +70,4 @@ public class JniHelper {
private
static
native
Object
getExitValueMutex
(
Process
process
);
public
static
native
int
sendFd
(
int
fd
,
String
path
);
public
static
native
void
close
(
int
fd
);
public
static
native
void
unlink
(
String
path
);
}
core/src/main/jni/jni-helper.cpp
View file @
e19e6294
...
...
@@ -72,12 +72,6 @@ JNIEXPORT void JNICALL Java_com_github_shadowsocks_JniHelper_close(JNIEnv *env,
close
(
fd
);
}
JNIEXPORT
void
JNICALL
Java_com_github_shadowsocks_JniHelper_unlink
(
JNIEnv
*
env
,
jobject
thiz
,
jstring
path
)
{
const
char
*
sock_str
=
env
->
GetStringUTFChars
(
path
,
0
);
unlink
(
sock_str
);
env
->
ReleaseStringUTFChars
(
path
,
sock_str
);
}
JNIEXPORT
jint
JNICALL
Java_com_github_shadowsocks_JniHelper_sendFd
(
JNIEnv
*
env
,
jobject
thiz
,
jint
tun_fd
,
jstring
path
)
{
int
fd
;
...
...
mobile/proguard-rules.pro
View file @
e19e6294
...
...
@@ -23,8 +23,6 @@
-
keepattributes
*
DatabaseField
*
-
keepattributes
*
DatabaseTable
*
-
keepattributes
*
SerializedName
*
-
keepattributes
Exceptions
,
InnerClasses
-
keep
class
com
.
j256
.
**
-
keepclassmembers
class
com
.
j256
.
**
{
*
;
}
-
keep
enum
com
.
j256
.
**
...
...
mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt
View file @
e19e6294
...
...
@@ -25,75 +25,46 @@ import android.net.LocalSocket
import
android.net.LocalSocketAddress
import
android.util.Log
import
com.github.shadowsocks.App.Companion.app
import
com.github.shadowsocks.JniHelper
import
java.io.File
import
java.io.IOException
import
java.util.concurrent.atomic.AtomicReference
abstract
class
LocalSocketListener
(
pr
ivate
val
tag
:
String
)
:
Thread
()
{
abstract
class
LocalSocketListener
(
pr
otected
val
tag
:
String
)
:
Thread
()
{
init
{
setUncaughtExceptionHandler
(
app
::
track
)
}
protected
abstract
val
socketFile
:
File
private
val
localSocket
=
AtomicReference
<
Local
Socket
?
>()
private
val
serverSocket
=
AtomicReference
<
LocalServer
Socket
?
>()
/**
* Inherited class do not need to close input/output streams as they will be closed automatically.
*/
protected
abstract
fun
accept
(
socket
:
LocalSocket
)
override
fun
run
()
{
JniHelper
.
unlink
(
socketFile
.
absolutePath
)
Thread
.
sleep
(
1000
)
// trick to close the previous local socket safely
val
serverSocket
:
LocalServerSocket
?
=
try
{
val
ls
=
LocalSocket
()
localSocket
.
set
(
ls
)
ls
.
bind
(
LocalSocketAddress
(
socketFile
.
absolutePath
,
LocalSocketAddress
.
Namespace
.
FILESYSTEM
))
LocalServerSocket
(
ls
.
fileDescriptor
)
socketFile
.
delete
()
try
{
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
)
null
return
}
while
(
true
)
{
val
serverSocket
=
serverSocket
.
get
()
?:
return
try
{
val
socket
=
serverSocket
?.
accept
()
?:
break
try
{
accept
(
socket
)
}
catch
(
e
:
Exception
)
{
Log
.
e
(
tag
,
"Error when recv traffic stat"
,
e
)
app
.
track
(
e
)
}
try
{
socket
.
close
()
}
catch
(
e
:
IOException
)
{
Log
.
e
(
tag
,
"Error when closing the local socket"
,
e
)
app
.
track
(
e
)
}
serverSocket
.
accept
()
}
catch
(
e
:
IOException
)
{
Log
.
e
(
tag
,
"Error when accept socket"
,
e
)
app
.
track
(
e
)
break
}
}
try
{
serverSocket
?.
close
()
}
catch
(
e
:
IOException
)
{
Log
.
e
(
tag
,
"Error when closing socket"
,
e
)
app
.
track
(
e
)
null
}
?.
use
(
this
::
accept
)
}
Log
.
d
(
tag
,
"thread exit"
)
}
fun
stopThread
()
{
val
old
=
local
Socket
.
getAndSet
(
null
)
?:
return
val
old
=
server
Socket
.
getAndSet
(
null
)
?:
return
try
{
old
.
close
()
}
catch
(
_
:
Exception
)
{
}
// ignore
...
...
mobile/src/main/java/com/github/shadowsocks/bg/TrafficMonitorThread.kt
View file @
e19e6294
...
...
@@ -21,6 +21,7 @@
package
com.github.shadowsocks.bg
import
android.net.LocalSocket
import
android.util.Log
import
com.github.shadowsocks.App.Companion.app
import
java.io.File
import
java.io.IOException
...
...
@@ -31,10 +32,15 @@ class TrafficMonitorThread : LocalSocketListener("TrafficMonitorThread") {
override
val
socketFile
=
File
(
app
.
filesDir
,
"/stat_path"
)
override
fun
accept
(
socket
:
LocalSocket
)
{
try
{
val
buffer
=
ByteArray
(
16
)
if
(
socket
.
inputStream
.
read
(
buffer
)
!=
16
)
throw
IOException
(
"Unexpected traffic stat length"
)
val
stat
=
ByteBuffer
.
wrap
(
buffer
).
order
(
ByteOrder
.
LITTLE_ENDIAN
)
TrafficMonitor
.
update
(
stat
.
getLong
(
0
),
stat
.
getLong
(
8
))
socket
.
outputStream
.
write
(
0
)
}
catch
(
e
:
Exception
)
{
Log
.
e
(
tag
,
"Error when recv traffic stat"
,
e
)
app
.
track
(
e
)
}
}
}
mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt
View file @
e19e6294
...
...
@@ -55,6 +55,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
override
val
socketFile
:
File
=
File
(
filesDir
,
"protect_path"
)
override
fun
accept
(
socket
:
LocalSocket
)
{
try
{
socket
.
inputStream
.
read
()
val
fds
=
socket
.
ancillaryFileDescriptors
if
(
fds
.
isEmpty
())
return
...
...
@@ -62,6 +63,10 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
val
ret
=
protect
(
fd
)
JniHelper
.
close
(
fd
)
// Trick to close file decriptor
socket
.
outputStream
.
write
(
if
(
ret
)
0
else
1
)
}
catch
(
e
:
Exception
)
{
Log
.
e
(
tag
,
"Error when protect socket"
,
e
)
app
.
track
(
e
)
}
}
}
class
NullConnectionException
:
NullPointerException
()
...
...
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