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
01306d52
Commit
01306d52
authored
Dec 02, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refine DNS settings
parent
5547b422
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
33 additions
and
16 deletions
+33
-16
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+33
-16
No files found.
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
01306d52
...
...
@@ -73,7 +73,7 @@ class ShadowsocksNatService extends Service with BaseService {
private
val
mSetForegroundSignature
=
Array
[
Class
[
_
]](
classOf
[
Boolean
])
var
closeReceiver
:
BroadcastReceiver
=
null
var
conReceiver
:
BroadcastReceiver
=
null
var
con
n
Receiver
:
BroadcastReceiver
=
null
var
notificationManager
:
NotificationManager
=
null
var
config
:
Config
=
null
var
apps
:
Array
[
ProxiedApp
]
=
null
...
...
@@ -110,23 +110,41 @@ class ShadowsocksNatService extends Service with BaseService {
setDnsForAllNetwork
(
"114.114.114.114 8.8.8.8 208.67.222.222"
)
}
def
flushDns
()
{
if
(
Utils
.
isLollipopOrAbove
)
{
val
manager
=
getSystemService
(
Context
.
CONNECTIVITY_SERVICE
).
asInstanceOf
[
ConnectivityManager
]
val
networks
=
manager
.
getAllNetworks
val
cmdBuf
=
new
ArrayBuffer
[
String
]()
networks
.
foreach
(
network
=>
{
val
networkInfo
=
manager
.
getNetworkInfo
(
network
)
if
(
networkInfo
.
isAvailable
)
{
val
netId
=
network
.
getClass
.
getDeclaredField
(
"netId"
).
get
(
network
).
asInstanceOf
[
Int
]
cmdBuf
.
append
(
"ndc resolver flushnet %d"
.
format
(
netId
))
}
})
Console
.
runRootCommand
(
cmdBuf
.
toArray
)
}
else
{
Console
.
runRootCommand
(
Array
(
"ndc resolver flushdefaultif"
,
"ndc resolver flushif wlan0"
))
}
}
def
destroyConnectionReceiver
()
{
if
(
conReceiver
!=
null
)
{
unregisterReceiver
(
conReceiver
)
conReceiver
=
null
if
(
con
n
Receiver
!=
null
)
{
unregisterReceiver
(
con
n
Receiver
)
con
n
Receiver
=
null
}
resetDns
()
}
def
initConnectionReceiver
()
{
setupDns
()
val
filter
=
new
IntentFilter
(
ConnectivityManager
.
CONNECTIVITY_ACTION
)
conReceiver
=
new
BroadcastReceiver
{
con
n
Receiver
=
new
BroadcastReceiver
{
override
def
onReceive
(
context
:
Context
,
intent
:
Intent
)
=
{
setupDns
()
}
}
registerReceiver
(
conReceiver
,
filter
)
registerReceiver
(
con
n
Receiver
,
filter
)
}
def
startShadowsocksDaemon
()
{
...
...
@@ -266,7 +284,6 @@ class ShadowsocksNatService extends Service with BaseService {
startRedsocksDaemon
()
startShadowsocksDaemon
()
setupIptables
()
flushDNS
()
true
}
...
...
@@ -364,10 +381,6 @@ class ShadowsocksNatService extends Service with BaseService {
Console
.
runRootCommand
(
Utils
.
getIptables
+
" -t nat -F OUTPUT"
)
}
def
flushDNS
()
{
Console
.
runRootCommand
(
Array
(
"ndc resolver flushdefaultif"
,
"ndc resolver flushif wlan0"
))
}
def
setupIptables
()
=
{
val
init_sb
=
new
ArrayBuffer
[
String
]
val
http_sb
=
new
ArrayBuffer
[
String
]
...
...
@@ -454,6 +467,9 @@ class ShadowsocksNatService extends Service with BaseService {
config
=
c
// register connection receiver
if
(
Utils
.
isLollipopOrAbove
)
initConnectionReceiver
()
// register close receiver
val
filter
=
new
IntentFilter
()
filter
.
addAction
(
Intent
.
ACTION_SHUTDOWN
)
...
...
@@ -466,9 +482,6 @@ class ShadowsocksNatService extends Service with BaseService {
}
registerReceiver
(
closeReceiver
,
filter
)
// register connection receiver
if
(
Utils
.
isLollipopOrAbove
)
initConnectionReceiver
()
// send event
application
.
tracker
.
send
(
new
HitBuilders
.
EventBuilder
()
.
setCategory
(
TAG
)
...
...
@@ -486,7 +499,6 @@ class ShadowsocksNatService extends Service with BaseService {
config
=
ConfigUtils
.
getPublicConfig
(
getBaseContext
,
holder
.
getContainer
,
config
)
}
catch
{
case
ex
:
Exception
=>
Log
.
e
(
TAG
,
ex
.
getMessage
)
changeState
(
State
.
STOPPED
,
getString
(
R
.
string
.
service_failed
))
stopRunner
()
config
=
null
...
...
@@ -495,8 +507,13 @@ class ShadowsocksNatService extends Service with BaseService {
if
(
config
!=
null
)
{
// Clean up
killProcesses
()
// Set DNS
if
(
Utils
.
isLollipopOrAbove
)
setupDns
()
flushDns
()
var
resolved
:
Boolean
=
false
if
(!
InetAddressUtils
.
isIPv4Address
(
config
.
proxy
)
&&
!
InetAddressUtils
.
isIPv6Address
(
config
.
proxy
))
{
...
...
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