commit 7b700763f5f5d749e46d0dbd2b5b0b2dd74efd6c
author Tao Wu <lepton@google.com> Mon Sep 19 16:50:10 2016 -0700
committer Tao Wu <lepton@google.com> Thu Oct 13 08:54:43 2016 -0700
tree 39f295312a27f20b2506bae3c61def5ff36a3a4b
parent 58f7f61266259c7a9ef23b111b5414949da5163a

Fallback to IPv6 when IPv4 is not available in adb

Test: manual - make sure it works in both IPv4/IPv6 env.
BUG: 31537253
Change-Id: Ica492bff34a8c0441516a213d0e8b78fcdfd3282
Signed-off-by: Tao Wu <lepton@google.com>

adb/sysdeps.h

diff --git a/adb/sysdeps.h b/adb/sysdeps.h
index ded8214..ad9b9fd 100644
--- a/adb/sysdeps.h
+++ b/adb/sysdeps.h
@@ -598,7 +598,10 @@
 }
 
 inline int network_loopback_server(int port, int type, std::string* error) {
-  return _fd_set_error_str(socket_loopback_server(port, type), error);
+  int fd = socket_loopback_server(port, type);
+  if (fd < 0 && errno == EAFNOSUPPORT)
+      return _fd_set_error_str(socket_loopback_server6(port, type), error);
+  return _fd_set_error_str(fd, error);
 }
 
 inline int network_inaddr_any_server(int port, int type, std::string* error) {