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
6c992c59
Commit
6c992c59
authored
Jul 12, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refine proguard rules and flushing DNS on Android 4.x
This reverts commit
7a87eab4
.
parent
3010ed7a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
85 deletions
+18
-85
build.sbt
build.sbt
+7
-8
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+3
-76
src/main/scala/com/github/shadowsocks/utils/Utils.scala
src/main/scala/com/github/shadowsocks/utils/Utils.scala
+8
-1
No files found.
build.sbt
View file @
6c992c59
...
...
@@ -51,14 +51,13 @@ proguardVersion in Android := "5.2.1"
proguardCache
in
Android
:=
Seq
()
proguardOptions
in
Android
++=
Seq
(
"-keep class com.github.shadowsocks.**"
,
"-keep class com.github.shadowsocks.System { *; }"
,
"-keep class me.dm7.**"
,
"-keep class com.google.android.gms.**"
,
"-keepattributes *Annotation*"
,
"-dontnote com.j256.ormlite.**"
,
"-dontnote org.xbill.**"
,
"-dontwarn org.xbill.**"
)
proguardOptions
in
Android
++=
Seq
(
"-keep class com.github.shadowsocks.System { *; }"
,
"-dontnote com.google.android.gms.internal.**"
,
"-dontnote com.j256.ormlite.**"
,
"-dontnote me.dm7.barcodescannerview.**"
,
"-dontnote org.xbill.**"
,
"-dontwarn org.xbill.**"
)
lazy
val
nativeBuild
=
TaskKey
[
Unit
](
"native-build"
,
"Build native executables"
)
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
6c992c59
...
...
@@ -45,12 +45,11 @@ import java.net.{Inet6Address, InetAddress}
import
java.util.Locale
import
android.content._
import
android.net.
{
ConnectivityManager
,
Network
}
import
android.os._
import
android.util.
{
Log
,
SparseArray
}
import
com.github.shadowsocks.utils._
import
android.util.Log
import
com.github.shadowsocks.ShadowsocksApplication.app
import
com.github.shadowsocks.database.Profile
import
com.github.shadowsocks.utils._
import
scala.collection.JavaConversions._
import
scala.collection.mutable.ArrayBuffer
...
...
@@ -71,78 +70,6 @@ class ShadowsocksNatService extends BaseService {
var
redsocksProcess
:
Process
=
_
var
pdnsdProcess
:
Process
=
_
private
val
dnsAddressCache
=
new
SparseArray
[
String
]
def
getNetId
(
network
:
Network
)
:
Int
=
{
network
.
getClass
.
getDeclaredField
(
"netId"
).
get
(
network
).
asInstanceOf
[
Int
]
}
def
restoreDnsForAllNetwork
()
{
val
manager
=
getSystemService
(
Context
.
CONNECTIVITY_SERVICE
).
asInstanceOf
[
ConnectivityManager
]
val
networks
=
manager
.
getAllNetworks
val
cmdBuf
=
new
ArrayBuffer
[
String
]()
networks
.
foreach
(
network
=>
{
val
netId
=
getNetId
(
network
)
val
oldDns
=
dnsAddressCache
.
get
(
netId
)
if
(
oldDns
!=
null
)
{
cmdBuf
.
append
(
"ndc resolver setnetdns %d \"\" %s"
.
formatLocal
(
Locale
.
ENGLISH
,
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
if
(
networks
==
null
)
return
val
cmdBuf
=
new
ArrayBuffer
[
String
]()
networks
.
foreach
(
network
=>
{
val
networkInfo
=
manager
.
getNetworkInfo
(
network
)
if
(
networkInfo
==
null
)
return
if
(
networkInfo
.
isConnected
)
{
val
netId
=
getNetId
(
network
)
val
curDnsList
=
manager
.
getLinkProperties
(
network
).
getDnsServers
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"
.
formatLocal
(
Locale
.
ENGLISH
,
netId
,
dns
))
}
}
}
})
if
(
cmdBuf
.
nonEmpty
)
Console
.
runRootCommand
(
cmdBuf
.
toArray
)
}
def
setupDns
()
{
setDnsForAllNetwork
(
"127.0.0.1"
)
}
def
resetDns
()
=
{
restoreDnsForAllNetwork
()
}
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"
.
formatLocal
(
Locale
.
ENGLISH
,
netId
))
}
})
Console
.
runRootCommand
(
cmdBuf
.
toArray
)
}
else
{
Console
.
runRootCommand
(
"ndc resolver flushdefaultif"
,
"ndc resolver flushif wlan0"
)
}
}
def
startShadowsocksDaemon
()
{
if
(
profile
.
route
!=
Route
.
ALL
)
{
val
acl
:
Array
[
Array
[
String
]]
=
profile
.
route
match
{
...
...
@@ -376,7 +303,7 @@ class ShadowsocksNatService extends BaseService {
stopRunner
(
true
)
}
else
if
(
handleConnection
)
{
// Set DNS
flushDns
()
Utils
.
flushDns
()
changeState
(
State
.
CONNECTED
)
notification
=
new
ShadowsocksNotification
(
this
,
profile
.
name
,
true
)
}
else
{
...
...
src/main/scala/com/github/shadowsocks/utils/Utils.scala
View file @
6c992c59
...
...
@@ -129,10 +129,17 @@ object Utils {
}
}
// Because /sys/class/net/* isn't accessible since API level 24
def
flushDns
()
=
Console
.
runRootCommand
(
"for if in /sys/class/net/*; do "
+
"if [ \"down\" != $(cat $if/operstate) ]; then "
+
// up or unknown
"ndc resolver flushif ${if##*/}; "
+
"fi "
+
"done"
)
// Blocked > 3 seconds
def
toggleAirplaneMode
(
context
:
Context
)
=
{
if
(
Console
.
isRoot
)
{
Console
.
runRootCommand
(
"ndc resolver flushdefaultif"
,
"ndc resolver flushif wlan0"
)
flushDns
(
)
true
}
else
if
(
Build
.
VERSION
.
SDK_INT
<
17
)
{
toggleBelowApiLevel17
(
context
)
...
...
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