Commit 96dddba3 authored by Mygod's avatar Mygod

Do local and remote DNS resolving simultaneously

parent 32e3d7ab
...@@ -94,22 +94,24 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd ...@@ -94,22 +94,24 @@ 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) } }
try { try {
if (forwardOnly || request.header.opcode != Opcode.QUERY) return forward(packet) if (forwardOnly || request.header.opcode != Opcode.QUERY) return remote.await()
val question = request.question val question = request.question
if (question?.type != Type.A) return forward(packet) if (question?.type != Type.A) return remote.await()
val host = question.name.toString(true) val host = question.name.toString(true)
if (remoteDomainMatcher?.containsMatchIn(host) == true) return forward(packet) if (remoteDomainMatcher?.containsMatchIn(host) == true) return remote.await()
val localResults = try { val localResults = try {
withTimeout(TIMEOUT) { withContext(Dispatchers.IO) { localResolver(host) } } withTimeout(TIMEOUT) { withContext(Dispatchers.IO) { localResolver(host) } }
} 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 forward(packet) return remote.await()
} catch (_: UnknownHostException) { } catch (_: UnknownHostException) {
return forward(packet) return remote.await()
} }
if (localResults.isEmpty()) return forward(packet) if (localResults.isEmpty()) return remote.await()
if (localIpMatcher.isEmpty() || localIpMatcher.any { subnet -> localResults.any(subnet::matches) }) { if (localIpMatcher.isEmpty() || localIpMatcher.any { subnet -> localResults.any(subnet::matches) }) {
remote.cancel()
val response = Message(request.header.id) val response = Message(request.header.id)
response.header.setFlag(Flags.QR.toInt()) // this is a response response.header.setFlag(Flags.QR.toInt()) // this is a response
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())
...@@ -122,8 +124,9 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd ...@@ -122,8 +124,9 @@ class LocalDnsServer(private val localResolver: suspend (String) -> Array<InetAd
}, Section.ANSWER) }, Section.ANSWER)
return ByteBuffer.wrap(response.toWire()) return ByteBuffer.wrap(response.toWire())
} }
return forward(packet) return remote.await()
} catch (e: IOException) { } catch (e: IOException) {
remote.cancel()
printLog(e) printLog(e)
val response = Message(request.header.id) val response = Message(request.header.id)
response.header.rcode = Rcode.SERVFAIL response.header.rcode = Rcode.SERVFAIL
......
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