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
8d02a1a6
Commit
8d02a1a6
authored
Jul 25, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #334 from shadowsocks/android-ipc
Improve the compatibility by using IPC
parents
faad9618
9f676364
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
366 additions
and
288 deletions
+366
-288
build.sh
build.sh
+1
-1
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+2
-2
src/main/java/com/github/shadowsocks/System.java
src/main/java/com/github/shadowsocks/System.java
+1
-0
src/main/jni/Android.mk
src/main/jni/Android.mk
+8
-6
src/main/jni/shadowsocks-libev
src/main/jni/shadowsocks-libev
+1
-1
src/main/jni/system.cpp
src/main/jni/system.cpp
+6
-0
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+209
-278
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
...n/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
+138
-0
No files found.
build.sh
View file @
8d02a1a6
...
@@ -7,7 +7,7 @@ function try () {
...
@@ -7,7 +7,7 @@ function try () {
try
pushd
src/main
try
pushd
src/main
# Build
# Build
try
$ANDROID_NDK_HOME
/ndk-build clean
#
try $ANDROID_NDK_HOME/ndk-build clean
try
$ANDROID_NDK_HOME
/ndk-build
-j8
try
$ANDROID_NDK_HOME
/ndk-build
-j8
# copy executables
# copy executables
...
...
src/main/AndroidManifest.xml
View file @
8d02a1a6
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"com.github.shadowsocks"
package=
"com.github.shadowsocks"
android:versionCode=
"10
8
"
android:versionCode=
"10
9
"
android:versionName=
"2.7.
0
"
>
android:versionName=
"2.7.
1
"
>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
...
...
src/main/java/com/github/shadowsocks/System.java
View file @
8d02a1a6
...
@@ -46,4 +46,5 @@ public class System {
...
@@ -46,4 +46,5 @@ public class System {
public
static
native
void
exec
(
String
cmd
);
public
static
native
void
exec
(
String
cmd
);
public
static
native
String
getABI
();
public
static
native
String
getABI
();
public
static
native
int
sendfd
(
int
fd
);
public
static
native
int
sendfd
(
int
fd
);
public
static
native
void
jniclose
(
int
fd
);
}
}
src/main/jni/Android.mk
View file @
8d02a1a6
...
@@ -249,13 +249,14 @@ include $(BUILD_EXECUTABLE)
...
@@ -249,13 +249,14 @@ include $(BUILD_EXECUTABLE)
include
$(CLEAR_VARS)
include
$(CLEAR_VARS)
SHADOWSOCKS_SOURCES
:=
local.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c acl.c
SHADOWSOCKS_SOURCES
:=
local.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c acl.c
android.c
LOCAL_MODULE
:=
ss-local
LOCAL_MODULE
:=
ss-local
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
\
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
\
-I
$(LOCAL_PATH)
/libev/
\
-I
$(LOCAL_PATH)
/libev
\
-I
$(LOCAL_PATH)
/libancillary
\
-I
$(LOCAL_PATH)
/openssl/include
\
-I
$(LOCAL_PATH)
/openssl/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libudns
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libudns
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
...
@@ -263,7 +264,7 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \
...
@@ -263,7 +264,7 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libipset libcork libudns libsodium
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libipset libcork libudns libsodium
libancillary
LOCAL_LDLIBS
:=
-llog
LOCAL_LDLIBS
:=
-llog
...
@@ -275,20 +276,21 @@ include $(BUILD_EXECUTABLE)
...
@@ -275,20 +276,21 @@ include $(BUILD_EXECUTABLE)
include
$(CLEAR_VARS)
include
$(CLEAR_VARS)
SHADOWSOCKS_SOURCES
:=
tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c
SHADOWSOCKS_SOURCES
:=
tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c
android.c
LOCAL_MODULE
:=
ss-tunnel
LOCAL_MODULE
:=
ss-tunnel
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
-DUDPRELAY_TUNNEL
\
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
-DUDPRELAY_TUNNEL
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
-DSSTUNNEL_JNI
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
-DSSTUNNEL_JNI
\
-I
$(LOCAL_PATH)
/libev/
\
-I
$(LOCAL_PATH)
/libev
\
-I
$(LOCAL_PATH)
/libancillary
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libudns
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libudns
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/openssl/include
-I
$(LOCAL_PATH)
/openssl/include
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libsodium libcork libudns
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libsodium libcork libudns
libancillary
LOCAL_LDLIBS
:=
-llog
LOCAL_LDLIBS
:=
-llog
...
...
shadowsocks-libev
@
3af591c5
Subproject commit
2b1eef11973de3f7380401fd20f937e84bc2b756
Subproject commit
3af591c5657c1c2c30a69cab3ca0e5d1f4e3d084
src/main/jni/system.cpp
View file @
8d02a1a6
...
@@ -43,6 +43,10 @@ void Java_com_github_shadowsocks_system_exec(JNIEnv *env, jobject thiz, jstring
...
@@ -43,6 +43,10 @@ void Java_com_github_shadowsocks_system_exec(JNIEnv *env, jobject thiz, jstring
env
->
ReleaseStringUTFChars
(
cmd
,
str
);
env
->
ReleaseStringUTFChars
(
cmd
,
str
);
}
}
void
Java_com_github_shadowsocks_system_jniclose
(
JNIEnv
*
env
,
jobject
thiz
,
jint
fd
)
{
close
(
fd
);
}
jint
Java_com_github_shadowsocks_system_sendfd
(
JNIEnv
*
env
,
jobject
thiz
,
jint
tun_fd
)
{
jint
Java_com_github_shadowsocks_system_sendfd
(
JNIEnv
*
env
,
jobject
thiz
,
jint
tun_fd
)
{
int
fd
;
int
fd
;
struct
sockaddr_un
addr
;
struct
sockaddr_un
addr
;
...
@@ -75,6 +79,8 @@ jint Java_com_github_shadowsocks_system_sendfd(JNIEnv *env, jobject thiz, jint t
...
@@ -75,6 +79,8 @@ jint Java_com_github_shadowsocks_system_sendfd(JNIEnv *env, jobject thiz, jint t
static
const
char
*
classPathName
=
"com/github/shadowsocks/System"
;
static
const
char
*
classPathName
=
"com/github/shadowsocks/System"
;
static
JNINativeMethod
method_table
[]
=
{
static
JNINativeMethod
method_table
[]
=
{
{
"jniclose"
,
"(I)V"
,
(
void
*
)
Java_com_github_shadowsocks_system_jniclose
},
{
"sendfd"
,
"(I)I"
,
{
"sendfd"
,
"(I)I"
,
(
void
*
)
Java_com_github_shadowsocks_system_sendfd
},
(
void
*
)
Java_com_github_shadowsocks_system_sendfd
},
{
"exec"
,
"(Ljava/lang/String;)V"
,
{
"exec"
,
"(Ljava/lang/String;)V"
,
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
8d02a1a6
This diff is collapsed.
Click to expand it.
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
0 → 100644
View file @
8d02a1a6
/*
* Shadowsocks - A shadowsocks client for Android
* Copyright (C) 2015 <max.c.lv@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*
* ___====-_ _-====___
* _--^^^#####// \\#####^^^--_
* _-^##########// ( ) \\##########^-_
* -############// |\^^/| \\############-
* _/############// (@::@) \\############\_
* /#############(( \\// ))#############\
* -###############\\ (oo) //###############-
* -#################\\ / VV \ //#################-
* -###################\\/ \//###################-
* _#/|##########/\######( /\ )######/\##########|\#_
* |/ |#/\#/\#/\/ \#/\##\ | | /##/\#/ \/\#/\#/\#| \|
* ` |/ V V ` V \#\| | | |/#/ V ' V V \| '
* ` ` ` ` / | | | | \ ' ' ' '
* ( | | | | )
* __\ | | | | /__
* (vvv(VVV)(VVV)vvv)
*
* HERE BE DRAGONS
*
*/
package
com.github.shadowsocks
import
java.io.
{
File
,
FileDescriptor
,
IOException
}
import
java.util.concurrent.Executors
import
android.net.
{
LocalServerSocket
,
LocalSocket
,
LocalSocketAddress
}
import
android.util.Log
class
ShadowsocksVpnThread
(
vpnService
:
ShadowsocksVpnService
)
extends
Thread
{
val
TAG
=
"ShadowsocksVpnService"
val
PATH
=
"/data/data/com.github.shadowsocks/protect_path"
var
isRunning
:
Boolean
=
true
var
serverSocket
:
LocalServerSocket
=
null
def
stopThread
()
{
isRunning
=
false
if
(
serverSocket
!=
null
)
{
serverSocket
.
close
()
serverSocket
=
null
}
}
override
def
run
()
:
Unit
=
{
try
{
new
File
(
PATH
).
delete
()
}
catch
{
case
_:
Exception
=>
// ignore
}
try
{
val
localSocket
=
new
LocalSocket
localSocket
.
bind
(
new
LocalSocketAddress
(
PATH
,
LocalSocketAddress
.
Namespace
.
FILESYSTEM
))
serverSocket
=
new
LocalServerSocket
(
localSocket
.
getFileDescriptor
)
}
catch
{
case
e
:
IOException
=>
Log
.
e
(
TAG
,
"unable to bind"
,
e
)
vpnService
.
stopBackgroundService
()
return
}
val
pool
=
Executors
.
newFixedThreadPool
(
4
)
while
(
isRunning
)
{
try
{
val
socket
=
serverSocket
.
accept
()
pool
.
execute
(
new
Runnable
{
override
def
run
()
{
try
{
val
input
=
socket
.
getInputStream
val
output
=
socket
.
getOutputStream
input
.
read
()
val
fds
=
socket
.
getAncillaryFileDescriptors
if
(
fds
.
length
>
0
)
{
var
ret
=
false
val
getInt
=
classOf
[
FileDescriptor
].
getDeclaredMethod
(
"getInt$"
)
val
fd
=
getInt
.
invoke
(
fds
(
0
)).
asInstanceOf
[
Int
]
ret
=
vpnService
.
protect
(
fd
)
// Trick to close file decriptor
System
.
jniclose
(
fd
)
if
(
ret
)
{
output
.
write
(
0
)
}
else
{
output
.
write
(
1
)
}
input
.
close
()
output
.
close
()
}
}
catch
{
case
e
:
Exception
=>
Log
.
e
(
TAG
,
"Error when protect socket"
,
e
)
}
// close socket
try
{
socket
.
close
()
}
catch
{
case
_:
Exception
=>
// ignore
}
}})
}
catch
{
case
e
:
IOException
=>
Log
.
e
(
TAG
,
"Error when accept socket"
,
e
)
}
}
}
}
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