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
ebda36ee
Commit
ebda36ee
authored
Mar 27, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not complete local resolving in IO dispatchers on Q
parent
f141dfb3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
core/src/main/java/com/github/shadowsocks/bg/DnsResolverCompat.kt
.../main/java/com/github/shadowsocks/bg/DnsResolverCompat.kt
+5
-1
core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
.../src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
+1
-2
core/src/main/java/com/github/shadowsocks/net/LocalDnsServer.kt
...rc/main/java/com/github/shadowsocks/net/LocalDnsServer.kt
+1
-1
No files found.
core/src/main/java/com/github/shadowsocks/bg/DnsResolverCompat.kt
View file @
ebda36ee
...
...
@@ -26,6 +26,9 @@ import android.net.Network
import
android.os.Handler
import
android.os.HandlerThread
import
androidx.core.os.BuildCompat
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.async
import
kotlinx.coroutines.suspendCancellableCoroutine
import
java.net.InetAddress
import
kotlin.coroutines.resume
...
...
@@ -40,7 +43,8 @@ sealed class DnsResolverCompat {
abstract
suspend
fun
resolve
(
network
:
Network
,
host
:
String
):
Array
<
InetAddress
>
private
object
DnsResolverCompat21
:
DnsResolverCompat
()
{
override
suspend
fun
resolve
(
network
:
Network
,
host
:
String
)
=
network
.
getAllByName
(
host
)
override
suspend
fun
resolve
(
network
:
Network
,
host
:
String
)
=
GlobalScope
.
async
(
Dispatchers
.
IO
)
{
network
.
getAllByName
(
host
)
}.
await
()
}
@TargetApi
(
29
)
...
...
core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
View file @
ebda36ee
...
...
@@ -91,8 +91,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
if
(
profile
.
host
.
parseNumericAddress
()
==
null
)
{
var
retries
=
0
while
(
true
)
try
{
val
io
=
GlobalScope
.
async
(
Dispatchers
.
IO
)
{
service
.
resolver
(
profile
.
host
)
}
profile
.
host
=
io
.
await
().
firstOrNull
()
?.
hostAddress
?:
throw
UnknownHostException
()
profile
.
host
=
service
.
resolver
(
profile
.
host
).
firstOrNull
()
?.
hostAddress
?:
throw
UnknownHostException
()
return
}
catch
(
e
:
UnknownHostException
)
{
// retries are only needed on Chrome OS where arc0 is brought up/down during VPN changes
...
...
core/src/main/java/com/github/shadowsocks/net/LocalDnsServer.kt
View file @
ebda36ee
...
...
@@ -108,7 +108,7 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd
val
host
=
question
.
name
.
toString
(
true
)
if
(
remoteDomainMatcher
?.
containsMatchIn
(
host
)
==
true
)
return
@supervisorScope
remote
.
await
()
val
localResults
=
try
{
withTimeout
(
TIMEOUT
)
{
GlobalScope
.
async
(
Dispatchers
.
IO
)
{
localResolver
(
host
)
}.
await
(
)
}
withTimeout
(
TIMEOUT
)
{
localResolver
(
host
)
}
}
catch
(
_
:
TimeoutCancellationException
)
{
Crashlytics
.
log
(
Log
.
WARN
,
TAG
,
"Local resolving timed out, falling back to remote resolving"
)
return
@supervisorScope
remote
.
await
()
...
...
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