A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
feat(avf): map udp forwards to offset vsock ports
ExTvc4fc18aed101
diff --git a/app/src/main/java/com/excp/podroid/engine/avf/AvfVport.kt b/app/src/main/java/com/excp/podroid/engine/avf/AvfVport.ktnew file mode 100644index 0000000..c20e3e9--- /dev/null+++ b/app/src/main/java/com/excp/podroid/engine/avf/AvfVport.kt@@ -0,0 +1,22 @@+/*+ * Podroid - Rootless Podman for Android+ * Copyright (C) 2024-2026 Podroid contributors+ *+ * Maps a port-forward rule to its guest vsock rendezvous port.+ */+package com.excp.podroid.engine.avf++import com.excp.podroid.data.repository.PortForwardRule++internal object AvfVport {+ /**+ * UDP vports are offset so a TCP and a UDP rule on the same host port don't+ * collide on the single vsock port space. TCP stays in [1, 65535]; UDP lands+ * in [65537, 131071]. The guest binds whatever vport it's told, so the offset+ * lives only here.+ */+ const val UDP_OFFSET = 0x10000 // 65536++ fun forRule(rule: PortForwardRule): Int =+ if (rule.protocol == "udp") rule.hostPort + UDP_OFFSET else rule.hostPort+}diff --git a/app/src/test/java/com/excp/podroid/engine/avf/AvfVportTest.kt b/app/src/test/java/com/excp/podroid/engine/avf/AvfVportTest.ktnew file mode 100644index 0000000..06e8204--- /dev/null+++ b/app/src/test/java/com/excp/podroid/engine/avf/AvfVportTest.kt@@ -0,0 +1,28 @@+package com.excp.podroid.engine.avf++import com.excp.podroid.data.repository.PortForwardRule+import org.junit.Assert.assertEquals+import org.junit.Assert.assertNotEquals+import org.junit.Test++class AvfVportTest {+ @Test fun tcp_vport_equals_host_port() {+ assertEquals(9922, AvfVport.forRule(PortForwardRule(9922, 22, "tcp")))+ }++ @Test fun udp_vport_is_offset() {+ assertEquals(5353 + 0x10000, AvfVport.forRule(PortForwardRule(5353, 5353, "udp")))+ }++ @Test fun tcp_and_udp_on_same_host_port_do_not_collide() {+ val tcp = AvfVport.forRule(PortForwardRule(5353, 5353, "tcp"))+ val udp = AvfVport.forRule(PortForwardRule(5353, 5353, "udp"))+ assertNotEquals(tcp, udp)+ }++ @Test fun udp_range_never_overlaps_tcp_range() {+ // Max TCP vport (65535) stays below the min UDP vport (1 + 0x10000).+ assertEquals(65535, AvfVport.forRule(PortForwardRule(65535, 1, "tcp")))+ assertEquals(1 + 0x10000, AvfVport.forRule(PortForwardRule(1, 1, "udp")))+ }+}