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
069cc152
Commit
069cc152
authored
Aug 27, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #839 #838
parent
7b57be66
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
25 deletions
+26
-25
project/plugins.sbt
project/plugins.sbt
+1
-1
src/main/res/xml/pref_all.xml
src/main/res/xml/pref_all.xml
+0
-1
src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
...scala/com/github/shadowsocks/ShadowsocksApplication.scala
+8
-1
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
...in/scala/com/github/shadowsocks/ShadowsocksSettings.scala
+6
-3
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
+2
-0
src/main/scala/com/github/shadowsocks/utils/TcpFastOpen.scala
...main/scala/com/github/shadowsocks/utils/TcpFastOpen.scala
+7
-17
No files found.
project/plugins.sbt
View file @
069cc152
addSbtPlugin
(
"org.scala-android"
%
"sbt-android"
%
"1.6.1
3
"
)
addSbtPlugin
(
"org.scala-android"
%
"sbt-android"
%
"1.6.1
4
"
)
addSbtPlugin
(
"com.timushev.sbt"
%
"sbt-updates"
%
"0.1.10"
)
addSbtPlugin
(
"com.timushev.sbt"
%
"sbt-updates"
%
"0.1.10"
)
...
...
src/main/res/xml/pref_all.xml
View file @
069cc152
...
@@ -112,7 +112,6 @@
...
@@ -112,7 +112,6 @@
<SwitchPreference
<SwitchPreference
android:key=
"tcp_fastopen"
android:key=
"tcp_fastopen"
android:persistent=
"false"
android:summary=
"@string/tcp_fastopen_summary"
android:summary=
"@string/tcp_fastopen_summary"
android:title=
"TCP Fast Open"
/>
android:title=
"TCP Fast Open"
/>
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
View file @
069cc152
...
@@ -46,7 +46,7 @@ import android.app.Application
...
@@ -46,7 +46,7 @@ import android.app.Application
import
android.preference.PreferenceManager
import
android.preference.PreferenceManager
import
android.support.v7.app.AppCompatDelegate
import
android.support.v7.app.AppCompatDelegate
import
com.github.shadowsocks.database.
{
DBHelper
,
ProfileManager
}
import
com.github.shadowsocks.database.
{
DBHelper
,
ProfileManager
}
import
com.github.shadowsocks.utils.
{
Key
,
Utils
}
import
com.github.shadowsocks.utils.
{
Key
,
Utils
,
TcpFastOpen
}
import
com.google.android.gms.analytics.
{
GoogleAnalytics
,
HitBuilders
,
StandardExceptionParser
}
import
com.google.android.gms.analytics.
{
GoogleAnalytics
,
HitBuilders
,
StandardExceptionParser
}
import
com.google.android.gms.common.api.ResultCallback
import
com.google.android.gms.common.api.ResultCallback
import
com.google.android.gms.tagmanager.
{
ContainerHolder
,
TagManager
}
import
com.google.android.gms.tagmanager.
{
ContainerHolder
,
TagManager
}
...
@@ -111,6 +111,13 @@ class ShadowsocksApplication extends Application {
...
@@ -111,6 +111,13 @@ class ShadowsocksApplication extends Application {
}
}
}
}
pending
.
setResultCallback
(
callback
,
2
,
TimeUnit
.
SECONDS
)
pending
.
setResultCallback
(
callback
,
2
,
TimeUnit
.
SECONDS
)
// TFO
val
tfo
=
settings
.
getBoolean
(
Key
.
tfo
,
false
)
if
(
tfo
&&
!
TcpFastOpen
.
isEnabled
)
{
TcpFastOpen
.
enabled
(
true
)
}
}
}
def
refreshContainerHolder
{
def
refreshContainerHolder
{
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
069cc152
...
@@ -105,7 +105,7 @@ class ShadowsocksNatService extends BaseService {
...
@@ -105,7 +105,7 @@ class ShadowsocksNatService extends BaseService {
if
(
profile
.
auth
)
cmd
+=
"-A"
if
(
profile
.
auth
)
cmd
+=
"-A"
if
(
TcpFastOpen
.
send
Enabled
)
cmd
+=
"--fast-open"
if
(
TcpFastOpen
.
is
Enabled
)
cmd
+=
"--fast-open"
if
(
profile
.
route
!=
Route
.
ALL
)
{
if
(
profile
.
route
!=
Route
.
ALL
)
{
cmd
+=
"--acl"
cmd
+=
"--acl"
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
View file @
069cc152
...
@@ -155,14 +155,17 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
...
@@ -155,14 +155,17 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
}
}
switch
.
setChecked
(
BootReceiver
.
getEnabled
(
activity
))
switch
.
setChecked
(
BootReceiver
.
getEnabled
(
activity
))
val
tfo
=
findPreference
(
"tcp_fastopen"
).
asInstanceOf
[
SwitchPreference
]
if
(
getPreferenceManager
.
getSharedPreferences
.
getBoolean
(
Key
.
tfo
,
false
)
&&
!
TcpFastOpen
.
isEnabled
)
{
tfo
.
setChecked
(
TcpFastOpen
.
sendEnabled
)
TcpFastOpen
.
enabled
(
true
)
}
val
tfo
=
findPreference
(
Key
.
tfo
).
asInstanceOf
[
SwitchPreference
]
tfo
.
setChecked
(
TcpFastOpen
.
isEnabled
)
tfo
.
setOnPreferenceChangeListener
((
_
,
v
)
=>
{
tfo
.
setOnPreferenceChangeListener
((
_
,
v
)
=>
{
val
value
=
v
.
asInstanceOf
[
Boolean
]
val
value
=
v
.
asInstanceOf
[
Boolean
]
val
result
=
TcpFastOpen
.
enabled
(
value
)
val
result
=
TcpFastOpen
.
enabled
(
value
)
if
(
result
!=
null
&&
result
!=
"Success."
)
if
(
result
!=
null
&&
result
!=
"Success."
)
Snackbar
.
make
(
activity
.
findViewById
(
android
.
R
.
id
.
content
),
result
,
Snackbar
.
LENGTH_LONG
).
show
()
Snackbar
.
make
(
activity
.
findViewById
(
android
.
R
.
id
.
content
),
result
,
Snackbar
.
LENGTH_LONG
).
show
()
value
==
TcpFastOpen
.
send
Enabled
value
==
TcpFastOpen
.
is
Enabled
})
})
if
(!
TcpFastOpen
.
supported
)
{
if
(!
TcpFastOpen
.
supported
)
{
tfo
.
setEnabled
(
false
)
tfo
.
setEnabled
(
false
)
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
069cc152
...
@@ -266,7 +266,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
...
@@ -266,7 +266,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/acl.list"
)
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/acl.list"
)
}
}
if
(
TcpFastOpen
.
send
Enabled
)
cmd
+=
"--fast-open"
if
(
TcpFastOpen
.
is
Enabled
)
cmd
+=
"--fast-open"
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
.
mkString
(
" "
))
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
.
mkString
(
" "
))
...
...
src/main/scala/com/github/shadowsocks/utils/Constants.scala
View file @
069cc152
...
@@ -171,6 +171,8 @@ object Key {
...
@@ -171,6 +171,8 @@ object Key {
val
kcp
=
"kcp"
val
kcp
=
"kcp"
val
kcpPort
=
"kcpPort"
val
kcpPort
=
"kcpPort"
val
kcpcli
=
"kcpcli"
val
kcpcli
=
"kcpcli"
val
tfo
=
"tcp_fastopen"
}
}
object
State
{
object
State
{
...
...
src/main/scala/com/github/shadowsocks/utils/TcpFastOpen.scala
View file @
069cc152
...
@@ -23,28 +23,18 @@ object TcpFastOpen {
...
@@ -23,28 +23,18 @@ object TcpFastOpen {
case
_
=>
false
case
_
=>
false
}
}
def
send
Enabled
=
{
def
is
Enabled
=
{
val
file
=
new
File
(
"/proc/sys/net/ipv4/tcp_fastopen"
)
val
file
=
new
File
(
"/proc/sys/net/ipv4/tcp_fastopen"
)
file
.
canRead
&&
(
Utils
.
readAllLines
(
file
).
toInt
&
1
)
>
0
file
.
canRead
&&
(
Utils
.
readAllLines
(
file
).
toInt
&
1
)
>
0
}
}
def
enabled
(
value
:
Boolean
)
=
def
enabled
(
value
:
Boolean
)
:
String
=
{
Shell
.
run
(
"su"
,
Array
(
val
res
=
Shell
.
run
(
"su"
,
Array
(
"if echo "
+
(
if
(
value
)
3
else
0
)
+
" > /proc/sys/net/ipv4/tcp_fastopen; then"
,
"if echo "
+
(
if
(
value
)
3
else
0
)
+
" > /proc/sys/net/ipv4/tcp_fastopen; then"
,
" success=-1"
,
" echo Success."
,
" if mount -o rw,remount /dev/block/platform/msm_sdcc.1/by-name/system /system; then"
,
if
(
value
)
" echo '#!/system/bin/sh\n"
+
"echo 3 > /proc/sys/net/ipv4/tcp_fastopen' > /etc/init.d/tcp_fastopen && chmod 755 /etc/init.d/tcp_fastopen"
else
"rm -f /etc/init.d/tcp_fastopen"
,
" success=$?"
,
" mount -o ro,remount /dev/block/platform/msm_sdcc.1/by-name/system /system"
,
" fi"
,
" if [ $success -eq 0 ]; then"
,
" echo Success."
,
" else"
,
" echo Warning: Unable to create boot script."
,
" fi"
,
"else"
,
"else"
,
" echo Failed."
,
" echo Failed."
,
"fi"
),
null
,
true
).
asScala
.
mkString
(
"\n"
)
"fi"
),
null
,
true
)
if
(
res
!=
null
)
res
.
asScala
.
mkString
(
"\n"
)
else
null
}
}
}
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