commit 1b46cce06db5663c40a9c6d7f45dfc6b20db59a8
author Elliott Hughes <enh@google.com> Mon Oct 24 23:31:13 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 24 23:31:14 2016 +0000
tree 3697ecd7446369386b2d9c9be9cc3ed05797f84c
parent d473c3ec5198fce602020ce0b9d27d96616a9aba
parent 62e1a6ca46ef832e2e1817c88988e8d59ae1f867

Merge "Allow multiple tcp adb connection to same device."

adb/transport_local.cpp

diff --git a/adb/transport_local.cpp b/adb/transport_local.cpp
index ea2bf77..ba2b28d 100644
--- a/adb/transport_local.cpp
+++ b/adb/transport_local.cpp
@@ -226,7 +226,8 @@
             D("server: new connection on fd %d", fd);
             close_on_exec(fd);
             disable_tcp_nagle(fd);
-            if (register_socket_transport(fd, "host", port, 1) != 0) {
+            std::string serial = android::base::StringPrintf("host-%d", fd);
+            if (register_socket_transport(fd, serial.c_str(), port, 1) != 0) {
                 adb_close(fd);
             }
         }