Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

refactor(avf): extract Forwarder interface for per-rule forwarders

ExTv591f0ca92e1d
diff --git a/app/src/main/java/com/excp/podroid/engine/avf/Forwarder.kt b/app/src/main/java/com/excp/podroid/engine/avf/Forwarder.kt
new file mode 100644
index 0000000..5a4c60f
--- /dev/null
+++ b/app/src/main/java/com/excp/podroid/engine/avf/Forwarder.kt
@@ -0,0 +1,13 @@
+/*
+ * Podroid - Rootless Podman for Android
+ * Copyright (C) 2024-2026 Podroid contributors
+ *
+ * Common lifecycle for the AVF per-rule forwarders so AvfEngine can hold TCP
+ * stream forwarders and UDP datagram forwarders in one map keyed by vsock port.
+ */
+package com.excp.podroid.engine.avf
+
+internal interface Forwarder {
+ fun start()
+ fun close()
+}
diff --git a/app/src/main/java/com/excp/podroid/engine/avf/VsockPortForwarder.kt b/app/src/main/java/com/excp/podroid/engine/avf/VsockPortForwarder.kt
index 32f2e2b..df19c3b 100644
--- a/app/src/main/java/com/excp/podroid/engine/avf/VsockPortForwarder.kt
+++ b/app/src/main/java/com/excp/podroid/engine/avf/VsockPortForwarder.kt
@@ -40,7 +40,7 @@ class VsockPortForwarder(
private val guestVsockPort: Int,
private val vm: Any,
private val scope: CoroutineScope,
-) {
+) : Forwarder {
companion object {
private const val TAG = "VsockPortForwarder"
// A runtime-added rule sends the control ADD then immediately starts the
@@ -72,7 +72,7 @@ class VsockPortForwarder(
private val inflight = Semaphore(MAX_INFLIGHT)
@Volatile private var closed = false
- fun start() {
+ override fun start() {
val s = ServerSocket(hostPort, /* backlog */ 16, InetAddress.getByName("0.0.0.0"))
server = s
Log.d(TAG, "listening on 0.0.0.0:$hostPort → vsock:$guestVsockPort")
@@ -163,7 +163,7 @@ class VsockPortForwarder(
} catch (_: java.io.IOException) { /* peer closed — normal exit */ }
}
- fun close() {
+ override fun close() {
if (closed) return
closed = true
runCatching { server?.close() } // unblocks accept()