Properly use forwarderIp

Mygod · Mar 5, 2024 · c8aee8d · c8aee8d
1 parent 730ec80
commit c8aee8d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/Routing.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/Routing.kt
@@ -312,10 +312,13 @@ class Routing(private val caller: Any, private val downstream: String) : IpNeigh
  }
  val forwarder = DnsForwarder.registerClient(this, useLocalnet)
  val hostAddress = hostAddress.address.hostAddress
- if (useLocalnet) transaction.exec("echo 1 >/proc/sys/net/ipv4/conf/all/route_localnet")
+ val forwarderIp = if (useLocalnet) {
+ transaction.exec("echo 1 >/proc/sys/net/ipv4/conf/all/route_localnet")
+ "127.0.0.1"
+ } else hostAddress
  VpnFirewallManager.setup(transaction)
- transaction.iptablesInsert("PREROUTING -i $downstream -p tcp -d $hostAddress --dport 53 -j DNAT --to-destination 127.0.0.1:${forwarder.tcpPort}", "nat")
- transaction.iptablesInsert("PREROUTING -i $downstream -p udp -d $hostAddress --dport 53 -j DNAT --to-destination 127.0.0.1:${forwarder.udpPort}", "nat")
+ transaction.iptablesInsert("PREROUTING -i $downstream -p tcp -d $hostAddress --dport 53 -j DNAT --to-destination $forwarderIp:${forwarder.tcpPort}", "nat")
+ transaction.iptablesInsert("PREROUTING -i $downstream -p udp -d $hostAddress --dport 53 -j DNAT --to-destination $forwarderIp:${forwarder.udpPort}", "nat")
  transaction.commit()
  Timber.i("Started routing for $downstream by $caller")
  FallbackUpstreamMonitor.registerCallback(fallbackUpstream)