Bound the two tailscale lookups that were missed when the others were

2026-08-24 18:33:40 -04:00
parent 367d0203b8
commit 9333334b7b
2 changed files with 10 additions and 3 deletions
@@ -910,8 +910,12 @@ resolve_remote_ip() {
    local attempts=3

    for ((i=1; i<=attempts; i++)); do
-        # Direct lookup — works when MagicDNS short-name resolution is active
-        REMOTE_SERVER=$(tailscale ip -4 "$ts_name" 2>/dev/null)
+        # Direct lookup — works when MagicDNS short-name resolution is active.
+        # Bounded, because it is not active here: the two hosts sit on separate tailnets, so
+        # this call cannot succeed and blocks ~5s before giving up, while the status fallback
+        # below answers in milliseconds. resolve_tailscale_ip() was bounded for this reason;
+        # this function has the same lookup and was missed.
+        REMOTE_SERVER=$(timeout 2 tailscale ip -4 "$ts_name" 2>/dev/null)

        # Fallback — parse tailscale status for FQDN entries (e.g. hostname.tailXXXX.ts.net)
        if [[ -z "$REMOTE_SERVER" ]]; then