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
ac0a8c76
Commit
ac0a8c76
authored
Sep 24, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump version
parent
63fc69f4
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
18 deletions
+5
-18
kcptun/kcptun
kcptun/kcptun
+1
-1
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+2
-2
src/main/scala/com/github/shadowsocks/BaseService.scala
src/main/scala/com/github/shadowsocks/BaseService.scala
+0
-11
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+1
-1
src/main/scala/com/github/shadowsocks/utils/Constants.scala
src/main/scala/com/github/shadowsocks/utils/Constants.scala
+0
-2
No files found.
kcptun
@
ced94f78
Subproject commit
46dd8eab14587d88d37d5d36146f0a059f254949
Subproject commit
ced94f782036ce0bca1a8a1dfffd5ecd570bb204
src/main/AndroidManifest.xml
View file @
ac0a8c76
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
package=
"com.github.shadowsocks"
xmlns:tools=
"http://schemas.android.com/tools"
package=
"com.github.shadowsocks"
android:versionCode=
"15
8
"
android:versionCode=
"15
9
"
android:versionName=
"3.1.
6
"
>
android:versionName=
"3.1.
7
"
>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
...
...
src/main/scala/com/github/shadowsocks/BaseService.scala
View file @
ac0a8c76
...
@@ -298,15 +298,4 @@ trait BaseService extends Service {
...
@@ -298,15 +298,4 @@ trait BaseService extends Service {
state
=
s
state
=
s
})
})
}
}
def
getBlackList
=
{
val
default
=
getString
(
R
.
string
.
black_list
)
try
{
val
container
=
app
.
containerHolder
.
getContainer
val
update
=
container
.
getString
(
"black_list"
)
if
(
update
==
null
||
update
.
isEmpty
)
default
else
update
}
catch
{
case
ex
:
Exception
=>
default
}
}
}
}
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
ac0a8c76
...
@@ -192,7 +192,7 @@ class ShadowsocksNatService extends BaseService {
...
@@ -192,7 +192,7 @@ class ShadowsocksNatService extends BaseService {
val
conf
=
profile
.
route
match
{
val
conf
=
profile
.
route
match
{
case
Route
.
BYPASS_CHN
|
Route
.
BYPASS_LAN_CHN
=>
{
case
Route
.
BYPASS_CHN
|
Route
.
BYPASS_LAN_CHN
=>
{
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
"127.0.0.1"
,
profile
.
localPort
+
53
,
getBlackList
,
""
,
profile
.
localPort
+
63
,
""
)
"127.0.0.1"
,
profile
.
localPort
+
53
,
""
,
profile
.
localPort
+
63
,
""
)
}
}
case
Route
.
GFWLIST
=>
{
case
Route
.
GFWLIST
=>
{
ConfigUtils
.
PDNSD_UDP
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
ConfigUtils
.
PDNSD_UDP
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
ac0a8c76
...
@@ -312,7 +312,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
...
@@ -312,7 +312,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
val
conf
=
profile
.
route
match
{
val
conf
=
profile
.
route
match
{
case
Route
.
BYPASS_CHN
|
Route
.
BYPASS_LAN_CHN
=>
{
case
Route
.
BYPASS_CHN
|
Route
.
BYPASS_LAN_CHN
=>
{
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
ConfigUtils
.
PDNSD_DIRECT
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
"0.0.0.0"
,
profile
.
localPort
+
53
,
getBlackList
,
ipv6
,
profile
.
localPort
+
63
,
ipv6
)
"0.0.0.0"
,
profile
.
localPort
+
53
,
ipv6
,
profile
.
localPort
+
63
,
ipv6
)
}
}
case
Route
.
GFWLIST
=>
{
case
Route
.
GFWLIST
=>
{
ConfigUtils
.
PDNSD_UDP
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
ConfigUtils
.
PDNSD_UDP
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
...
...
src/main/scala/com/github/shadowsocks/utils/Constants.scala
View file @
ac0a8c76
...
@@ -118,8 +118,6 @@ object ConfigUtils {
...
@@ -118,8 +118,6 @@ object ConfigUtils {
| label = "china-servers";
| label = "china-servers";
| ip = 1.2.4.8, 208.67.222.222, 114.114.114.114;
| ip = 1.2.4.8, 208.67.222.222, 114.114.114.114;
| timeout = 4;
| timeout = 4;
| exclude = %s;
| policy = included;
| uptest = none;
| uptest = none;
| preset = on;
| preset = on;
| %s
| %s
...
...
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