Commit 00dfb925 authored by Mygod's avatar Mygod

Fix async resolver

parent 0faff461
...@@ -88,22 +88,23 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd ...@@ -88,22 +88,23 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd
printLog(e) printLog(e)
return forward(packet) return forward(packet)
} }
val remote = coroutineScope { async { forward(packet) } } return coroutineScope {
val remote = async { forward(packet) }
try { 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 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) 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 { val localResults = try {
withTimeout(TIMEOUT) { GlobalScope.async(Dispatchers.IO) { localResolver(host) }.await() } withTimeout(TIMEOUT) { GlobalScope.async(Dispatchers.IO) { localResolver(host) }.await() }
} catch (_: TimeoutCancellationException) { } catch (_: TimeoutCancellationException) {
Log.w("LocalDnsServer", "Local resolving timed out, falling back to remote resolving") Log.w("LocalDnsServer", "Local resolving timed out, falling back to remote resolving")
return remote.await() return@coroutineScope remote.await()
} catch (_: UnknownHostException) { } 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) }) { if (localIpMatcher.isEmpty() || localIpMatcher.any { subnet -> localResults.any(subnet::matches) }) {
remote.cancel() remote.cancel()
val response = Message(request.header.id) val response = Message(request.header.id)
...@@ -116,9 +117,9 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd ...@@ -116,9 +117,9 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd
is Inet6Address -> AAAARecord(request.question.name, DClass.IN, TTL, address) is Inet6Address -> AAAARecord(request.question.name, DClass.IN, TTL, address)
else -> throw IllegalStateException("Unsupported address $address") else -> throw IllegalStateException("Unsupported address $address")
}, Section.ANSWER) }, Section.ANSWER)
return ByteBuffer.wrap(response.toWire()) return@coroutineScope ByteBuffer.wrap(response.toWire())
} }
return remote.await() return@coroutineScope remote.await()
} catch (e: IOException) { } catch (e: IOException) {
remote.cancel() remote.cancel()
printLog(e) printLog(e)
...@@ -127,7 +128,8 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd ...@@ -127,7 +128,8 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd
response.header.setFlag(Flags.QR.toInt()) response.header.setFlag(Flags.QR.toInt())
if (request.header.getFlag(Flags.RD.toInt())) response.header.setFlag(Flags.RD.toInt()) if (request.header.getFlag(Flags.RD.toInt())) response.header.setFlag(Flags.RD.toInt())
response.addRecord(request.question, Section.QUESTION) response.addRecord(request.question, Section.QUESTION)
return ByteBuffer.wrap(response.toWire()) return@coroutineScope ByteBuffer.wrap(response.toWire())
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment