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
2840a75c
Commit
2840a75c
authored
Jan 30, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix an issue that stat_path is null
parent
95e214ef
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
49 additions
and
46 deletions
+49
-46
src/main/scala/com/github/shadowsocks/BaseService.scala
src/main/scala/com/github/shadowsocks/BaseService.scala
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
...scala/com/github/shadowsocks/ShadowsocksApplication.scala
+0
-1
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+22
-19
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+19
-19
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
...n/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
+1
-1
src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
...main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
+3
-3
src/main/scala/com/github/shadowsocks/utils/TrafficMonitorThread.scala
...a/com/github/shadowsocks/utils/TrafficMonitorThread.scala
+3
-2
No files found.
src/main/scala/com/github/shadowsocks/BaseService.scala
View file @
2840a75c
...
...
@@ -112,7 +112,7 @@ trait BaseService extends Service {
startService
(
new
Intent
(
getContext
,
getClass
))
TrafficMonitor
.
reset
()
trafficMonitorThread
=
new
TrafficMonitorThread
()
trafficMonitorThread
=
new
TrafficMonitorThread
(
getApplicationContext
)
trafficMonitorThread
.
start
()
}
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
View file @
2840a75c
...
...
@@ -60,7 +60,6 @@ object ShadowsocksApplication {
lazy
val
tracker
=
GoogleAnalytics
.
getInstance
(
instance
).
newTracker
(
R
.
xml
.
tracker
)
lazy
val
settings
=
PreferenceManager
.
getDefaultSharedPreferences
(
instance
)
lazy
val
profileManager
=
new
ProfileManager
(
settings
,
dbHelper
)
lazy
val
dataDir
=
instance
.
getApplicationInfo
().
dataDir
def
isVpnEnabled
=
!
settings
.
getBoolean
(
Key
.
isNAT
,
false
)
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
2840a75c
...
...
@@ -168,7 +168,7 @@ class ShadowsocksNatService extends BaseService {
case
Route
.
BYPASS_LAN
=>
getResources
.
getStringArray
(
R
.
array
.
private_route
)
case
Route
.
BYPASS_CHN
=>
getResources
.
getStringArray
(
R
.
array
.
chn_route_full
)
}
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
()
.
dataDir
+
"/acl.list"
))(
p
=>
{
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
.
dataDir
+
"/acl.list"
))(
p
=>
{
acl
.
foreach
(
item
=>
p
.
println
(
item
))
})
}
...
...
@@ -176,21 +176,22 @@ class ShadowsocksNatService extends BaseService {
val
conf
=
ConfigUtils
.
SHADOWSOCKS
.
formatLocal
(
Locale
.
ENGLISH
,
config
.
proxy
,
config
.
remotePort
,
config
.
localPort
,
config
.
sitekey
,
config
.
encMethod
,
600
)
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
()
.
dataDir
+
"/ss-local-nat.conf"
))(
p
=>
{
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
.
dataDir
+
"/ss-local-nat.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
val
cmd
=
new
ArrayBuffer
[
String
]
cmd
+=
(
getApplicationInfo
()
.
dataDir
+
"/ss-local"
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/ss-local"
,
"-b"
,
"127.0.0.1"
,
"-t"
,
"600"
,
"-c"
,
getApplicationInfo
().
dataDir
+
"/ss-local-nat.conf"
)
,
"-P"
,
getApplicationInfo
.
dataDir
,
"-c"
,
getApplicationInfo
.
dataDir
+
"/ss-local-nat.conf"
)
if
(
config
.
isAuth
)
cmd
+=
"-A"
if
(
config
.
route
!=
Route
.
ALL
)
{
cmd
+=
"--acl"
cmd
+=
(
getApplicationInfo
()
.
dataDir
+
"/acl.list"
)
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/acl.list"
)
}
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
.
mkString
(
" "
))
...
...
@@ -205,16 +206,17 @@ class ShadowsocksNatService extends BaseService {
val
conf
=
ConfigUtils
.
SHADOWSOCKS
.
formatLocal
(
Locale
.
ENGLISH
,
config
.
proxy
,
config
.
remotePort
,
8153
,
config
.
sitekey
,
config
.
encMethod
,
10
)
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
()
.
dataDir
+
"/ss-tunnel-nat.conf"
))(
p
=>
{
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
.
dataDir
+
"/ss-tunnel-nat.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
val
cmd
=
new
ArrayBuffer
[
String
]
cmd
+=
(
getApplicationInfo
()
.
dataDir
+
"/ss-tunnel"
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/ss-tunnel"
,
"-u"
,
"-t"
,
"10"
,
"-b"
,
"127.0.0.1"
,
"-L"
,
"8.8.8.8:53"
,
"-c"
,
getApplicationInfo
().
dataDir
+
"/ss-tunnel-nat.conf"
)
,
"-P"
,
getApplicationInfo
.
dataDir
,
"-c"
,
getApplicationInfo
.
dataDir
+
"/ss-tunnel-nat.conf"
)
cmd
+=
(
"-l"
,
"8153"
)
...
...
@@ -231,17 +233,18 @@ class ShadowsocksNatService extends BaseService {
val
conf
=
ConfigUtils
.
SHADOWSOCKS
.
formatLocal
(
Locale
.
ENGLISH
,
config
.
proxy
,
config
.
remotePort
,
8163
,
config
.
sitekey
,
config
.
encMethod
,
10
)
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
()
.
dataDir
+
"/ss-tunnel-nat.conf"
))(
p
=>
{
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
.
dataDir
+
"/ss-tunnel-nat.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
val
cmdBuf
=
new
ArrayBuffer
[
String
]
cmdBuf
+=
(
getApplicationInfo
()
.
dataDir
+
"/ss-tunnel"
cmdBuf
+=
(
getApplicationInfo
.
dataDir
+
"/ss-tunnel"
,
"-u"
,
"-t"
,
"10"
,
"-b"
,
"127.0.0.1"
,
"-l"
,
"8163"
,
"-L"
,
"8.8.8.8:53"
,
"-c"
,
getApplicationInfo
().
dataDir
+
"/ss-tunnel-nat.conf"
)
,
"-P"
,
getApplicationInfo
.
dataDir
,
"-c"
,
getApplicationInfo
.
dataDir
+
"/ss-tunnel-nat.conf"
)
if
(
config
.
isAuth
)
cmdBuf
+=
"-A"
...
...
@@ -259,17 +262,17 @@ class ShadowsocksNatService extends BaseService {
val
conf
=
if
(
config
.
route
==
Route
.
BYPASS_CHN
)
{
val
reject
=
ConfigUtils
.
getRejectList
(
getContext
)
val
blackList
=
ConfigUtils
.
getBlackList
(
getContext
)
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
"127.0.0.1"
,
8153
,
reject
,
blackList
,
8163
,
""
)
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
"127.0.0.1"
,
8153
,
reject
,
blackList
,
8163
,
""
)
}
else
{
ConfigUtils
.
PDNSD_LOCAL
.
formatLocal
(
Locale
.
ENGLISH
,
"127.0.0.1"
,
8153
,
8163
,
""
)
ConfigUtils
.
PDNSD_LOCAL
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
"127.0.0.1"
,
8153
,
8163
,
""
)
}
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
()
.
dataDir
+
"/pdnsd-nat.conf"
))(
p
=>
{
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
.
dataDir
+
"/pdnsd-nat.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
val
cmd
=
getApplicationInfo
().
dataDir
+
"/pdnsd -c "
+
getApplicationInfo
()
.
dataDir
+
"/pdnsd-nat.conf"
val
cmd
=
getApplicationInfo
.
dataDir
+
"/pdnsd -c "
+
getApplicationInfo
.
dataDir
+
"/pdnsd-nat.conf"
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
)
...
...
@@ -294,8 +297,8 @@ class ShadowsocksNatService extends BaseService {
def
startRedsocksDaemon
()
{
val
conf
=
ConfigUtils
.
REDSOCKS
.
formatLocal
(
Locale
.
ENGLISH
,
config
.
localPort
)
val
cmd
=
"%s/redsocks -c %s/redsocks-nat.conf"
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
().
dataDir
,
getApplicationInfo
()
.
dataDir
)
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
()
.
dataDir
+
"/redsocks-nat.conf"
))(
p
=>
{
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
getApplicationInfo
.
dataDir
)
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
.
dataDir
+
"/redsocks-nat.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
2840a75c
...
...
@@ -261,7 +261,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
var
tries
=
1
while
(
tries
<
5
)
{
Thread
.
sleep
(
1000
*
tries
)
if
(
System
.
sendfd
(
fd
,
getApplicationInfo
()
.
dataDir
+
"/sock_path"
)
!=
-
1
)
{
if
(
System
.
sendfd
(
fd
,
getApplicationInfo
.
dataDir
+
"/sock_path"
)
!=
-
1
)
{
return
true
}
tries
+=
1
...
...
@@ -277,7 +277,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
case
Route
.
BYPASS_LAN
=>
getResources
.
getStringArray
(
R
.
array
.
private_route
)
case
Route
.
BYPASS_CHN
=>
getResources
.
getStringArray
(
R
.
array
.
chn_route_full
)
}
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
()
.
dataDir
+
"/acl.list"
))(
p
=>
{
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
.
dataDir
+
"/acl.list"
))(
p
=>
{
acl
.
foreach
(
item
=>
p
.
println
(
item
))
})
}
...
...
@@ -285,22 +285,22 @@ class ShadowsocksVpnService extends VpnService with BaseService {
val
conf
=
ConfigUtils
.
SHADOWSOCKS
.
formatLocal
(
Locale
.
ENGLISH
,
config
.
proxy
,
config
.
remotePort
,
config
.
localPort
,
config
.
sitekey
,
config
.
encMethod
,
600
)
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
()
.
dataDir
+
"/ss-local-vpn.conf"
))(
p
=>
{
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
.
dataDir
+
"/ss-local-vpn.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
val
cmd
=
new
ArrayBuffer
[
String
]
cmd
+=
(
getApplicationInfo
()
.
dataDir
+
"/ss-local"
,
"-V"
,
"-u"
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/ss-local"
,
"-V"
,
"-u"
,
"-b"
,
"127.0.0.1"
,
"-t"
,
"600"
,
"-P"
,
ShadowsocksApplication
.
dataDir
,
"-c"
,
getApplicationInfo
()
.
dataDir
+
"/ss-local-vpn.conf"
)
,
"-P"
,
getApplicationInfo
.
dataDir
,
"-c"
,
getApplicationInfo
.
dataDir
+
"/ss-local-vpn.conf"
)
if
(
config
.
isAuth
)
cmd
+=
"-A"
if
(
config
.
route
!=
Route
.
ALL
)
{
cmd
+=
"--acl"
cmd
+=
(
getApplicationInfo
()
.
dataDir
+
"/acl.list"
)
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/acl.list"
)
}
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
.
mkString
(
" "
))
...
...
@@ -315,19 +315,19 @@ class ShadowsocksVpnService extends VpnService with BaseService {
val
conf
=
ConfigUtils
.
SHADOWSOCKS
.
formatLocal
(
Locale
.
ENGLISH
,
config
.
proxy
,
config
.
remotePort
,
8163
,
config
.
sitekey
,
config
.
encMethod
,
10
)
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
()
.
dataDir
+
"/ss-tunnel-vpn.conf"
))(
p
=>
{
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
.
dataDir
+
"/ss-tunnel-vpn.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
val
cmd
=
new
ArrayBuffer
[
String
]
cmd
+=
(
getApplicationInfo
()
.
dataDir
+
"/ss-tunnel"
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/ss-tunnel"
,
"-V"
,
"-u"
,
"-t"
,
"10"
,
"-b"
,
"127.0.0.1"
,
"-l"
,
"8163"
,
"-L"
,
"8.8.8.8:53"
,
"-P"
,
ShadowsocksApplication
.
dataDir
,
"-c"
,
getApplicationInfo
()
.
dataDir
+
"/ss-tunnel-vpn.conf"
)
,
"-P"
,
getApplicationInfo
.
dataDir
,
"-c"
,
getApplicationInfo
.
dataDir
+
"/ss-tunnel-vpn.conf"
)
if
(
config
.
isAuth
)
cmd
+=
"-A"
...
...
@@ -345,17 +345,17 @@ class ShadowsocksVpnService extends VpnService with BaseService {
if
(
config
.
route
==
Route
.
BYPASS_CHN
)
{
val
reject
=
ConfigUtils
.
getRejectList
(
getContext
)
val
blackList
=
ConfigUtils
.
getBlackList
(
getContext
)
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
"0.0.0.0"
,
8153
,
reject
,
blackList
,
8163
,
ipv6
)
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
"0.0.0.0"
,
8153
,
reject
,
blackList
,
8163
,
ipv6
)
}
else
{
ConfigUtils
.
PDNSD_LOCAL
.
formatLocal
(
Locale
.
ENGLISH
,
"0.0.0.0"
,
8153
,
8163
,
ipv6
)
ConfigUtils
.
PDNSD_LOCAL
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
"0.0.0.0"
,
8153
,
8163
,
ipv6
)
}
}
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
()
.
dataDir
+
"/pdnsd-vpn.conf"
))(
p
=>
{
ConfigUtils
.
printToFile
(
new
File
(
getApplicationInfo
.
dataDir
+
"/pdnsd-vpn.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
val
cmd
=
getApplicationInfo
().
dataDir
+
"/pdnsd -c "
+
getApplicationInfo
()
.
dataDir
+
"/pdnsd-vpn.conf"
val
cmd
=
getApplicationInfo
.
dataDir
+
"/pdnsd -c "
+
getApplicationInfo
.
dataDir
+
"/pdnsd-vpn.conf"
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
)
...
...
@@ -430,7 +430,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
val
fd
=
conn
.
getFd
var
cmd
=
(
getApplicationInfo
()
.
dataDir
+
var
cmd
=
(
getApplicationInfo
.
dataDir
+
"/tun2socks --netif-ipaddr %s "
+
"--netif-netmask 255.255.255.0 "
+
"--socks-server-addr 127.0.0.1:%d "
...
...
@@ -440,7 +440,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
+
"--loglevel 3"
)
.
formatLocal
(
Locale
.
ENGLISH
,
PRIVATE_VLAN
.
formatLocal
(
Locale
.
ENGLISH
,
"2"
),
config
.
localPort
,
fd
,
VPN_MTU
,
getApplicationInfo
()
.
dataDir
+
"/sock_path"
)
config
.
localPort
,
fd
,
VPN_MTU
,
getApplicationInfo
.
dataDir
+
"/sock_path"
)
if
(
config
.
isIpv6
)
cmd
+=
" --netif-ip6addr "
+
PRIVATE_VLAN6
.
formatLocal
(
Locale
.
ENGLISH
,
"2"
)
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
View file @
2840a75c
...
...
@@ -53,7 +53,7 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
import
ShadowsocksVpnThread._
val
TAG
=
"ShadowsocksVpnService"
lazy
val
PATH
=
ShadowsocksApplication
.
dataDir
+
"/protect_path"
lazy
val
PATH
=
vpnService
.
getApplicationInfo
.
dataDir
+
"/protect_path"
@volatile
var
isRunning
:
Boolean
=
true
@volatile
var
serverSocket
:
LocalServerSocket
=
null
...
...
src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
View file @
2840a75c
...
...
@@ -66,7 +66,7 @@ object ConfigUtils {
"""
|global {
| perm_cache = 2048;
| cache_dir = "
/data/data/com.github.shadowsock
s";
| cache_dir = "
%
s";
| server_ip = %s;
| server_port = %d;
| query_method = tcp_only;
...
...
@@ -100,7 +100,7 @@ object ConfigUtils {
"""
|global {
| perm_cache = 2048;
| cache_dir = "
/data/data/com.github.shadowsock
s";
| cache_dir = "
%
s";
| server_ip = %s;
| server_port = %d;
| query_method = tcp_only;
...
...
@@ -143,7 +143,7 @@ object ConfigUtils {
"""
|global {
| perm_cache = 2048;
| cache_dir = "
/data/data/com.github.shadowsock
s";
| cache_dir = "
%
s";
| server_ip = %s;
| server_port = %d;
| query_method = tcp_only;
...
...
src/main/scala/com/github/shadowsocks/utils/TrafficMonitorThread.scala
View file @
2840a75c
...
...
@@ -43,13 +43,14 @@ import java.io.{File, IOException}
import
java.nio.
{
ByteBuffer
,
ByteOrder
}
import
java.util.concurrent.Executors
import
android.content.Context
import
android.net.
{
LocalServerSocket
,
LocalSocket
,
LocalSocketAddress
}
import
android.util.Log
class
TrafficMonitorThread
()
extends
Thread
{
class
TrafficMonitorThread
(
context
:
Context
)
extends
Thread
{
val
TAG
=
"TrafficMonitorThread"
val
PATH
=
"/data/data/com.github.shadowsocks
/stat_path"
lazy
val
PATH
=
context
.
getApplicationInfo
.
dataDir
+
"
/stat_path"
@volatile
var
serverSocket
:
LocalServerSocket
=
null
@volatile
var
isRunning
:
Boolean
=
true
...
...
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