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
4817539c
Commit
4817539c
authored
Aug 07, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UDP forward
parent
03c85753
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
13 deletions
+15
-13
kcptun/go
kcptun/go
+1
-1
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+2
-2
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+12
-10
No files found.
go
@
f3e7e7b6
Subproject commit
3549a9d3740b5cd9d284cdad1d101bd14888cc85
Subproject commit
f3e7e7b69f0fd0c22858d09b4dd3764ed703d140
src/main/AndroidManifest.xml
View file @
4817539c
<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=
"14
3
"
android:versionCode=
"14
4
"
android:versionName=
"3.0.
1
"
>
android:versionName=
"3.0.
2
"
>
<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/ShadowsocksVpnService.scala
View file @
4817539c
...
@@ -182,25 +182,25 @@ class ShadowsocksVpnService extends VpnService with BaseService {
...
@@ -182,25 +182,25 @@ class ShadowsocksVpnService extends VpnService with BaseService {
/** Called when the activity is first created. */
/** Called when the activity is first created. */
def
handleConnection
:
Boolean
=
{
def
handleConnection
:
Boolean
=
{
if
(!
profile
.
udpdns
)
{
val
fd
=
startVpn
()
startDnsDaemon
()
if
(!
sendFd
(
fd
))
return
false
startDnsTunnel
()
if
(
profile
.
kcp
)
{
startKcptunDaemon
()
}
}
startShadowsocksDaemon
()
startShadowsocksDaemon
()
if
(
profile
.
udpdns
)
{
if
(
profile
.
udpdns
&&
profile
.
kcp
)
{
startShadowsocksUDPDaemon
()
startShadowsocksUDPDaemon
()
}
}
val
fd
=
startVpn
()
if
(!
profile
.
udpdns
)
{
val
ret
=
sendFd
(
fd
)
startDnsDaemon
()
startDnsTunnel
()
if
(
ret
&&
profile
.
kcp
)
{
startKcptunDaemon
()
}
}
ret
true
}
}
def
startKcptunDaemon
()
{
def
startKcptunDaemon
()
{
...
@@ -274,6 +274,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
...
@@ -274,6 +274,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
if
(
profile
.
auth
)
cmd
+=
"-A"
if
(
profile
.
auth
)
cmd
+=
"-A"
if
(
profile
.
udpdns
&&
!
profile
.
kcp
)
cmd
+=
"-u"
if
(
profile
.
route
!=
Route
.
ALL
)
{
if
(
profile
.
route
!=
Route
.
ALL
)
{
cmd
+=
"--acl"
cmd
+=
"--acl"
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/acl.list"
)
cmd
+=
(
getApplicationInfo
.
dataDir
+
"/acl.list"
)
...
...
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