From 68eaee5bb086383e601ac64e9ff0aa65830599e3 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Fri, 19 Nov 2021 21:07:22 +0100
Subject: [PATCH] Force adb forward if tunnel host/port is provided

Tunnel host and port are only meaningful in "adb forward" mode.

They indicate where the client must connect to communicate with the
server. In "adb reverse" mode, the client _listens_, it does not
_connect_.

Refs #2807 <https://github.com/Genymobile/scrcpy/pull/2807>
---
 app/src/cli.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/cli.c b/app/src/cli.c
index f00611a7..5256d50e 100644
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -1405,6 +1405,12 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
     }
 #endif
 
+    if ((opts->tunnel_host || opts->tunnel_port) && !opts->force_adb_forward) {
+        LOGI("Tunnel host/port is set, "
+             "--force-adb-forward automatically enabled.");
+        opts->force_adb_forward = true;
+    }
+
     int index = optind;
     if (index < argc) {
         LOGE("Unexpected additional argument: %s", argv[index]);