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
e22ffa86
Commit
e22ffa86
authored
Dec 06, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve DNS utils
parent
4df7634f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
57 additions
and
7 deletions
+57
-7
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+40
-7
src/main/scala/com/github/shadowsocks/utils/DnsUtils.scala
src/main/scala/com/github/shadowsocks/utils/DnsUtils.scala
+17
-0
No files found.
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
e22ffa86
...
...
@@ -41,6 +41,8 @@ package com.github.shadowsocks
import
java.io.File
import
java.lang.reflect.
{
InvocationTargetException
,
Method
}
import
java.net.InetAddress
import
java.util
import
android.app.
{
Notification
,
NotificationManager
,
PendingIntent
,
Service
}
import
android.content._
...
...
@@ -48,7 +50,7 @@ import android.content.pm.{PackageInfo, PackageManager}
import
android.net.
{
Network
,
ConnectivityManager
}
import
android.os._
import
android.support.v4.app.NotificationCompat
import
android.util.
Log
import
android.util.
{
SparseArray
,
Log
}
import
android.widget.Toast
import
com.github.shadowsocks.aidl.Config
import
com.github.shadowsocks.utils._
...
...
@@ -88,6 +90,23 @@ class ShadowsocksNatService extends Service with BaseService {
private
lazy
val
application
=
getApplication
.
asInstanceOf
[
ShadowsocksApplication
]
private
val
dnsAddressCache
=
new
SparseArray
[
String
]
def
restoreDnsForAllNetwork
()
{
val
manager
=
getSystemService
(
Context
.
CONNECTIVITY_SERVICE
).
asInstanceOf
[
ConnectivityManager
]
val
networks
=
manager
.
getAllNetworks
val
cmdBuf
=
new
ArrayBuffer
[
String
]()
networks
.
foreach
(
network
=>
{
val
netId
=
DnsUtils
.
getNetId
(
network
)
val
oldDns
=
dnsAddressCache
.
get
(
netId
)
if
(
oldDns
!=
null
)
{
cmdBuf
.
append
(
"ndc resolver setnetdns %d \"\" %s"
.
format
(
netId
,
oldDns
))
dnsAddressCache
.
remove
(
netId
)
}
})
if
(
cmdBuf
.
nonEmpty
)
Console
.
runRootCommand
(
cmdBuf
.
toArray
)
}
def
setDnsForAllNetwork
(
dns
:
String
)
{
val
manager
=
getSystemService
(
Context
.
CONNECTIVITY_SERVICE
).
asInstanceOf
[
ConnectivityManager
]
val
networks
=
manager
.
getAllNetworks
...
...
@@ -95,19 +114,33 @@ class ShadowsocksNatService extends Service with BaseService {
networks
.
foreach
(
network
=>
{
val
networkInfo
=
manager
.
getNetworkInfo
(
network
)
if
(
networkInfo
.
isAvailable
)
{
val
netId
=
network
.
getClass
.
getDeclaredField
(
"netId"
).
get
(
network
).
asInstanceOf
[
Int
]
val
netId
=
DnsUtils
.
getNetId
(
network
)
try
{
val
curDnsList
=
DnsUtils
.
getDnsServers
(
manager
,
network
)
if
(
curDnsList
!=
null
)
{
import
scala.collection.JavaConverters._
val
curDns
=
curDnsList
.
asScala
.
map
(
ip
=>
ip
.
getHostAddress
).
mkString
(
" "
)
if
(
curDns
!=
dns
)
{
dnsAddressCache
.
put
(
netId
,
curDns
)
cmdBuf
.
append
(
"ndc resolver setnetdns %d \"\" %s"
.
format
(
netId
,
dns
))
}
}
}
catch
{
case
ex
:
Exception
=>
cmdBuf
.
append
(
"ndc resolver setnetdns %d \"\" %s"
.
format
(
netId
,
dns
))
Log
.
e
(
TAG
,
"Unable to get DNS info"
,
ex
)
}
}
})
Console
.
runRootCommand
(
cmdBuf
.
toArray
)
if
(
cmdBuf
.
nonEmpty
)
Console
.
runRootCommand
(
cmdBuf
.
toArray
)
}
def
setupDns
()
=
{
def
setupDns
()
{
setDnsForAllNetwork
(
"127.0.0.1"
)
}
def
resetDns
()
=
{
setDnsForAllNetwork
(
"8.8.8.8 208.67.222.222 114.114.114.114"
)
def
resetDns
()
{
restoreDnsForAllNetwork
(
)
}
def
destroyConnectionReceiver
()
{
...
...
src/main/scala/com/github/shadowsocks/utils/DnsUtils.scala
0 → 100644
View file @
e22ffa86
package
com.github.shadowsocks.utils
import
java.net.InetAddress
import
android.net.
{
Network
,
ConnectivityManager
}
object
DnsUtils
{
def
getDnsServers
(
mgr
:
ConnectivityManager
,
network
:
Network
)
:
java.util.List
[
InetAddress
]
=
{
val
getLinkProperties
=
mgr
.
getClass
.
getMethod
(
"getLinkProperties"
,
network
.
getClass
)
getLinkProperties
.
invoke
(
mgr
,
network
).
asInstanceOf
[
java.util.List
[
InetAddress
]]
}
def
getNetId
(
network
:
Network
)
:
Int
=
{
network
.
getClass
.
getDeclaredField
(
"netId"
).
get
(
network
).
asInstanceOf
[
Int
]
}
}
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