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
cc5fafbd
Commit
cc5fafbd
authored
Feb 28, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #67 from shadowsocks/udp-dns
Add UDP DNS feature
parents
a029f276
a89ca2d1
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
132 additions
and
64 deletions
+132
-64
.travis.yml
.travis.yml
+2
-2
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/java/com/github/shadowsocks/aidl/Config.java
src/main/java/com/github/shadowsocks/aidl/Config.java
+18
-16
src/main/java/com/github/shadowsocks/aidl/IShadowsocksService.aidl
...java/com/github/shadowsocks/aidl/IShadowsocksService.aidl
+2
-2
src/main/java/com/github/shadowsocks/aidl/IShadowsocksServiceCallback.aidl
.../github/shadowsocks/aidl/IShadowsocksServiceCallback.aidl
+2
-2
src/main/jni/Android.mk
src/main/jni/Android.mk
+23
-2
src/main/jni/shadowsocks
src/main/jni/shadowsocks
+1
-1
src/main/res/values-zh/strings.xml
src/main/res/values-zh/strings.xml
+3
-0
src/main/res/values/strings.xml
src/main/res/values/strings.xml
+2
-0
src/main/res/xml/pref_feature.xml
src/main/res/xml/pref_feature.xml
+10
-4
src/main/scala/com/github/shadowsocks/BaseService.scala
src/main/scala/com/github/shadowsocks/BaseService.scala
+1
-2
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+8
-4
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+20
-10
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+20
-11
src/main/scala/com/github/shadowsocks/database/DBHelper.scala
...main/scala/com/github/shadowsocks/database/DBHelper.scala
+6
-2
src/main/scala/com/github/shadowsocks/database/Profile.scala
src/main/scala/com/github/shadowsocks/database/Profile.scala
+3
-0
src/main/scala/com/github/shadowsocks/database/ProfileManager.scala
...cala/com/github/shadowsocks/database/ProfileManager.scala
+2
-0
src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
...main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
+4
-2
src/main/scala/com/github/shadowsocks/utils/Constants.scala
src/main/scala/com/github/shadowsocks/utils/Constants.scala
+1
-0
No files found.
.travis.yml
View file @
cc5fafbd
...
...
@@ -35,7 +35,7 @@ after_success:
-
sbt deploy
env
:
global
:
-
"
ARTIFACTS_AWS_REGION=
ap-north
east-1"
-
"
ARTIFACTS_S3_BUCKET=travis-
ci
"
-
"
ARTIFACTS_AWS_REGION=
us-
east-1"
-
"
ARTIFACTS_S3_BUCKET=travis-
nightly
"
-
secure
:
"
GkAdnMh07id2VKhpCW16lE73A0LK2Jsk3hzkFvdx76JKW8FjLgaimLJ2T/+i
\n
xFfDw8XBinLE09dqg8JxSNS6JbLHLcav8P3yJIlzFh1NqfJABU9U4I8atb6P
\n
ITSdSo9nb3LX6sB8SOU0nqXb5U+nj7jiekQqiBhmEmu6iDmMtfU="
-
secure
:
"
eCh5BjCFccp+sB/FIrjsmxJU4475D4qiWvDV++khcIHLel6lgUjDX18ImBlJ
\n
+IdiCKxvR6EpRDV1Cs4gJ2jZEAV0PbojQMoQOXbs1FLggM8RRq/Re1qWQFq7
\n
WkBRjjr8w8ddjJZHRo459cTUvgvD7krhp07coabAnEahDaGWSUo="
build-ndk.sh
View file @
cc5fafbd
...
...
@@ -5,7 +5,7 @@ ndk-build
mkdir
-p
assets/armeabi
mkdir
-p
assets/armeabi-v7a
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
mv
libs/armeabi/
$app
assets/armeabi/
mv
libs/armeabi-v7a/
$app
assets/armeabi-v7a/
...
...
project/Build.scala
View file @
cc5fafbd
...
...
@@ -5,8 +5,8 @@ import sbtandroid._
import
sbtandroid.AndroidPlugin._
object
App
{
val
version
=
"2.1.
1
"
val
versionCode
=
6
2
val
version
=
"2.1.
2
"
val
versionCode
=
6
3
}
object
General
{
...
...
src/main/assets/pages/about.html
View file @
cc5fafbd
...
...
@@ -274,7 +274,7 @@ img {
</head>
<body>
<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
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
...
...
src/main/java/com/github/shadowsocks/aidl/Config.java
View file @
cc5fafbd
...
...
@@ -9,6 +9,7 @@ public class Config implements Parcelable {
public
boolean
isGFWList
=
true
;
public
boolean
isBypassApps
=
false
;
public
boolean
isTrafficStat
=
false
;
public
boolean
isUdpDns
=
false
;
public
String
profileName
=
"Untitled"
;
public
String
proxy
=
"127.0.0.1"
;
...
...
@@ -20,24 +21,24 @@ public class Config implements Parcelable {
public
int
remotePort
=
1984
;
public
int
localPort
=
1080
;
public
static
final
Parcelable
.
Creator
<
Config
>
CREATOR
=
new
Parcelable
.
Creator
<
Config
>()
{
public
Config
createFromParcel
(
Parcel
in
)
{
return
new
Config
(
in
);
}
public
static
final
Parcelable
.
Creator
<
Config
>
CREATOR
=
new
Parcelable
.
Creator
<
Config
>()
{
public
Config
createFromParcel
(
Parcel
in
)
{
return
new
Config
(
in
);
}
public
Config
[]
newArray
(
int
size
)
{
return
new
Config
[
size
];
}
};
public
Config
[]
newArray
(
int
size
)
{
return
new
Config
[
size
];
}
};
public
Config
(
boolean
isGlobalProxy
,
boolean
isGFWList
,
boolean
isBypassApps
,
boolean
isTrafficStat
,
String
profileName
,
String
proxy
,
String
sitekey
,
String
encMethod
,
String
proxiedAppString
,
int
remotePort
,
int
localPort
)
{
boolean
isTrafficStat
,
boolean
isUdpDns
,
String
profileName
,
String
proxy
,
String
sitekey
,
String
encMethod
,
String
proxiedAppString
,
int
remotePort
,
int
localPort
)
{
this
.
isGlobalProxy
=
isGlobalProxy
;
this
.
isGFWList
=
isGFWList
;
this
.
isBypassApps
=
isBypassApps
;
this
.
isTrafficStat
=
isTrafficStat
;
this
.
isUdpDns
=
isUdpDns
;
this
.
profileName
=
profileName
;
this
.
proxy
=
proxy
;
this
.
sitekey
=
sitekey
;
...
...
@@ -56,6 +57,7 @@ public class Config implements Parcelable {
isGFWList
=
in
.
readInt
()
==
1
;
isBypassApps
=
in
.
readInt
()
==
1
;
isTrafficStat
=
in
.
readInt
()
==
1
;
isUdpDns
=
in
.
readInt
()
==
1
;
profileName
=
in
.
readString
();
proxy
=
in
.
readString
();
sitekey
=
in
.
readString
();
...
...
@@ -70,10 +72,11 @@ public class Config implements Parcelable {
}
@Override
public
void
writeToParcel
(
Parcel
out
,
int
flags
)
{
out
.
writeInt
(
isGlobalProxy
?
1
:
0
);
out
.
writeInt
(
isGFWList
?
1
:
0
);
out
.
writeInt
(
isBypassApps
?
1
:
0
);
out
.
writeInt
(
isTrafficStat
?
1
:
0
);
out
.
writeInt
(
isGlobalProxy
?
1
:
0
);
out
.
writeInt
(
isGFWList
?
1
:
0
);
out
.
writeInt
(
isBypassApps
?
1
:
0
);
out
.
writeInt
(
isTrafficStat
?
1
:
0
);
out
.
writeInt
(
isUdpDns
?
1
:
0
);
out
.
writeString
(
profileName
);
out
.
writeString
(
proxy
);
out
.
writeString
(
sitekey
);
...
...
@@ -81,6 +84,5 @@ public class Config implements Parcelable {
out
.
writeString
(
proxiedAppString
);
out
.
writeInt
(
remotePort
);
out
.
writeInt
(
localPort
);
}
}
src/main/java/com/github/shadowsocks/aidl/IShadowsocksService.aidl
View file @
cc5fafbd
...
...
@@ -7,8 +7,8 @@ interface IShadowsocksService {
int
getMode
();
int
getState
();
void
registerCallback
(
IShadowsocksServiceCallback
cb
);
void
unregisterCallback
(
IShadowsocksServiceCallback
cb
);
oneway
void
registerCallback
(
IShadowsocksServiceCallback
cb
);
oneway
void
unregisterCallback
(
IShadowsocksServiceCallback
cb
);
oneway
void
start
(
in
Config
config
);
oneway
void
stop
();
...
...
src/main/java/com/github/shadowsocks/aidl/IShadowsocksServiceCallback.aidl
View file @
cc5fafbd
package
com
.
github
.
shadowsocks
.
aidl
;
interface
IShadowsocksServiceCallback
{
void
stateChanged
(
int
state
,
String
msg
);
}
\ No newline at end of file
oneway
void
stateChanged
(
int
state
,
String
msg
);
}
src/main/jni/Android.mk
View file @
cc5fafbd
...
...
@@ -89,14 +89,14 @@ LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
include
$(BUILD_EXECUTABLE)
########################################################
## shadowsocks
## shadowsocks
local
########################################################
include
$(CLEAR_VARS)
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_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
\
...
...
@@ -109,6 +109,27 @@ LOCAL_LDLIBS := -llog
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
########################################################
...
...
shadowsocks
@
b2df5a4c
Subproject commit
69f8bd61c096337abb34a9e64534865d08022957
Subproject commit
b2df5a4c26d293469237fd89153e16f1fa47000c
src/main/res/values-zh/strings.xml
View file @
cc5fafbd
...
...
@@ -67,6 +67,9 @@
<string
name=
"flushing"
>
刷新中...
</string>
<string
name=
"add_profile"
>
添加配置文件
</string>
<string
name=
"udp_dns"
>
DNS转发
</string>
<string
name=
"udp_dns_summary"
>
向远程服务器转发UDP协议的DNS请求
</string>
<!-- profile -->
<string
name=
"add_profile_dialog"
>
为影梭添加此配置文件?
</string>
<string-array
name=
"add_profile_methods"
>
...
...
src/main/res/values/strings.xml
View file @
cc5fafbd
...
...
@@ -45,6 +45,8 @@
<string
name=
"auto_connect_summary"
>
Enable Shadowsocks on startup
</string>
<string
name=
"traffic_stat"
>
Traffic Stats
</string>
<string
name=
"traffic_stat_summary"
>
Show traffic stats in notification bar
</string>
<string
name=
"udp_dns"
>
DNS Forwarding
</string>
<string
name=
"udp_dns_summary"
>
Forward DNS\'s UDP packets to remote server
</string>
<!-- notification category -->
<string
name=
"forward_success"
>
Shadowsocks started.
</string>
...
...
src/main/res/xml/pref_feature.xml
View file @
cc5fafbd
...
...
@@ -22,10 +22,16 @@
<intent
android:action=
"com.github.shadowsocks.AppManager"
/>
</Preference>
<CheckBoxPreference
android:key=
"isTrafficStat"
android:defaultValue=
"true"
android:summary=
"@string/traffic_stat_summary"
android:title=
"@string/traffic_stat"
>
android:key=
"isTrafficStat"
android:defaultValue=
"true"
android:summary=
"@string/traffic_stat_summary"
android:title=
"@string/traffic_stat"
>
</CheckBoxPreference>
<CheckBoxPreference
android:key=
"isUdpDns"
android:defaultValue=
"false"
android:summary=
"@string/udp_dns_summary"
android:title=
"@string/udp_dns"
>
</CheckBoxPreference>
<CheckBoxPreference
android:key=
"isAutoConnect"
...
...
src/main/scala/com/github/shadowsocks/BaseService.scala
View file @
cc5fafbd
...
...
@@ -106,9 +106,8 @@ trait BaseService {
override
def
run
()
{
if
(
state
!=
s
)
{
val
n
=
callbacks
.
beginBroadcast
()
val
m
=
if
(
msg
!=
null
)
msg
.
substring
(
0
,
64
)
else
null
for
(
i
<-
0
to
n
-
1
)
{
callbacks
.
getBroadcastItem
(
i
).
stateChanged
(
s
,
m
)
callbacks
.
getBroadcastItem
(
i
).
stateChanged
(
s
,
m
sg
)
}
callbacks
.
finishBroadcast
()
state
=
s
...
...
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
cc5fafbd
...
...
@@ -122,7 +122,7 @@ object Shadowsocks {
val
PROXY_PREFS
=
Array
(
Key
.
profileName
,
Key
.
proxy
,
Key
.
remotePort
,
Key
.
localPort
,
Key
.
sitekey
,
Key
.
encMethod
)
val
FEATRUE_PREFS
=
Array
(
Key
.
isGFWList
,
Key
.
isGlobalProxy
,
Key
.
proxyedApps
,
Key
.
isTrafficStat
,
Key
.
isAutoConnect
)
Key
.
is
UdpDns
,
Key
.
is
AutoConnect
)
val
TAG
=
"Shadowsocks"
val
REQUEST_CONNECT
=
1
...
...
@@ -162,6 +162,7 @@ object Shadowsocks {
case
Key
.
isGFWList
=>
updateCheckBoxPreference
(
pref
,
profile
.
chnroute
)
case
Key
.
isGlobalProxy
=>
updateCheckBoxPreference
(
pref
,
profile
.
global
)
case
Key
.
isTrafficStat
=>
updateCheckBoxPreference
(
pref
,
profile
.
traffic
)
case
Key
.
isUdpDns
=>
updateCheckBoxPreference
(
pref
,
profile
.
udpdns
)
case
_
=>
}
}
...
...
@@ -417,10 +418,12 @@ class Shadowsocks
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/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
(
"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
(
"rm /data/data/com.github.shadowsocks/pdnsd.conf"
).
append
(
"\n"
)
sb
.
append
(
"rm /data/data/com.github.shadowsocks/pdnsd.cache"
).
append
(
"\n"
)
...
...
@@ -908,7 +911,8 @@ class Shadowsocks
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/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"
)
}
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
cc5fafbd
...
...
@@ -102,20 +102,28 @@ class ShadowsocksNatService extends Service with BaseService {
val
handler
:
Handler
=
new
Handler
()
def
startShadowsocksDaemon
()
{
val
cmd
:
String
=
(
Path
.
BASE
+
"s
hadowsocks
-b 127.0.0.1 -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f "
+
Path
.
BASE
+
"s
hadowsocks
.pid"
)
val
cmd
=
(
Path
.
BASE
+
"s
s-local
-b 127.0.0.1 -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f "
+
Path
.
BASE
+
"s
s-local
.pid"
)
.
format
(
config
.
proxy
,
config
.
remotePort
,
config
.
localPort
,
config
.
sitekey
,
config
.
encMethod
)
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
)
Utils
.
runCommand
(
cmd
)
}
def
startDnsDaemon
()
{
val
cmd
:
String
=
Path
.
BASE
+
"pdnsd -c "
+
Path
.
BASE
+
"pdnsd.conf"
val
conf
:
String
=
ConfigUtils
.
PDNSD
.
format
(
"127.0.0.1"
)
ConfigUtils
.
printToFile
(
new
File
(
Path
.
BASE
+
"pdnsd.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
val
cmd
=
if
(
config
.
isUdpDns
)
{
(
Path
.
BASE
+
"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 "
+
Path
.
BASE
+
"ss-local.pid"
)
.
format
(
config
.
proxy
,
config
.
remotePort
,
8153
,
config
.
sitekey
,
config
.
encMethod
)
}
else
{
val
conf
=
ConfigUtils
.
PDNSD
.
format
(
"127.0.0.1"
)
ConfigUtils
.
printToFile
(
new
File
(
Path
.
BASE
+
"pdnsd.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
Path
.
BASE
+
"pdnsd -c "
+
Path
.
BASE
+
"pdnsd.conf"
}
Utils
.
runCommand
(
cmd
)
}
...
...
@@ -271,8 +279,10 @@ class ShadowsocksNatService extends Service with BaseService {
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"pdnsd.pid`"
++=
"\n"
sb
++=
"killall -9 pdnsd"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"shadowsocks.pid`"
++=
"\n"
sb
++=
"killall -9 shadowsocks"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"ss-local.pid`"
++=
"\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
())
}
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
cc5fafbd
...
...
@@ -76,19 +76,26 @@ class ShadowsocksVpnService extends VpnService with BaseService {
def
startShadowsocksDaemon
()
{
val
cmd
:
String
=
(
Path
.
BASE
+
"s
hadowsocks
-b 127.0.0.1 -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f "
+
Path
.
BASE
+
"s
hadowsocks
.pid"
)
"s
s-local
-b 127.0.0.1 -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f "
+
Path
.
BASE
+
"s
s-local
.pid"
)
.
format
(
config
.
proxy
,
config
.
remotePort
,
config
.
localPort
,
config
.
sitekey
,
config
.
encMethod
)
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
)
System
.
exec
(
cmd
)
}
def
startDnsDaemon
()
{
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
)
})
val
cmd
=
if
(
config
.
isUdpDns
)
{
(
Path
.
BASE
+
"ss-tunnel -b 0.0.0.0 -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -L 8.8.8.8:53 -u -f "
+
Path
.
BASE
+
"ss-tunnel.pid"
)
.
format
(
config
.
proxy
,
config
.
remotePort
,
8153
,
config
.
sitekey
,
config
.
encMethod
)
}
else
{
val
conf
=
ConfigUtils
.
PDNSD
.
format
(
"0.0.0.0"
)
ConfigUtils
.
printToFile
(
new
File
(
Path
.
BASE
+
"pdnsd.conf"
))(
p
=>
{
p
.
println
(
conf
)
})
Path
.
BASE
+
"pdnsd -c "
+
Path
.
BASE
+
"pdnsd.conf"
}
Utils
.
runCommand
(
cmd
)
}
...
...
@@ -243,12 +250,14 @@ class ShadowsocksVpnService extends VpnService with BaseService {
def
killProcesses
()
{
val
sb
=
new
StringBuilder
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"shadowsocks.pid`"
++=
"\n"
sb
++=
"killall -9 shadowsocks"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"ss-local.pid`"
++=
"\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
++=
"killall -9 tun2socks"
++=
"\n"
sb
++=
"kill -9 `cat "
++=
Path
.
BASE
++=
"pdnsd.pid`"
++=
"\n"
sb
++=
"killall -9 pdnsd"
++=
"\n"
//
sb ++= "kill -9 `cat " ++= Path.BASE ++= "pdnsd.pid`" ++= "\n"
//
sb ++= "killall -9 pdnsd" ++= "\n"
Utils
.
runCommand
(
sb
.
toString
())
}
...
...
src/main/scala/com/github/shadowsocks/database/DBHelper.scala
View file @
cc5fafbd
...
...
@@ -50,7 +50,7 @@ object DBHelper {
val
PROFILE
=
"profile.db"
}
class
DBHelper
(
val
context
:
Context
)
extends
OrmLiteSqliteOpenHelper
(
context
,
DBHelper
.
PROFILE
,
null
,
7
)
{
class
DBHelper
(
val
context
:
Context
)
extends
OrmLiteSqliteOpenHelper
(
context
,
DBHelper
.
PROFILE
,
null
,
8
)
{
lazy
val
profileDao
:
Dao
[
Profile
,
Int
]
=
getDao
(
classOf
[
Profile
])
...
...
@@ -59,7 +59,11 @@ class DBHelper(val context: Context) extends OrmLiteSqliteOpenHelper(context, DB
}
def
onUpgrade
(
database
:
SQLiteDatabase
,
connectionSource
:
ConnectionSource
,
oldVersion
:
Int
,
newVersion
:
Int
)
{
TableUtils
.
dropTable
(
connectionSource
,
classOf
[
Profile
],
true
)
if
(
oldVersion
<
8
)
{
profileDao
.
executeRaw
(
"ALTER TABLE `profile` ADD COLUMN udpdns INTEGER;"
)
}
else
{
TableUtils
.
dropTable
(
connectionSource
,
classOf
[
Profile
],
true
)
}
onCreate
(
database
,
connectionSource
)
}
}
src/main/scala/com/github/shadowsocks/database/Profile.scala
View file @
cc5fafbd
...
...
@@ -84,6 +84,9 @@ class Profile {
@DatabaseField
var
traffic
:
Boolean
=
false
@DatabaseField
var
udpdns
:
Boolean
=
false
@DatabaseField
(
dataType
=
DataType
.
LONG_STRING
)
var
individual
:
String
=
""
...
...
src/main/scala/com/github/shadowsocks/database/ProfileManager.scala
View file @
cc5fafbd
...
...
@@ -121,6 +121,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
edit
.
putBoolean
(
Key
.
isGFWList
,
profile
.
chnroute
)
edit
.
putBoolean
(
Key
.
isBypassApps
,
profile
.
bypass
)
edit
.
putBoolean
(
Key
.
isTrafficStat
,
profile
.
traffic
)
edit
.
putBoolean
(
Key
.
isUdpDns
,
profile
.
udpdns
)
edit
.
putString
(
Key
.
profileName
,
profile
.
name
)
edit
.
putString
(
Key
.
proxy
,
profile
.
host
)
edit
.
putString
(
Key
.
sitekey
,
profile
.
password
)
...
...
@@ -143,6 +144,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
profile
.
chnroute
=
settings
.
getBoolean
(
Key
.
isGFWList
,
false
)
profile
.
bypass
=
settings
.
getBoolean
(
Key
.
isBypassApps
,
false
)
profile
.
traffic
=
settings
.
getBoolean
(
Key
.
isTrafficStat
,
false
)
profile
.
udpdns
=
settings
.
getBoolean
(
Key
.
isUdpDns
,
false
)
profile
.
name
=
settings
.
getString
(
Key
.
profileName
,
"default"
)
profile
.
host
=
settings
.
getString
(
Key
.
proxy
,
"127.0.0.1"
)
profile
.
password
=
settings
.
getString
(
Key
.
sitekey
,
"default"
)
...
...
src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala
View file @
cc5fafbd
...
...
@@ -84,7 +84,8 @@ object ConfigUtils {
val
method
=
proxy
(
3
).
trim
new
Config
(
config
.
isGlobalProxy
,
config
.
isGFWList
,
config
.
isBypassApps
,
config
.
isTrafficStat
,
config
.
profileName
,
host
,
password
,
method
,
config
.
proxiedAppString
,
port
,
config
.
localPort
)
config
.
isUdpDns
,
config
.
profileName
,
host
,
password
,
method
,
config
.
proxiedAppString
,
port
,
config
.
localPort
)
}
def
load
(
settings
:
SharedPreferences
)
:
Config
=
{
...
...
@@ -92,6 +93,7 @@ object ConfigUtils {
val
isGFWList
=
settings
.
getBoolean
(
Key
.
isGFWList
,
false
)
val
isBypassApps
=
settings
.
getBoolean
(
Key
.
isBypassApps
,
false
)
val
isTrafficStat
=
settings
.
getBoolean
(
Key
.
isTrafficStat
,
false
)
val
isUdpDns
=
settings
.
getBoolean
(
Key
.
isUdpDns
,
false
)
val
profileName
=
settings
.
getString
(
Key
.
profileName
,
"default"
)
val
proxy
=
settings
.
getString
(
Key
.
proxy
,
"127.0.0.1"
)
...
...
@@ -111,7 +113,7 @@ object ConfigUtils {
}
val
proxiedAppString
=
settings
.
getString
(
Key
.
proxied
,
""
)
new
Config
(
isGlobalProxy
,
isGFWList
,
isBypassApps
,
isTrafficStat
,
profileName
,
proxy
,
sitekey
,
new
Config
(
isGlobalProxy
,
isGFWList
,
isBypassApps
,
isTrafficStat
,
isUdpDns
,
profileName
,
proxy
,
sitekey
,
encMethod
,
proxiedAppString
,
remotePort
,
localPort
)
}
...
...
src/main/scala/com/github/shadowsocks/utils/Constants.scala
View file @
cc5fafbd
...
...
@@ -70,6 +70,7 @@ object Key {
val
isGFWList
=
"isGFWList"
val
isBypassApps
=
"isBypassApps"
val
isTrafficStat
=
"isTrafficStat"
val
isUdpDns
=
"isUdpDns"
val
proxy
=
"proxy"
val
sitekey
=
"sitekey"
...
...
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