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
4f0e527d
Commit
4f0e527d
authored
Feb 24, 2017
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace PDNSD with overture
parent
a8878298
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
173 additions
and
149 deletions
+173
-149
.gitmodules
.gitmodules
+0
-4
mobile/build.sbt
mobile/build.sbt
+2
-2
mobile/src/main/assets/overture/hosts
mobile/src/main/assets/overture/hosts
+1
-0
mobile/src/main/jni/Android.mk
mobile/src/main/jni/Android.mk
+0
-17
mobile/src/main/jni/pdnsd
mobile/src/main/jni/pdnsd
+0
-1
mobile/src/main/scala/com/github/shadowsocks/BaseService.scala
...e/src/main/scala/com/github/shadowsocks/BaseService.scala
+13
-0
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+36
-17
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+36
-34
mobile/src/main/scala/com/github/shadowsocks/utils/Constants.scala
...c/main/scala/com/github/shadowsocks/utils/Constants.scala
+85
-74
No files found.
.gitmodules
View file @
4f0e527d
...
...
@@ -17,10 +17,6 @@
path = mobile/src/main/jni/redsocks
url = https://github.com/shadowsocks/redsocks.git
branch = shadowsocks-android
[submodule "mobile/src/main/jni/pdnsd"]
path = mobile/src/main/jni/pdnsd
url = https://github.com/shadowsocks/pdnsd.git
branch = shadowsocks-android
[submodule "mobile/src/main/jni/mbedtls"]
path = mobile/src/main/jni/mbedtls
url = https://github.com/ARMmbed/mbedtls
...
...
mobile/build.sbt
View file @
4f0e527d
...
...
@@ -2,8 +2,8 @@ enablePlugins(AndroidApp)
android
.
useSupportVectors
name
:=
"shadowsocks"
version
:=
"4.
0.4
"
versionCode
:=
Some
(
1
79
)
version
:=
"4.
1.0-SNAPSHOT
"
versionCode
:=
Some
(
1
80
)
proguardOptions
++=
"-keep class com.github.shadowsocks.JniHelper { *; }"
::
...
...
mobile/src/main/assets/overture/hosts
0 → 100644
View file @
4f0e527d
127.0.0.1 localhost
mobile/src/main/jni/Android.mk
View file @
4f0e527d
...
...
@@ -239,23 +239,6 @@ LOCAL_CFLAGS := -O2 -std=gnu99 -DUSE_IPTABLES \
include
$(BUILD_SHARED_EXECUTABLE)
########################################################
## pdnsd
########################################################
include
$(CLEAR_VARS)
PDNSD_SOURCES
:=
$(
wildcard
$(LOCAL_PATH)
/pdnsd/src/
*
.c
)
LOCAL_MODULE
:=
pdnsd
LOCAL_SRC_FILES
:=
$
(
PDNSD_SOURCES:
$(LOCAL_PATH)
/%
=
%
)
LOCAL_CFLAGS
:=
-DANDROID
-Wall
-O2
-I
$(LOCAL_PATH)
/pdnsd
\
-I
$(LOCAL_PATH)
/include/pdnsd
-I
$(LOCAL_PATH)
/libancillary
LOCAL_STATIC_LIBRARIES
:=
libancillary
LOCAL_LDLIBS
:=
-llog
include
$(BUILD_SHARED_EXECUTABLE)
########################################################
## shadowsocks-libev local
########################################################
...
...
pdnsd
@
f6b0a56c
Subproject commit f6b0a56c74ff33e3df4c00859bc7ccefa1354fa4
mobile/src/main/scala/com/github/shadowsocks/BaseService.scala
View file @
4f0e527d
...
...
@@ -123,6 +123,19 @@ trait BaseService extends Service {
false
}
else
true
def
getExternalIp
()
{
val
url
=
"http://icanhazip.com"
val
client
=
new
OkHttpClient
.
Builder
()
.
connectTimeout
(
10
,
TimeUnit
.
SECONDS
)
.
writeTimeout
(
10
,
TimeUnit
.
SECONDS
)
.
readTimeout
(
30
,
TimeUnit
.
SECONDS
)
.
build
()
val
request
=
new
Request
.
Builder
()
.
url
(
url
)
.
build
()
client
.
newCall
(
request
).
execute
().
body
.
string
}
def
connect
()
{
if
(
profile
.
host
==
"198.199.101.152"
)
{
val
holder
=
app
.
containerHolder
...
...
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
4f0e527d
...
...
@@ -49,7 +49,7 @@ class ShadowsocksNatService extends BaseService {
var
sslocalProcess
:
GuardedProcess
=
_
var
sstunnelProcess
:
GuardedProcess
=
_
var
redsocksProcess
:
GuardedProcess
=
_
var
pdnsd
Process
:
GuardedProcess
=
_
var
overture
Process
:
GuardedProcess
=
_
var
su
:
Shell.Interactive
=
_
def
startShadowsocksDaemon
()
{
...
...
@@ -83,21 +83,38 @@ class ShadowsocksNatService extends BaseService {
}
def
startDnsDaemon
()
{
val
reject
=
if
(
profile
.
ipv6
)
"224.0.0.0/3"
else
"224.0.0.0/3, ::/0"
IOUtils
.
writeString
(
new
File
(
getFilesDir
,
"
pdnsd
-nat.conf"
),
profile
.
route
match
{
val
externalIp
=
getExternalIp
()
IOUtils
.
writeString
(
new
File
(
getFilesDir
,
"
overture
-nat.conf"
),
profile
.
route
match
{
case
Acl
.
BYPASS_CHN
|
Acl
.
BYPASS_LAN_CHN
|
Acl
.
GFWLIST
|
Acl
.
CUSTOM_RULES
=>
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
""
,
getCacheDir
.
getAbsolutePath
,
"127.0.0.1"
,
profile
.
localPort
+
53
,
"114.114.114.114, 223.5.5.5, 1.2.4.8"
,
getBlackList
,
reject
,
profile
.
localPort
+
63
,
reject
)
ConfigUtils
.
OVERTURE_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
profile
.
localPort
+
53
,
// Local Port
"119.29.29.29"
,
// Primary DNS 1
"tcp"
,
// DNS type of Primary DNS 1
"114.114.114.114"
,
// Primary DNS 2
"tcp"
,
// DNS type of Primary DNS 2
profile
.
remoteDns
,
// Alternative DNS
"127.0.0.1:"
+
profile
.
localPort
,
// Local SOCKS5 Proxy
externalIp
)
// External IP
case
Acl
.
CHINALIST
=>
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
""
,
getCacheDir
.
getAbsolutePath
,
"127.0.0.1"
,
profile
.
localPort
+
53
,
"8.8.8.8, 8.8.4.4, 208.67.222.222"
,
""
,
reject
,
profile
.
localPort
+
63
,
reject
)
ConfigUtils
.
OVERTURE_LOCAL
.
formatLocal
(
Locale
.
ENGLISH
,
profile
.
localPort
+
53
,
// Local Port
"119.29.29.29"
,
// Primary DNS
"127.0.0.1:"
+
profile
.
localPort
,
// Local SOCKS5 Proxy
externalIp
,
// External IP
"114.114.114.114"
,
// Alternative DNS
"127.0.0.1:"
+
profile
.
localPort
,
// Local SOCKS5 Proxy
externalIp
)
// External IP
case
_
=>
ConfigUtils
.
PDNSD_LOCAL
.
formatLocal
(
Locale
.
ENGLISH
,
""
,
getCacheDir
.
getAbsolutePath
,
"127.0.0.1"
,
profile
.
localPort
+
53
,
profile
.
localPort
+
63
,
reject
)
ConfigUtils
.
OVERTURE_LOCAL
.
formatLocal
(
Locale
.
ENGLISH
,
profile
.
localPort
+
53
,
// Local Port
profile
.
remoteDns
,
// Primary DNS
"127.0.0.1:"
+
profile
.
localPort
,
// Local SOCKS5 Proxy
externalIp
,
// External IP
"208.67.222.222"
,
// Alternative DNS
"127.0.0.1:"
+
profile
.
localPort
,
// Local SOCKS5 Proxy
externalIp
)
// External IP
})
pdnsdProcess
=
new
GuardedProcess
(
getApplicationInfo
.
nativeLibraryDir
+
"/libpdnsd.so"
,
"-c"
,
"pdnsd
-nat.conf"
)
overtureProcess
=
new
GuardedProcess
(
getApplicationInfo
.
nativeLibraryDir
+
"/liboverture.so"
,
"-c"
,
"overture
-nat.conf"
)
.
start
()
}
...
...
@@ -111,11 +128,13 @@ class ShadowsocksNatService extends BaseService {
/** Called when the activity is first created. */
def
handleConnection
()
{
startDNSTunnel
()
startRedsocksDaemon
()
startShadowsocksDaemon
()
if
(!
profile
.
udpdns
)
startDnsDaemon
()
if
(!
profile
.
udpdns
)
startDnsDaemon
()
else
startDNSTunnel
()
setupIptables
()
...
...
@@ -143,9 +162,9 @@ class ShadowsocksNatService extends BaseService {
redsocksProcess
.
destroy
()
redsocksProcess
=
null
}
if
(
pdnsd
Process
!=
null
)
{
pdnsd
Process
.
destroy
()
pdnsd
Process
=
null
if
(
overture
Process
!=
null
)
{
overture
Process
.
destroy
()
overture
Process
=
null
}
su
.
addCommand
(
"iptables -t nat -F OUTPUT"
)
...
...
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
4f0e527d
...
...
@@ -45,8 +45,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
private
var
notification
:
ShadowsocksNotification
=
_
var
sslocalProcess
:
GuardedProcess
=
_
var
sstunnelProcess
:
GuardedProcess
=
_
var
pdnsdProcess
:
GuardedProcess
=
_
var
overtureProcess
:
GuardedProcess
=
_
var
tun2socksProcess
:
GuardedProcess
=
_
override
def
onBind
(
intent
:
Intent
)
:
IBinder
=
{
...
...
@@ -94,17 +93,13 @@ class ShadowsocksVpnService extends VpnService with BaseService {
sslocalProcess
.
destroy
()
sslocalProcess
=
null
}
if
(
sstunnelProcess
!=
null
)
{
sstunnelProcess
.
destroy
()
sstunnelProcess
=
null
}
if
(
tun2socksProcess
!=
null
)
{
tun2socksProcess
.
destroy
()
tun2socksProcess
=
null
}
if
(
pdnsd
Process
!=
null
)
{
pdnsd
Process
.
destroy
()
pdnsd
Process
=
null
if
(
overture
Process
!=
null
)
{
overture
Process
.
destroy
()
overture
Process
=
null
}
}
...
...
@@ -149,15 +144,14 @@ class ShadowsocksVpnService extends VpnService with BaseService {
/** Called when the activity is first created. */
def
handleConnection
()
{
val
fd
=
startVpn
()
if
(!
sendFd
(
fd
))
throw
new
Exception
(
"sendFd failed"
)
startShadowsocksDaemon
()
if
(!
profile
.
udpdns
)
{
startDnsDaemon
()
startDnsTunnel
()
}
val
fd
=
startVpn
()
if
(!
sendFd
(
fd
))
throw
new
Exception
(
"sendFd failed"
)
}
override
protected
def
buildPluginCommandLine
()
:
ArrayBuffer
[
String
]
=
super
.
buildPluginCommandLine
()
+=
"-V"
...
...
@@ -182,33 +176,41 @@ class ShadowsocksVpnService extends VpnService with BaseService {
sslocalProcess
=
new
GuardedProcess
(
cmd
:
_
*
).
start
()
}
def
startDnsTunnel
()
:
Unit
=
sstunnelProcess
=
new
GuardedProcess
(
getApplicationInfo
.
nativeLibraryDir
+
"/libss-tunnel.so"
,
"-V"
,
"-t"
,
"10"
,
"-b"
,
"127.0.0.1"
,
"-l"
,
(
profile
.
localPort
+
63
).
toString
,
"-L"
,
profile
.
remoteDns
.
trim
+
":53"
,
"-c"
,
buildShadowsocksConfig
(
"ss-tunnel-vpn.conf"
)).
start
()
def
startDnsDaemon
()
{
val
reject
=
if
(
profile
.
ipv6
)
"224.0.0.0/3"
else
"224.0.0.0/3, ::/0"
IOUtils
.
writeString
(
new
File
(
getFilesDir
,
"
pdnsd
-vpn.conf"
),
profile
.
route
match
{
val
externalIp
=
getExternalIp
()
IOUtils
.
writeString
(
new
File
(
getFilesDir
,
"
overture
-vpn.conf"
),
profile
.
route
match
{
case
Acl
.
BYPASS_CHN
|
Acl
.
BYPASS_LAN_CHN
|
Acl
.
GFWLIST
|
Acl
.
CUSTOM_RULES
=>
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
"protect = \"protect_path\";"
,
getCacheDir
.
getAbsolutePath
,
"0.0.0.0"
,
profile
.
localPort
+
53
,
"114.114.114.114, 223.5.5.5, 1.2.4.8"
,
getBlackList
,
reject
,
profile
.
localPort
+
63
,
reject
)
ConfigUtils
.
OVERTURE_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
profile
.
localPort
+
53
,
// Local Port
"119.29.29.29"
,
// Primary DNS 1
"udp"
,
// DNS type of Primary DNS 1
"114.114.114.114"
,
// Primary DNS 2
"udp"
,
// DNS type of Primary DNS 2
"208.67.222.222"
,
// Alternative DNS
"127.0.0.1:"
+
profile
.
localPort
,
// Local SOCKS5 Proxy
externalIp
)
// External IP
case
Acl
.
CHINALIST
=>
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
"protect = \"protect_path\";"
,
getCacheDir
.
getAbsolutePath
,
"0.0.0.0"
,
profile
.
localPort
+
53
,
"8.8.8.8, 8.8.4.4, 208.67.222.222"
,
""
,
reject
,
profile
.
localPort
+
63
,
reject
)
ConfigUtils
.
OVERTURE_LOCAL
.
formatLocal
(
Locale
.
ENGLISH
,
profile
.
localPort
+
53
,
// Local Port
"119.29.29.29"
,
// Primary DNS
"127.0.0.1:"
+
profile
.
localPort
,
// Local SOCKS5 Proxy
externalIp
,
// External IP
"114.114.114.114"
,
// Alternative DNS
"127.0.0.1:"
+
profile
.
localPort
,
// Local SOCKS5 Proxy
externalIp
)
// External IP
case
_
=>
ConfigUtils
.
PDNSD_LOCAL
.
formatLocal
(
Locale
.
ENGLISH
,
"protect = \"protect_path\";"
,
getCacheDir
.
getAbsolutePath
,
"0.0.0.0"
,
profile
.
localPort
+
53
,
profile
.
localPort
+
63
,
reject
)
ConfigUtils
.
OVERTURE_LOCAL
.
formatLocal
(
Locale
.
ENGLISH
,
profile
.
localPort
+
53
,
// Local Port
profile
.
remoteDns
,
// Primary DNS
"127.0.0.1:"
+
profile
.
localPort
,
// Local SOCKS5 Proxy
externalIp
,
// External IP
"208.67.222.222"
,
// Alternative DNS
"127.0.0.1:"
+
profile
.
localPort
,
// Local SOCKS5 Proxy
externalIp
)
// External IP
})
val
cmd
=
Array
(
getApplicationInfo
.
nativeLibraryDir
+
"/lib
pdnsd.so"
,
"-c"
,
"pdnsd-vpn.conf
"
)
val
cmd
=
Array
(
getApplicationInfo
.
nativeLibraryDir
+
"/lib
overture.so"
,
"-c"
,
"overture-vpn.conf"
,
"-V
"
)
pdnsd
Process
=
new
GuardedProcess
(
cmd
:
_
*
).
start
()
overture
Process
=
new
GuardedProcess
(
cmd
:
_
*
).
start
()
}
def
startVpn
()
:
Int
=
{
...
...
mobile/src/main/scala/com/github/shadowsocks/utils/Constants.scala
View file @
4f0e527d
...
...
@@ -46,84 +46,95 @@ object ConfigUtils {
" type = socks5;\n"
+
"}\n"
val
PDNSD_LOCAL
=
val
OVERTURE_DIRECT
=
"""
|global {
| perm_cache = 2048;
| %s
| cache_dir = "%s";
| server_ip = %s;
| server_port = %d;
| query_method = tcp_only;
| min_ttl = 15m;
| max_ttl = 1w;
| timeout = 10;
| daemon = off;
|}
|
|server {
| label = "local";
| ip = 127.0.0.1;
| port = %d;
| reject = %s;
| reject_policy = negate;
| reject_recursively = on;
|}
|
|rr {
| name=localhost;
| reverse=on;
| a=127.0.0.1;
| owner=localhost;
| soa=localhost,root.localhost,42,86400,900,86400,86400;
|}
|{
| "BindAddress": ":%d",
| "PrimaryDNS": [
| {
| "Name": "Primary-1",
| "Address": "%s:53",
| "Protocol": "%s",
| "Socks5Address": "",
| "Timeout": 6,
| "EDNSClientSubnet": {
| "Policy": "disable",
| "ExternalIP": ""
| }
| },
| {
| "Name": "Primary-2",
| "Address": "%s:53",
| "Protocol": "%s",
| "Socks5Address": "",
| "Timeout": 6,
| "EDNSClientSubnet": {
| "Policy": "disable",
| "ExternalIP": ""
| }
| }
| ],
| "AlternativeDNS":[
| {
| "Name": "Alternative",
| "Address": "%s:53",
| "Protocol": "tcp",
| "Socks5Address": "%s",
| "Timeout": 6,
| "EDNSClientSubnet":{
| "Policy": "auto",
| "ExternalIP": "%s"
| }
| }
| ],
| "RedirectIPv6Record": true,
| "IPNetworkFile": "china_ip_list.txt",
| "DomainFile": "gfwlist.txt",
| "DomainBase64Decode": true,
| "HostsFile": "hosts",
| "MinimumTTL": 3600,
| "CacheSize" : 4096
|}
"""
.
stripMargin
val
PDNSD_DIRECT
=
val
OVERTURE_LOCAL
=
"""
|global {
| perm_cache = 2048;
| %s
| cache_dir = "%s";
| server_ip = %s;
| server_port = %d;
| query_method = udp_only;
| min_ttl = 15m;
| max_ttl = 1w;
| timeout = 10;
| daemon = off;
| par_queries = 4;
|}
|
|server {
| label = "remote-servers";
| ip = %s;
| timeout = 3;
| query_method = udp_only;
| %s
| policy = included;
| reject = %s;
| reject_policy = fail;
| reject_recursively = on;
|}
|
|server {
| label = "local-server";
| ip = 127.0.0.1;
| query_method = tcp_only;
| port = %d;
| reject = %s;
| reject_policy = negate;
| reject_recursively = on;
|}
|
|rr {
| name=localhost;
| reverse=on;
| a=127.0.0.1;
| owner=localhost;
| soa=localhost,root.localhost,42,86400,900,86400,86400;
|}
|{
| "BindAddress": ":%d",
| "PrimaryDNS": [
| {
| "Name": "Primary",
| "Address": "%s:53",
| "Protocol": "tcp",
| "Socks5Address": "%s",
| "Timeout": 6,
| "EDNSClientSubnet": {
| "Policy": "auto",
| "ExternalIP": "%s"
| }
| }
| ],
| "AlternativeDNS":[
| {
| "Name": "Alternative",
| "Address": "%s:53",
| "Protocol": "tcp",
| "Socks5Address": "%s",
| "Timeout": 6,
| "EDNSClientSubnet":{
| "Policy": "auto",
| "ExternalIP": "%s"
| }
| }
| ],
| "RedirectIPv6Record": true,
| "IPNetworkFile": "",
| "DomainFile": "",
| "DomainBase64Decode": true,
| "HostsFile": "hosts",
| "MinimumTTL": 3600,
| "CacheSize" : 4096
|}
"""
.
stripMargin
}
...
...
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