fix issue in waht when connecting to devices with multiple ip addresses

master
Florian Schrofner 2023-06-13 16:48:21 +02:00
parent 2059abb93c
commit 6c066b442c
1 changed files with 7 additions and 1 deletions

View File

@ -11,11 +11,17 @@
(def options (:options (parse-opts *command-line-args* cli-options))) (def options (:options (parse-opts *command-line-args* cli-options)))
(def port (:port options)) (def port (:port options))
;; using wlan0 for now, as this fixes issues with devices having multiple ip addresses (e.g. when using a vpn)
;; it seems like this interface name is used on all devices that i'm using at least
(def ip (->> (shell/sh "adb" "shell" "ip addr") (def ip (->> (shell/sh "adb" "shell" "ip addr")
:out :out
(re-find #"inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/.* scope global") (re-find #"inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/.* scope global wlan0")
last)) last))
(println (str "determined ip address of device: " ip))
(shell/sh "adb" "tcpip" (str port)) (shell/sh "adb" "tcpip" (str port))
(println (str "opened adb in tcp mode on port: " port))
(def result (shell/sh "adb" "connect" (str ip ":" port))) (def result (shell/sh "adb" "connect" (str ip ":" port)))
(println (:out result)) (println (:out result))