commit 3a9b4222a8e06bced15988aafe08d06b8c43702d
author Elliott Hughes <enh@google.com> Mon Oct 24 23:36:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 24 23:36:44 2016 +0000
tree 8797734965d20f731afef7acc4a7295412ce4d8a
parent 5df777e9452251d444f2f30b511b7a5fee5a661c
parent 1b46cce06db5663c40a9c6d7f45dfc6b20db59a8

Merge "Allow multiple tcp adb connection to same device."
am: 4818194a25

Change-Id: Id2b6bc99479e94cd94154ca194985f65df7e2afa

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);
             }
         }