Commit 55c40acc authored by Daniel Wolf's avatar Daniel Wolf

Update dependencies, adopt to API changes

parent d02ed246
......@@ -60,7 +60,7 @@ dependencies {
implementation 'org.minidns:minidns-core:1.0.0'
implementation 'org.minidns:minidns-hla:1.0.0'
implementation 'com.frostnerd.utilskt:vpntunnelproxy:3.0.0' // https://git.frostnerd.com/AndroidUtils/vpntunnelproxy
implementation 'com.frostnerd.utilskt:vpntunnelproxy:3.1.0' // https://git.frostnerd.com/AndroidUtils/vpntunnelproxy
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$COROUTINE_VERSION"
......
......@@ -120,7 +120,7 @@ open class DnsPacketProxy(@Size(min = 1) dnsHandles: List<DnsHandle>,
if (running) writeUDPDnsPacketToDevice(bytes, packet as IPPacket)
}
suspend fun processLocalResponse(dnsAnswer: DnsMessage, originalPacket: IPPacket) {
fun processLocalResponse(dnsAnswer: DnsMessage, originalPacket: IPPacket) {
if (!running) return
handleForIds.remove(dnsAnswer.id)
if (queryListener != null) {
......@@ -348,7 +348,7 @@ open class DnsPacketProxy(@Size(min = 1) dnsHandles: List<DnsHandle>,
try {
dnsHandle.forwardDnsQuestion(deviceWriteToken, finalDnsMessage, packet, realDestination)
} catch (e: Exception) {
tunnelHandle?.proxy?.logger?.logException(e, false, Level.WARNING)
tunnelHandle?.proxy?.errorLogger?.logException(e, false, Level.WARNING)
}
queryListener?.onQueryForwarded(finalDnsMessage, realDestination, dnsHandle)
} else {
......
......@@ -103,7 +103,7 @@ open class DnsServerPacketProxy(
tunnelOutput.flush()
}
} catch (ex:IOException) {
if(running)tunnelProxy.logger?.logException(ex, true)
if(running)tunnelProxy.errorLogger?.logException(ex, true)
} catch (ignored:InterruptedException) {}
}.also { it.start() }
sendThread = Thread {
......@@ -135,7 +135,7 @@ open class DnsServerPacketProxy(
} else Thread.sleep(2)
}
} catch (ex:IOException) {
if(running)tunnelProxy.logger?.logException(ex, true)
if(running)tunnelProxy.errorLogger?.logException(ex, true)
} catch (ignored:InterruptedException) {}
}.also { it.start() }
return portUsed
......
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