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
2cb1eb27
Commit
2cb1eb27
authored
Feb 27, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add upd dns mode
parent
a029f276
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
65 additions
and
29 deletions
+65
-29
build-ndk.sh
build-ndk.sh
+1
-1
project/Build.scala
project/Build.scala
+2
-2
src/main/assets/pages/about.html
src/main/assets/pages/about.html
+1
-1
src/main/jni/Android.mk
src/main/jni/Android.mk
+23
-2
src/main/jni/shadowsocks
src/main/jni/shadowsocks
+1
-1
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+6
-3
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+16
-10
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+15
-9
No files found.
build-ndk.sh
View file @
2cb1eb27
...
@@ -5,7 +5,7 @@ ndk-build
...
@@ -5,7 +5,7 @@ ndk-build
mkdir
-p
assets/armeabi
mkdir
-p
assets/armeabi
mkdir
-p
assets/armeabi-v7a
mkdir
-p
assets/armeabi-v7a
mkdir
-p
assets/x86
mkdir
-p
assets/x86
for
app
in
iptables pdnsd redsocks s
hadowsocks
tun2socks
for
app
in
iptables pdnsd redsocks s
s-local ss-tunnel
tun2socks
do
do
mv
libs/armeabi/
$app
assets/armeabi/
mv
libs/armeabi/
$app
assets/armeabi/
mv
libs/armeabi-v7a/
$app
assets/armeabi-v7a/
mv
libs/armeabi-v7a/
$app
assets/armeabi-v7a/
...
...
project/Build.scala
View file @
2cb1eb27
...
@@ -5,8 +5,8 @@ import sbtandroid._
...
@@ -5,8 +5,8 @@ import sbtandroid._
import
sbtandroid.AndroidPlugin._
import
sbtandroid.AndroidPlugin._
object
App
{
object
App
{
val
version
=
"2.1.
1
"
val
version
=
"2.1.
2
"
val
versionCode
=
6
2
val
versionCode
=
6
3
}
}
object
General
{
object
General
{
...
...
src/main/assets/pages/about.html
View file @
2cb1eb27
...
@@ -274,7 +274,7 @@ img {
...
@@ -274,7 +274,7 @@ img {
</head>
</head>
<body>
<body>
<p>
A
<a
href=
"http://shadowsocks.org"
>
Shadowsocks
</a>
client for Android, written in Scala.
</p>
<p>
A
<a
href=
"http://shadowsocks.org"
>
Shadowsocks
</a>
client for Android, written in Scala.
</p>
<p>
Copyright (C) 201
3
Max Lv
<a
href=
"mailto:max.c.lv@gmail.com"
>
max
.
c.l
v
@gmail.com
</a></p>
<p>
Copyright (C) 201
4
Max Lv
<a
href=
"mailto:max.c.lv@gmail.com"
>
max
.
c.l
v
@gmail.com
</a></p>
<p>
This program is free software: you can redistribute it and/or modify
<p>
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
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
the Free Software Foundation, either version 3 of the License, or
...
...
src/main/jni/Android.mk
View file @
2cb1eb27
...
@@ -89,14 +89,14 @@ LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
...
@@ -89,14 +89,14 @@ LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
include
$(BUILD_EXECUTABLE)
include
$(BUILD_EXECUTABLE)
########################################################
########################################################
## shadowsocks
## shadowsocks
local
########################################################
########################################################
include
$(CLEAR_VARS)
include
$(CLEAR_VARS)
SHADOWSOCKS_SOURCES
:=
local.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
SHADOWSOCKS_SOURCES
:=
local.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
LOCAL_MODULE
:=
s
hadowsocks
LOCAL_MODULE
:=
s
s-local
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks/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
\
...
@@ -109,6 +109,27 @@ LOCAL_LDLIBS := -llog
...
@@ -109,6 +109,27 @@ LOCAL_LDLIBS := -llog
include
$(BUILD_EXECUTABLE)
include
$(BUILD_EXECUTABLE)
########################################################
## shadowsocks tunnel
########################################################
include
$(CLEAR_VARS)
SHADOWSOCKS_SOURCES
:=
tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
LOCAL_MODULE
:=
ss-tunnel
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
-DUDPRELAY_TUNNEL
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
\
-I
$(LOCAL_PATH)
/libev/
\
-I
$(LOCAL_PATH)
/openssl/include
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto
LOCAL_LDLIBS
:=
-llog
include
$(BUILD_EXECUTABLE)
########################################################
########################################################
## termExec
## termExec
########################################################
########################################################
...
...
shadowsocks
@
b2df5a4c
Subproject commit
69f8bd61c096337abb34a9e64534865d08022957
Subproject commit
b2df5a4c26d293469237fd89153e16f1fa47000c
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
2cb1eb27
...
@@ -417,10 +417,12 @@ class Shadowsocks
...
@@ -417,10 +417,12 @@ class Shadowsocks
val
sb
=
new
StringBuilder
val
sb
=
new
StringBuilder
sb
.
append
(
"kill -9 `cat /data/data/com.github.shadowsocks/pdnsd.pid`"
).
append
(
"\n"
)
sb
.
append
(
"kill -9 `cat /data/data/com.github.shadowsocks/pdnsd.pid`"
).
append
(
"\n"
)
sb
.
append
(
"kill -9 `cat /data/data/com.github.shadowsocks/shadowsocks.pid`"
).
append
(
"\n"
)
sb
.
append
(
"kill -9 `cat /data/data/com.github.shadowsocks/ss-local.pid`"
).
append
(
"\n"
)
sb
.
append
(
"kill -9 `cat /data/data/com.github.shadowsocks/ss-tunnel.pid`"
).
append
(
"\n"
)
sb
.
append
(
"kill -9 `cat /data/data/com.github.shadowsocks/tun2socks.pid`"
).
append
(
"\n"
)
sb
.
append
(
"kill -9 `cat /data/data/com.github.shadowsocks/tun2socks.pid`"
).
append
(
"\n"
)
sb
.
append
(
"killall -9 pdnsd"
).
append
(
"\n"
)
sb
.
append
(
"killall -9 pdnsd"
).
append
(
"\n"
)
sb
.
append
(
"killall -9 shadowsocks"
).
append
(
"\n"
)
sb
.
append
(
"killall -9 ss-local"
).
append
(
"\n"
)
sb
.
append
(
"killall -9 ss-tunnel"
).
append
(
"\n"
)
sb
.
append
(
"killall -9 tun2socks"
).
append
(
"\n"
)
sb
.
append
(
"killall -9 tun2socks"
).
append
(
"\n"
)
sb
.
append
(
"rm /data/data/com.github.shadowsocks/pdnsd.conf"
).
append
(
"\n"
)
sb
.
append
(
"rm /data/data/com.github.shadowsocks/pdnsd.conf"
).
append
(
"\n"
)
sb
.
append
(
"rm /data/data/com.github.shadowsocks/pdnsd.cache"
).
append
(
"\n"
)
sb
.
append
(
"rm /data/data/com.github.shadowsocks/pdnsd.cache"
).
append
(
"\n"
)
...
@@ -908,7 +910,8 @@ class Shadowsocks
...
@@ -908,7 +910,8 @@ class Shadowsocks
Utils
.
runCommand
(
"chmod 755 /data/data/com.github.shadowsocks/iptables\n"
Utils
.
runCommand
(
"chmod 755 /data/data/com.github.shadowsocks/iptables\n"
+
"chmod 755 /data/data/com.github.shadowsocks/redsocks\n"
+
"chmod 755 /data/data/com.github.shadowsocks/redsocks\n"
+
"chmod 755 /data/data/com.github.shadowsocks/pdnsd\n"
+
"chmod 755 /data/data/com.github.shadowsocks/pdnsd\n"
+
"chmod 755 /data/data/com.github.shadowsocks/shadowsocks\n"
+
"chmod 755 /data/data/com.github.shadowsocks/ss-local\n"
+
"chmod 755 /data/data/com.github.shadowsocks/ss-tunnel\n"
+
"chmod 755 /data/data/com.github.shadowsocks/tun2socks\n"
)
+
"chmod 755 /data/data/com.github.shadowsocks/tun2socks\n"
)
}
}
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
2cb1eb27
...
@@ -102,20 +102,24 @@ class ShadowsocksNatService extends Service with BaseService {
...
@@ -102,20 +102,24 @@ class ShadowsocksNatService extends Service with BaseService {
val
handler
:
Handler
=
new
Handler
()
val
handler
:
Handler
=
new
Handler
()
def
startShadowsocksDaemon
()
{
def
startShadowsocksDaemon
()
{
val
cmd
:
String
=
(
Path
.
BASE
+
val
cmd
=
(
Path
.
BASE
+
"s
hadowsocks
-b 127.0.0.1 -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f "
+
"s
s-local
-b 127.0.0.1 -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f "
+
Path
.
BASE
+
"s
hadowsocks
.pid"
)
Path
.
BASE
+
"s
s-local
.pid"
)
.
format
(
config
.
proxy
,
config
.
remotePort
,
config
.
localPort
,
config
.
sitekey
,
config
.
encMethod
)
.
format
(
config
.
proxy
,
config
.
remotePort
,
config
.
localPort
,
config
.
sitekey
,
config
.
encMethod
)
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
)
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
)
Utils
.
runCommand
(
cmd
)
Utils
.
runCommand
(
cmd
)
}
}
def
startDnsDaemon
()
{
def
startDnsDaemon
()
{
val
cmd
:
String
=
Path
.
BASE
+
"pdnsd -c "
+
Path
.
BASE
+
"pdnsd.conf"
val
cmd
=
(
Path
.
BASE
+
val
conf
:
String
=
ConfigUtils
.
PDNSD
.
format
(
"127.0.0.1"
)
"ss-tunnel -b 127.0.0.1 -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -L 8.8.8.8:53 -u -f "
+
ConfigUtils
.
printToFile
(
new
File
(
Path
.
BASE
+
"pdnsd.conf"
))(
p
=>
{
Path
.
BASE
+
"ss-local.pid"
)
p
.
println
(
conf
)
.
format
(
config
.
proxy
,
config
.
remotePort
,
8153
,
config
.
sitekey
,
config
.
encMethod
)
})
// val cmd = Path.BASE + "pdnsd -c " + Path.BASE + "pdnsd.conf"
// val conf = ConfigUtils.PDNSD.format("127.0.0.1")
// ConfigUtils.printToFile(new File(Path.BASE + "pdnsd.conf"))(p => {
// p.println(conf)
// })
Utils
.
runCommand
(
cmd
)
Utils
.
runCommand
(
cmd
)
}
}
...
@@ -271,8 +275,10 @@ class ShadowsocksNatService extends Service with BaseService {
...
@@ -271,8 +275,10 @@ class ShadowsocksNatService extends Service with BaseService {
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"pdnsd.pid`"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"pdnsd.pid`"
++=
"\n"
sb
++=
"killall -9 pdnsd"
++=
"\n"
sb
++=
"killall -9 pdnsd"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"shadowsocks.pid`"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"ss-local.pid`"
++=
"\n"
sb
++=
"killall -9 shadowsocks"
++=
"\n"
sb
++=
"killall -9 ss-local"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"ss-tunnel.pid`"
++=
"\n"
sb
++=
"killall -9 ss-tunnel"
++=
"\n"
Utils
.
runCommand
(
sb
.
toString
())
Utils
.
runCommand
(
sb
.
toString
())
}
}
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
2cb1eb27
...
@@ -84,11 +84,15 @@ class ShadowsocksVpnService extends VpnService with BaseService {
...
@@ -84,11 +84,15 @@ class ShadowsocksVpnService extends VpnService with BaseService {
}
}
def
startDnsDaemon
()
{
def
startDnsDaemon
()
{
val
cmd
:
String
=
Path
.
BASE
+
"pdnsd -c "
+
Path
.
BASE
+
"pdnsd.conf"
val
cmd
=
(
Path
.
BASE
+
val
conf
:
String
=
ConfigUtils
.
PDNSD
.
format
(
"0.0.0.0"
)
"ss-tunnel -b 127.0.0.1 -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -L 8.8.8.8:53 -u -f "
+
ConfigUtils
.
printToFile
(
new
File
(
Path
.
BASE
+
"pdnsd.conf"
))(
p
=>
{
Path
.
BASE
+
"ss-local.pid"
)
p
.
println
(
conf
)
.
format
(
config
.
proxy
,
config
.
remotePort
,
8153
,
config
.
sitekey
,
config
.
encMethod
)
})
// val cmd: String = Path.BASE + "pdnsd -c " + Path.BASE + "pdnsd.conf"
// val conf: String = ConfigUtils.PDNSD.format("0.0.0.0")
// ConfigUtils.printToFile(new File(Path.BASE + "pdnsd.conf"))(p => {
// p.println(conf)
// })
Utils
.
runCommand
(
cmd
)
Utils
.
runCommand
(
cmd
)
}
}
...
@@ -243,12 +247,14 @@ class ShadowsocksVpnService extends VpnService with BaseService {
...
@@ -243,12 +247,14 @@ class ShadowsocksVpnService extends VpnService with BaseService {
def
killProcesses
()
{
def
killProcesses
()
{
val
sb
=
new
StringBuilder
val
sb
=
new
StringBuilder
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"shadowsocks.pid`"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"ss-local.pid`"
++=
"\n"
sb
++=
"killall -9 shadowsocks"
++=
"\n"
sb
++=
"killall -9 ss-local"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"ss-tunnel.pid`"
++=
"\n"
sb
++=
"killall -9 ss-tunnel"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"tun2socks.pid`"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"tun2socks.pid`"
++=
"\n"
sb
++=
"killall -9 tun2socks"
++=
"\n"
sb
++=
"killall -9 tun2socks"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"pdnsd.pid`"
++=
"\n"
//
sb ++= "kill -9 `cat " ++= Path.BASE ++= "pdnsd.pid`" ++= "\n"
sb
++=
"killall -9 pdnsd"
++=
"\n"
//
sb ++= "killall -9 pdnsd" ++= "\n"
Utils
.
runCommand
(
sb
.
toString
())
Utils
.
runCommand
(
sb
.
toString
())
}
}
...
...
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