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
dd6cd397
Commit
dd6cd397
authored
Aug 13, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #806 #804
parent
a671ae98
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
kcptun/go
kcptun/go
+1
-1
kcptun/make.bash
kcptun/make.bash
+2
-2
src/main/jni/shadowsocks-libev
src/main/jni/shadowsocks-libev
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+1
-1
No files found.
go
@
70f0438d
Subproject commit
31cf00a881a9535d2e1282caf92542b9c31b0e7d
Subproject commit
70f0438db89066e5ed9fdd78f6e99d40f4a76ab3
kcptun/make.bash
View file @
dd6cd397
...
@@ -55,12 +55,12 @@ go get -u github.com/xtaci/kcp-go
...
@@ -55,12 +55,12 @@ go get -u github.com/xtaci/kcp-go
go get
go get
echo
"Cross compile kcptun for arm"
echo
"Cross compile kcptun for arm"
try
env
CGO_ENABLED
=
1
CC
=
$ANDROID_ARM_CC
GOOS
=
android
GOARCH
=
arm
GOARM
=
7 go build
try
env
CGO_ENABLED
=
1
CC
=
$ANDROID_ARM_CC
GOOS
=
android
GOARCH
=
arm
GOARM
=
7 go build
-ldflags
=
"-s -w"
try
$ANDROID_ARM_STRIP
client
try
$ANDROID_ARM_STRIP
client
try
mv
client
$DIR
/../src/main/assets/armeabi-v7a/kcptun
try
mv
client
$DIR
/../src/main/assets/armeabi-v7a/kcptun
echo
"Cross compile kcptun for x86"
echo
"Cross compile kcptun for x86"
try
env
CGO_ENABLED
=
1
CC
=
$ANDROID_X86_CC
GOOS
=
android
GOARCH
=
386 go build
try
env
CGO_ENABLED
=
1
CC
=
$ANDROID_X86_CC
GOOS
=
android
GOARCH
=
386 go build
-ldflags
=
"-s -w"
try
$ANDROID_X86_STRIP
client
try
$ANDROID_X86_STRIP
client
try
mv
client
$DIR
/../src/main/assets/x86/kcptun
try
mv
client
$DIR
/../src/main/assets/x86/kcptun
popd
popd
...
...
shadowsocks-libev
@
d31210c2
Subproject commit
8f72416f0f487adab36598678576ab288bfc4f84
Subproject commit
d31210c21731ba9b055faccdc26c77b10773fe67
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
dd6cd397
...
@@ -122,7 +122,7 @@ class ShadowsocksNatService extends BaseService {
...
@@ -122,7 +122,7 @@ class ShadowsocksNatService extends BaseService {
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/kcptun"
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/kcptun"
,
"-r"
,
profile
.
host
+
":"
+
profile
.
kcpPort
,
"-r"
,
profile
.
host
+
":"
+
profile
.
kcpPort
,
"-l"
,
"127.0.0.1:"
+
(
profile
.
localPort
+
90
)
,
"-l"
,
"127.0.0.1:"
+
(
profile
.
localPort
+
90
)
,
profile
.
kcpcli
.
trim
)
,
profile
.
kcpcli
.
trim
.
replaceAll
(
"[\"']"
,
""
)
)
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
.
mkString
(
" "
))
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
.
mkString
(
" "
))
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
dd6cd397
...
@@ -211,7 +211,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
...
@@ -211,7 +211,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
,
"-r"
,
profile
.
host
+
":"
+
profile
.
kcpPort
,
"-r"
,
profile
.
host
+
":"
+
profile
.
kcpPort
,
"-l"
,
"127.0.0.1:"
+
(
profile
.
localPort
+
90
)
,
"-l"
,
"127.0.0.1:"
+
(
profile
.
localPort
+
90
)
,
"--path"
,
getApplicationInfo
.
dataDir
+
"/protect_path"
,
"--path"
,
getApplicationInfo
.
dataDir
+
"/protect_path"
,
profile
.
kcpcli
.
trim
)
,
profile
.
kcpcli
.
trim
.
replaceAll
(
"[\"']"
,
""
)
)
if
(
BuildConfig
.
DEBUG
)
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
.
mkString
(
" "
))
Log
.
d
(
TAG
,
cmd
.
mkString
(
" "
))
...
...
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