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
fbcf90e6
Commit
fbcf90e6
authored
May 20, 2013
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
choose vpn's vlan smartly
parent
2eb0b193
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
10 deletions
+30
-10
src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
+23
-8
src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
...ain/scala/com/github/shadowsocks/ShadowsocksService.scala
+7
-2
No files found.
src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
View file @
fbcf90e6
...
...
@@ -81,6 +81,9 @@ class ShadowVpnService extends VpnService {
val
MSG_STOP_SELF
:
Int
=
5
val
VPN_MTU
=
1500
val
PRIVATE_VLAN_10
=
"10.254.254.%d"
val
PRIVATE_VLAN_172
=
"172.30.254.%d"
var
conn
:
ParcelFileDescriptor
=
null
var
udpgw
:
String
=
null
var
notificationManager
:
NotificationManager
=
null
...
...
@@ -204,6 +207,8 @@ class ShadowVpnService extends VpnService {
def
run
()
{
handler
.
sendEmptyMessage
(
MSG_CONNECT_START
)
killProcesses
()
// Resolve server address
var
resolved
:
Boolean
=
false
if
(!
InetAddressUtils
.
isIPv4Address
(
appHost
)
&&
!
InetAddressUtils
.
isIPv6Address
(
appHost
))
{
...
...
@@ -265,11 +270,16 @@ class ShadowVpnService extends VpnService {
val
prefix2
=
address
.
slice
(
0
,
2
).
mkString
(
"."
)
val
prefix3
=
address
.
slice
(
0
,
3
).
mkString
(
"."
)
val
localAddress
=
Utils
.
getIPv4Address
match
{
case
Some
(
ip
)
if
ip
.
split
(
'.'
)(
0
)
==
"172"
=>
PRIVATE_VLAN_10
case
_
=>
PRIVATE_VLAN_172
}
val
builder
=
new
Builder
()
builder
.
setSession
(
getString
(
R
.
string
.
app_name
))
.
setMtu
(
VPN_MTU
)
.
addAddress
(
"172.16.0.1"
,
24
)
.
addAddress
(
localAddress
.
format
(
1
)
,
24
)
.
addDnsServer
(
"8.8.8.8"
)
.
addDnsServer
(
"8.8.4.4"
)
...
...
@@ -310,10 +320,14 @@ class ShadowVpnService extends VpnService {
val
fd
=
conn
.
getFd
val
cmd
=
(
BASE
+
"tun2socks --netif-ipaddr 172.16.0.2 --udpgw-remote-server-addr %s:7300 "
+
"--netif-netmask 255.255.255.0 --socks-server-addr 127.0.0.1:%d --tunfd %d --tunmtu %d --pid "
+
BASE
+
"tun2socks.pid"
).
format
(
udpgw
,
localPort
,
fd
,
VPN_MTU
)
"tun2socks --netif-ipaddr %s "
+
"--udpgw-remote-server-addr %s:7300 "
+
"--netif-netmask 255.255.255.0 "
+
"--socks-server-addr 127.0.0.1:%d "
+
"--tunfd %d "
+
"--tunmtu %d "
+
"--pid %stun2socks.pid"
)
.
format
(
localAddress
.
format
(
2
),
udpgw
,
localPort
,
fd
,
VPN_MTU
,
BASE
)
Log
.
d
(
TAG
,
cmd
)
System
.
exec
(
cmd
)
...
...
@@ -321,6 +335,7 @@ class ShadowVpnService extends VpnService {
/** Called when the activity is first created. */
def
handleConnection
:
Boolean
=
{
startShadowsocksDaemon
()
startVpn
()
true
...
...
@@ -391,7 +406,7 @@ class ShadowVpnService extends VpnService {
}
new
Thread
{
override
def
run
()
{
onDisconnect
()
killProcesses
()
}
}.
start
()
val
ed
:
SharedPreferences.Editor
=
settings
.
edit
...
...
@@ -412,7 +427,7 @@ class ShadowVpnService extends VpnService {
super
.
onDestroy
()
}
def
onDisconnect
()
{
def
killProcesses
()
{
val
sb
=
new
StringBuilder
if
(!
waitForProcess
(
"shadowsocks"
))
{
sb
++=
"kill -9 `cat /data/data/com.github.shadowsocks/shadowsocks.pid`"
++=
"\n"
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
View file @
fbcf90e6
...
...
@@ -201,6 +201,7 @@ class ShadowsocksService extends Service {
stopSelf
()
return
}
appHost
=
settings
.
getString
(
"proxy"
,
"127.0.0.1"
)
sitekey
=
settings
.
getString
(
"sitekey"
,
"default"
)
encMethod
=
settings
.
getString
(
"encMethod"
,
"table"
)
...
...
@@ -229,6 +230,9 @@ class ShadowsocksService extends Service {
new
Thread
(
new
Runnable
{
def
run
()
{
handler
.
sendEmptyMessage
(
MSG_CONNECT_START
)
killProcesses
()
var
resolved
:
Boolean
=
false
if
(!
InetAddressUtils
.
isIPv4Address
(
appHost
)
&&
!
InetAddressUtils
.
isIPv6Address
(
appHost
))
{
Utils
.
resolve
(
appHost
,
enableIPv6
=
true
)
match
{
...
...
@@ -243,6 +247,7 @@ class ShadowsocksService extends Service {
Log
.
d
(
TAG
,
"IPTABLES: "
+
Utils
.
getIptables
)
hasRedirectSupport
=
Utils
.
getHasRedirectSupport
if
(
resolved
&&
handleConnection
)
{
notifyForegroundAlert
(
getString
(
R
.
string
.
forward_success
),
getString
(
R
.
string
.
service_running
))
...
...
@@ -406,7 +411,7 @@ class ShadowsocksService extends Service {
stopForegroundCompat
(
1
)
new
Thread
{
override
def
run
()
{
onDisconnect
()
killProcesses
()
}
}.
start
()
...
...
@@ -424,7 +429,7 @@ class ShadowsocksService extends Service {
super
.
onDestroy
()
}
def
onDisconnect
()
{
def
killProcesses
()
{
Utils
.
runRootCommand
(
Utils
.
getIptables
+
" -t nat -F OUTPUT"
)
val
sb
=
new
StringBuilder
...
...
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