Display and control your Android device
Expose function to test if a serial is TCP/IP
Romain Vimont02d46b226210
diff --git a/app/src/adb/adb.c b/app/src/adb/adb.cindex 3cfc5a95..b00bd620 100644--- a/app/src/adb/adb.c+++ b/app/src/adb/adb.c@@ -482,3 +482,8 @@ sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags) {return sc_adb_parse_device_ip_from_output(buf);}++bool+sc_adb_is_serial_tcpip(const char *serial) {+ return strchr(serial, ':');+}diff --git a/app/src/adb/adb.h b/app/src/adb/adb.hindex 1a97c203..18a11438 100644--- a/app/src/adb/adb.h+++ b/app/src/adb/adb.h@@ -93,4 +93,13 @@ sc_adb_get_serialno(struct sc_intr *intr, unsigned flags);char *sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags);+/**+ * Indicate if the serial represents an IP address+ *+ * In practice, it just returns true if and only if it contains a ':', which is+ * sufficient to distinguish an ip:port from a real USB serial.+ */+bool+sc_adb_is_serial_tcpip(const char *serial);+#endifdiff --git a/app/src/server.c b/app/src/server.cindex b0b596ad..3dbda0e9 100644--- a/app/src/server.c+++ b/app/src/server.c@@ -659,10 +659,7 @@ sc_server_configure_tcpip_known_address(struct sc_server *server,static boolsc_server_configure_tcpip_unknown_address(struct sc_server *server,const char *serial) {- // The serial is either the real serial when connected via USB, or- // the IP:PORT when connected over TCP/IP. Only the latter contains- // a colon.- bool is_already_tcpip = strchr(serial, ':');+ bool is_already_tcpip = sc_adb_is_serial_tcpip(serial);if (is_already_tcpip) {// Nothing to doLOGI("Device already connected via TCP/IP: %s", serial);