From fef89d1039bb1e9526d4880aa3520ad940c7678d Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Wed, 4 Mar 2026 14:18:35 -0800
Subject: [PATCH] op adb: find free port

---
 tools/scripts/adb_ssh.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/scripts/adb_ssh.sh b/tools/scripts/adb_ssh.sh
index 4527a0296..b9668e7e0 100755
--- a/tools/scripts/adb_ssh.sh
+++ b/tools/scripts/adb_ssh.sh
@@ -31,8 +31,12 @@ for name, port in sorted(ports):
 PY
 )
 
-# Forward SSH port first for interactive shell access.
-adb forward tcp:2222 tcp:22
+# Forward SSH port, finding a free local port if 2222 is taken.
+SSH_PORT=2222
+while ss -tln | grep -q ":${SSH_PORT} "; do
+  SSH_PORT=$((SSH_PORT + 1))
+done
+adb forward tcp:${SSH_PORT} tcp:22
 
 # SSH!
-ssh comma@localhost -p 2222 "$@"
+ssh comma@localhost -p ${SSH_PORT} "$@"