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
588c2794
Commit
588c2794
authored
Jun 26, 2013
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix #23
parent
336618ff
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
104 additions
and
90 deletions
+104
-90
src/main/assets/pdnsd.conf
src/main/assets/pdnsd.conf
+0
-33
src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
+24
-18
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+3
-2
src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
...ain/scala/com/github/shadowsocks/ShadowsocksService.scala
+20
-33
src/main/scala/com/github/shadowsocks/Utils.scala
src/main/scala/com/github/shadowsocks/Utils.scala
+57
-4
No files found.
src/main/assets/pdnsd.conf
deleted
100644 → 0
View file @
336618ff
global
{
perm_cache
=
2048
;
cache_dir
=
"/data/data/com.github.shadowsocks"
;
server_ip
=
0
.
0
.
0
.
0
;
server_port
=
8153
;
query_method
=
tcp_only
;
run_ipv4
=
on
;
min_ttl
=
15
m
;
max_ttl
=
1
w
;
timeout
=
10
;
daemon
=
on
;
pid_file
=
"/data/data/com.github.shadowsocks/pdnsd.pid"
;
}
server
{
label
=
"root-servers"
;
ip
=
8
.
8
.
8
.
8
,
8
.
8
.
4
.
4
,
199
.
91
.
73
.
222
,
178
.
79
.
131
.
110
;
timeout
=
5
;
}
rr
{
name
=
localhost
;
reverse
=
on
;
a
=
127
.
0
.
0
.
1
;
owner
=
localhost
;
soa
=
localhost
,
root
.
localhost
,
42
,
86400
,
900
,
86400
,
86400
;
}
src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
View file @
588c2794
...
@@ -62,7 +62,7 @@ class ShadowVpnService extends VpnService {
...
@@ -62,7 +62,7 @@ class ShadowVpnService extends VpnService {
val
TAG
=
"ShadowVpnService"
val
TAG
=
"ShadowVpnService"
val
BASE
=
"/data/data/com.github.shadowsocks/"
val
BASE
=
"/data/data/com.github.shadowsocks/"
val
SHADOWSOCKS_CONF
=
"{\"server\": [%s], \"server_port\": %d, \"local_port\": %d, \"password\": %s, \"timeout\": %d}"
val
MSG_CONNECT_FINISH
=
1
val
MSG_CONNECT_FINISH
=
1
val
MSG_CONNECT_SUCCESS
=
2
val
MSG_CONNECT_SUCCESS
=
2
val
MSG_CONNECT_FAIL
=
3
val
MSG_CONNECT_FAIL
=
3
...
@@ -136,19 +136,21 @@ class ShadowVpnService extends VpnService {
...
@@ -136,19 +136,21 @@ class ShadowVpnService extends VpnService {
}
}
def
startShadowsocksDaemon
()
{
def
startShadowsocksDaemon
()
{
spawn
{
val
cmd
:
String
=
(
BASE
+
val
cmd
:
String
=
(
BASE
+
"shadowsocks
-s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f "
+
"shadowsocks -b 127.0.0.1
-s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f "
+
BASE
+
BASE
+
"shadowsocks.pid"
)
"shadowsocks.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
)
System
.
exec
(
cmd
)
System
.
exec
(
cmd
)
}
}
}
def
startDnsDaemon
()
{
def
startDnsDaemon
()
{
val
cmd
:
String
=
BASE
+
"pdnsd -c "
+
BASE
+
"pdnsd.conf"
val
cmd
:
String
=
BASE
+
"pdnsd -c "
+
BASE
+
"pdnsd.conf"
val
conf
:
String
=
Config
.
PDNSD
.
format
(
"0.0.0.0"
)
Config
.
printToFile
(
new
File
(
BASE
+
"pdnsd.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
Utils
.
runCommand
(
cmd
)
Utils
.
runCommand
(
cmd
)
}
}
...
@@ -184,7 +186,6 @@ class ShadowVpnService extends VpnService {
...
@@ -184,7 +186,6 @@ class ShadowVpnService extends VpnService {
config
=
Extra
.
get
(
intent
)
config
=
Extra
.
get
(
intent
)
spawn
{
spawn
{
killProcesses
()
killProcesses
()
...
@@ -232,6 +233,11 @@ class ShadowVpnService extends VpnService {
...
@@ -232,6 +233,11 @@ class ShadowVpnService extends VpnService {
!
t
.
isAlive
!
t
.
isAlive
}
}
def
getLocalAddress
:
String
=
Utils
.
getIPv4Address
match
{
case
Some
(
ip
)
if
ip
.
split
(
'.'
)(
0
)
==
"172"
=>
PRIVATE_VLAN_10
case
_
=>
PRIVATE_VLAN_172
}
def
startVpn
()
{
def
startVpn
()
{
val
address
=
config
.
proxy
.
split
(
'.'
)
val
address
=
config
.
proxy
.
split
(
'.'
)
...
@@ -239,10 +245,7 @@ class ShadowVpnService extends VpnService {
...
@@ -239,10 +245,7 @@ class ShadowVpnService extends VpnService {
val
prefix2
=
address
.
slice
(
0
,
2
).
mkString
(
"."
)
val
prefix2
=
address
.
slice
(
0
,
2
).
mkString
(
"."
)
val
prefix3
=
address
.
slice
(
0
,
3
).
mkString
(
"."
)
val
prefix3
=
address
.
slice
(
0
,
3
).
mkString
(
"."
)
val
localAddress
=
Utils
.
getIPv4Address
match
{
val
localAddress
=
getLocalAddress
case
Some
(
ip
)
if
ip
.
split
(
'.'
)(
0
)
==
"172"
=>
PRIVATE_VLAN_10
case
_
=>
PRIVATE_VLAN_172
}
val
builder
=
new
Builder
()
val
builder
=
new
Builder
()
builder
builder
...
@@ -301,7 +304,6 @@ class ShadowVpnService extends VpnService {
...
@@ -301,7 +304,6 @@ class ShadowVpnService extends VpnService {
val
cmd
=
(
BASE
+
val
cmd
=
(
BASE
+
"tun2socks --netif-ipaddr %s "
"tun2socks --netif-ipaddr %s "
// + "--udpgw-remote-server-addr %s:7300 "
+
"--dnsgw %s:8153 "
+
"--dnsgw %s:8153 "
+
"--netif-netmask 255.255.255.0 "
+
"--netif-netmask 255.255.255.0 "
+
"--socks-server-addr 127.0.0.1:%d "
+
"--socks-server-addr 127.0.0.1:%d "
...
@@ -316,9 +318,9 @@ class ShadowVpnService extends VpnService {
...
@@ -316,9 +318,9 @@ class ShadowVpnService extends VpnService {
/** Called when the activity is first created. */
/** Called when the activity is first created. */
def
handleConnection
:
Boolean
=
{
def
handleConnection
:
Boolean
=
{
startDnsDaemon
()
startShadowsocksDaemon
()
startVpn
()
startVpn
()
startShadowsocksDaemon
()
startDnsDaemon
()
true
true
}
}
...
@@ -405,6 +407,10 @@ class ShadowVpnService extends VpnService {
...
@@ -405,6 +407,10 @@ class ShadowVpnService extends VpnService {
sb
++=
"kill -9 `cat /data/data/com.github.shadowsocks/tun2socks.pid`"
++=
"\n"
sb
++=
"kill -9 `cat /data/data/com.github.shadowsocks/tun2socks.pid`"
++=
"\n"
sb
++=
"killall -9 tun2socks"
++=
"\n"
sb
++=
"killall -9 tun2socks"
++=
"\n"
}
}
if
(!
waitForProcess
(
"pdnsd"
))
{
sb
++=
"kill -9 `cat /data/data/com.github.shadowsocks/pdnsd.pid`"
++=
"\n"
sb
++=
"killall -9 pdnsd"
++=
"\n"
}
Utils
.
runCommand
(
sb
.
toString
())
Utils
.
runCommand
(
sb
.
toString
())
}
}
...
...
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
588c2794
...
@@ -287,18 +287,20 @@ class Shadowsocks
...
@@ -287,18 +287,20 @@ class Shadowsocks
private
def
crash_recovery
()
{
private
def
crash_recovery
()
{
val
sb
=
new
StringBuilder
val
sb
=
new
StringBuilder
sb
.
append
(
Utils
.
getIptables
).
append
(
" -t nat -F OUTPUT"
).
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/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/shadowsocks.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 shadowsocks"
).
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"
)
Utils
.
runCommand
(
sb
.
toString
())
Utils
.
runCommand
(
sb
.
toString
())
sb
.
clear
()
sb
.
clear
()
sb
.
append
(
"kill -9 `cat /data/data/com.github.shadowsocks/redsocks.pid`"
).
append
(
"\n"
)
sb
.
append
(
"kill -9 `cat /data/data/com.github.shadowsocks/redsocks.pid`"
).
append
(
"\n"
)
sb
.
append
(
"killall -9 redsocks"
).
append
(
"\n"
)
sb
.
append
(
"killall -9 redsocks"
).
append
(
"\n"
)
sb
.
append
(
"rm /data/data/com.github.shadowsocks/redsocks.conf"
).
append
(
"\n"
)
sb
.
append
(
Utils
.
getIptables
).
append
(
" -t nat -F OUTPUT"
).
append
(
"\n"
)
Utils
.
runRootCommand
(
sb
.
toString
())
Utils
.
runRootCommand
(
sb
.
toString
())
}
}
...
@@ -534,7 +536,6 @@ class Shadowsocks
...
@@ -534,7 +536,6 @@ class Shadowsocks
def
reset
()
{
def
reset
()
{
crash_recovery
()
crash_recovery
()
copyAssets
(
""
)
copyAssets
(
Utils
.
getABI
)
copyAssets
(
Utils
.
getABI
)
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"
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
View file @
588c2794
...
@@ -48,10 +48,7 @@ import android.os._
...
@@ -48,10 +48,7 @@ import android.os._
import
android.support.v4.app.NotificationCompat
import
android.support.v4.app.NotificationCompat
import
android.util.Log
import
android.util.Log
import
com.google.analytics.tracking.android.EasyTracker
import
com.google.analytics.tracking.android.EasyTracker
import
java.io.BufferedReader
import
java.io._
import
java.io.FileNotFoundException
import
java.io.FileReader
import
java.io.IOException
import
java.lang.reflect.InvocationTargetException
import
java.lang.reflect.InvocationTargetException
import
java.lang.reflect.Method
import
java.lang.reflect.Method
import
org.apache.http.conn.util.InetAddressUtils
import
org.apache.http.conn.util.InetAddressUtils
...
@@ -59,8 +56,8 @@ import scala.collection._
...
@@ -59,8 +56,8 @@ import scala.collection._
import
java.util.
{
TimerTask
,
Timer
}
import
java.util.
{
TimerTask
,
Timer
}
import
android.net.TrafficStats
import
android.net.TrafficStats
import
android.graphics._
import
android.graphics._
import
scala.Some
import
scala.concurrent.ops._
import
scala.concurrent.ops._
import
scala.Some
case
class
TrafficStat
(
tx
:
Long
,
rx
:
Long
,
timestamp
:
Long
)
case
class
TrafficStat
(
tx
:
Long
,
rx
:
Long
,
timestamp
:
Long
)
...
@@ -74,21 +71,7 @@ class ShadowsocksService extends Service {
...
@@ -74,21 +71,7 @@ class ShadowsocksService extends Service {
val
TAG
=
"ShadowsocksService"
val
TAG
=
"ShadowsocksService"
val
BASE
=
"/data/data/com.github.shadowsocks/"
val
BASE
=
"/data/data/com.github.shadowsocks/"
val
REDSOCKS_CONF
=
"base {"
+
" log_debug = off;"
+
" log_info = off;"
+
" log = stderr;"
+
" daemon = on;"
+
" redirector = iptables;"
+
"}"
+
"redsocks {"
+
" local_ip = 127.0.0.1;"
+
" local_port = 8123;"
+
" ip = 127.0.0.1;"
+
" port = %d;"
+
" type = socks5;"
+
"}"
val
SHADOWSOCKS_CONF
=
"{\"server\": [%s], \"server_port\": %d, \"local_port\": %d, \"password\": %s, \"timeout\": %d}"
val
CMD_IPTABLES_RETURN
=
" -t nat -A OUTPUT -p tcp -d 0.0.0.0 -j RETURN\n"
val
CMD_IPTABLES_RETURN
=
" -t nat -A OUTPUT -p tcp -d 0.0.0.0 -j RETURN\n"
val
CMD_IPTABLES_REDIRECT_ADD_SOCKS
=
" -t nat -A OUTPUT -p tcp "
+
"-j REDIRECT --to 8123\n"
val
CMD_IPTABLES_REDIRECT_ADD_SOCKS
=
" -t nat -A OUTPUT -p tcp "
+
"-j REDIRECT --to 8123\n"
val
CMD_IPTABLES_DNAT_ADD_SOCKS
=
" -t nat -A OUTPUT -p tcp "
+
val
CMD_IPTABLES_DNAT_ADD_SOCKS
=
" -t nat -A OUTPUT -p tcp "
+
...
@@ -169,20 +152,21 @@ class ShadowsocksService extends Service {
...
@@ -169,20 +152,21 @@ class ShadowsocksService extends Service {
}
}
def
startShadowsocksDaemon
()
{
def
startShadowsocksDaemon
()
{
spawn
{
val
cmd
:
String
=
(
BASE
+
val
cmd
:
String
=
(
BASE
+
"shadowsocks -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f "
+
"shadowsocks -b 127.0.0.1 -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f "
+
BASE
+
BASE
+
"shadowsocks.pid"
)
"shadowsocks.pid"
)
.
format
(
config
.
proxy
,
config
.
remotePort
,
config
.
localPort
,
config
.
sitekey
,
.
format
(
config
.
proxy
,
config
.
remotePort
,
config
.
localPort
,
config
.
sitekey
,
config
.
encMethod
)
config
.
encMethod
)
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
)
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
)
System
.
exec
(
cmd
)
System
.
exec
(
cmd
)
}
}
}
def
startDnsDaemon
()
{
def
startDnsDaemon
()
{
val
cmd
:
String
=
BASE
+
"pdnsd -c "
+
BASE
+
"pdnsd.conf"
val
cmd
:
String
=
BASE
+
"pdnsd -c "
+
BASE
+
"pdnsd.conf"
val
conf
:
String
=
Config
.
PDNSD
.
format
(
"127.0.0.1"
)
Config
.
printToFile
(
new
File
(
BASE
+
"pdnsd.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
Utils
.
runCommand
(
cmd
)
Utils
.
runCommand
(
cmd
)
}
}
...
@@ -242,9 +226,12 @@ class ShadowsocksService extends Service {
...
@@ -242,9 +226,12 @@ class ShadowsocksService extends Service {
}
}
def
startRedsocksDaemon
()
{
def
startRedsocksDaemon
()
{
val
conf
=
REDSOCKS_CONF
.
format
(
config
.
localPort
)
val
conf
=
Config
.
REDSOCKS
.
format
(
config
.
localPort
)
val
cmd
=
"%sredsocks -p %sredsocks.pid -c %sredsocks.conf"
.
format
(
BASE
,
BASE
,
BASE
)
val
cmd
=
"%sredsocks -p %sredsocks.pid -c %sredsocks.conf"
.
format
(
BASE
,
BASE
,
BASE
)
Utils
.
runRootCommand
(
"echo \""
+
conf
+
"\" > "
+
BASE
+
"redsocks.conf\n"
+
cmd
)
Config
.
printToFile
(
new
File
(
BASE
+
"redsocks.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
Utils
.
runRootCommand
(
cmd
)
}
}
def
waitForProcess
(
name
:
String
)
:
Boolean
=
{
def
waitForProcess
(
name
:
String
)
:
Boolean
=
{
...
@@ -426,7 +413,7 @@ class ShadowsocksService extends Service {
...
@@ -426,7 +413,7 @@ class ShadowsocksService extends Service {
}
}
last
=
new
TrafficStat
(
TrafficStats
.
getUidTxBytes
(
getApplicationInfo
.
uid
),
last
=
new
TrafficStat
(
TrafficStats
.
getUidTxBytes
(
getApplicationInfo
.
uid
),
TrafficStats
.
getUidRxBytes
(
getApplicationInfo
.
uid
),
java
.
lang
.
System
.
currentTimeMillis
())
TrafficStats
.
getUidRxBytes
(
getApplicationInfo
.
uid
),
java
.
lang
.
System
.
currentTimeMillis
())
timer
.
schedule
(
task
,
TIMER_INTERVAL
*
1000
,
TIMER_INTERVAL
*
1000
)
timer
.
schedule
(
task
,
TIMER_INTERVAL
*
1000
,
TIMER_INTERVAL
*
1000
)
}
}
/** Called when the activity is closed. */
/** Called when the activity is closed. */
...
...
src/main/scala/com/github/shadowsocks/Utils.scala
View file @
588c2794
...
@@ -52,6 +52,63 @@ import scala.Some
...
@@ -52,6 +52,63 @@ import scala.Some
import
android.graphics.
{
Canvas
,
Bitmap
}
import
android.graphics.
{
Canvas
,
Bitmap
}
import
android.app.ActivityManager
import
android.app.ActivityManager
object
Config
{
val
SHADOWSOCKS
=
"{\"server\": [%s], \"server_port\": %d, \"local_port\": %d, \"password\": %s, \"timeout\": %d}"
val
REDSOCKS
=
"base {"
+
" log_debug = off;"
+
" log_info = off;"
+
" log = stderr;"
+
" daemon = on;"
+
" redirector = iptables;"
+
"}"
+
"redsocks {"
+
" local_ip = 127.0.0.1;"
+
" local_port = 8123;"
+
" ip = 127.0.0.1;"
+
" port = %d;"
+
" type = socks5;"
+
"}"
val
PDNSD
=
"""
|global {
| perm_cache = 2048;
| cache_dir = "/data/data/com.github.shadowsocks";
| server_ip = %s;
| server_port = 8153;
| query_method = tcp_only;
| run_ipv4 = on;
| min_ttl = 15m;
| max_ttl = 1w;
| timeout = 10;
| daemon = on;
| pid_file = "/data/data/com.github.shadowsocks/pdnsd.pid";
|}
|
|server {
| label = "root-servers";
| ip = 8.8.8.8, 8.8.4.4, 208.67.222.222, 208.67.220.220;
| timeout = 5;
|}
|
|rr {
| name=localhost;
| reverse=on;
| a=127.0.0.1;
| owner=localhost;
| soa=localhost,root.localhost,42,86400,900,86400,86400;
|}
"""
.
stripMargin
def
printToFile
(
f
:
java.io.File
)(
op
:
java.io.PrintWriter
=>
Unit
)
{
val
p
=
new
java
.
io
.
PrintWriter
(
f
)
try
{
op
(
p
)
}
finally
{
p
.
close
()
}
}
}
case
class
Config
(
isGlobalProxy
:
Boolean
,
isGFWList
:
Boolean
,
isBypassApps
:
Boolean
,
var
proxy
:
String
,
sitekey
:
String
,
encMethod
:
String
,
remotePort
:
Int
,
localPort
:
Int
,
proxiedAppString
:
String
)
object
Key
{
object
Key
{
val
proxied
=
"Proxyed"
val
proxied
=
"Proxyed"
...
@@ -73,10 +130,6 @@ object Key {
...
@@ -73,10 +130,6 @@ object Key {
val
localPort
=
"port"
val
localPort
=
"port"
}
}
case
class
Config
(
isGlobalProxy
:
Boolean
,
isGFWList
:
Boolean
,
isBypassApps
:
Boolean
,
var
proxy
:
String
,
sitekey
:
String
,
encMethod
:
String
,
remotePort
:
Int
,
localPort
:
Int
,
proxiedAppString
:
String
)
object
State
{
object
State
{
val
INIT
=
0
val
INIT
=
0
val
CONNECTING
=
1
val
CONNECTING
=
1
...
...
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