commit 53eb31d87cb84a4212f4850bf745646e1fb12814
author Josh Gao <jmgao@google.com> Wed May 18 10:39:48 2016 -0700
committer Josh Gao <jmgao@google.com> Wed May 18 14:21:53 2016 -0700
tree f6c22be4f9c94bb2afc5005c7db2294b05dc168f
parent 9b587dec6d0a57c8fe1083c1c543fbeb163d65fa

adb: use asocket's close function when closing.

close_all_sockets was assuming that all registered local sockets used
local_socket_close as their close function. However, this is not true
for JDWP sockets.

Bug: http://b/28347842
Change-Id: I40a1174845cd33f15f30ce70828a7081cd5a087e

adb/sockets.cpp

diff --git a/adb/sockets.cpp b/adb/sockets.cpp
index b6ed868..b2555d0 100644
--- a/adb/sockets.cpp
+++ b/adb/sockets.cpp
@@ -39,8 +39,6 @@
 #include "sysdeps/mutex.h"
 #include "transport.h"
 
-static void local_socket_close(asocket* s);
-
 static std::recursive_mutex& local_socket_list_lock = *new std::recursive_mutex();
 static unsigned local_socket_next_id = 1;
 
@@ -118,7 +116,7 @@
 restart:
     for (s = local_socket_list.next; s != &local_socket_list; s = s->next) {
         if (s->transport == t || (s->peer && s->peer->transport == t)) {
-            local_socket_close(s);
+            s->close(s);
             goto restart;
         }
     }