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
00dfb925
Commit
00dfb925
authored
Feb 07, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix async resolver
parent
0faff461
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
35 deletions
+37
-35
core/src/main/java/com/github/shadowsocks/net/LocalDnsServer.kt
...rc/main/java/com/github/shadowsocks/net/LocalDnsServer.kt
+37
-35
No files found.
core/src/main/java/com/github/shadowsocks/net/LocalDnsServer.kt
View file @
00dfb925
...
...
@@ -88,22 +88,23 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd
printLog
(
e
)
return
forward
(
packet
)
}
val
remote
=
coroutineScope
{
async
{
forward
(
packet
)
}
}
return
coroutineScope
{
val
remote
=
async
{
forward
(
packet
)
}
try
{
if
(
forwardOnly
||
request
.
header
.
opcode
!=
Opcode
.
QUERY
)
return
remote
.
await
()
if
(
forwardOnly
||
request
.
header
.
opcode
!=
Opcode
.
QUERY
)
return
@coroutineScope
remote
.
await
()
val
question
=
request
.
question
if
(
question
?.
type
!=
Type
.
A
)
return
remote
.
await
()
if
(
question
?.
type
!=
Type
.
A
)
return
@coroutineScope
remote
.
await
()
val
host
=
question
.
name
.
toString
(
true
)
if
(
remoteDomainMatcher
?.
containsMatchIn
(
host
)
==
true
)
return
remote
.
await
()
if
(
remoteDomainMatcher
?.
containsMatchIn
(
host
)
==
true
)
return
@coroutineScope
remote
.
await
()
val
localResults
=
try
{
withTimeout
(
TIMEOUT
)
{
GlobalScope
.
async
(
Dispatchers
.
IO
)
{
localResolver
(
host
)
}.
await
()
}
}
catch
(
_
:
TimeoutCancellationException
)
{
Log
.
w
(
"LocalDnsServer"
,
"Local resolving timed out, falling back to remote resolving"
)
return
remote
.
await
()
return
@coroutineScope
remote
.
await
()
}
catch
(
_
:
UnknownHostException
)
{
return
remote
.
await
()
return
@coroutineScope
remote
.
await
()
}
if
(
localResults
.
isEmpty
())
return
remote
.
await
()
if
(
localResults
.
isEmpty
())
return
@coroutineScope
remote
.
await
()
if
(
localIpMatcher
.
isEmpty
()
||
localIpMatcher
.
any
{
subnet
->
localResults
.
any
(
subnet
::
matches
)
})
{
remote
.
cancel
()
val
response
=
Message
(
request
.
header
.
id
)
...
...
@@ -116,9 +117,9 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd
is
Inet6Address
->
AAAARecord
(
request
.
question
.
name
,
DClass
.
IN
,
TTL
,
address
)
else
->
throw
IllegalStateException
(
"Unsupported address $address"
)
},
Section
.
ANSWER
)
return
ByteBuffer
.
wrap
(
response
.
toWire
())
return
@coroutineScope
ByteBuffer
.
wrap
(
response
.
toWire
())
}
return
remote
.
await
()
return
@coroutineScope
remote
.
await
()
}
catch
(
e
:
IOException
)
{
remote
.
cancel
()
printLog
(
e
)
...
...
@@ -127,7 +128,8 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd
response
.
header
.
setFlag
(
Flags
.
QR
.
toInt
())
if
(
request
.
header
.
getFlag
(
Flags
.
RD
.
toInt
()))
response
.
header
.
setFlag
(
Flags
.
RD
.
toInt
())
response
.
addRecord
(
request
.
question
,
Section
.
QUESTION
)
return
ByteBuffer
.
wrap
(
response
.
toWire
())
return
@coroutineScope
ByteBuffer
.
wrap
(
response
.
toWire
())
}
}
}
...
...
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