libcutils: try all addresses in socket_network_client_timeout.
If a connection fails to an address that resolves to multiple
sockaddrs, attempt connecting to subsequent addresses if the initial
connection fails to a reason other than timeout. This is primarily
useful for localhost, which can resolve to both an IPv4 and and IPv6
address.
Also, add an adb test to verify that this behavior.
Bug: http://b/30313466
Change-Id: Ib2df706a66cf6ef8c1097fdfd7aedb69b8df2d6e
Test: python test_adb.py (+ the test fails before this patch)
diff --git a/adb/test_adb.py b/adb/test_adb.py
index 0f1b034..cb3e0d8 100644
--- a/adb/test_adb.py
+++ b/adb/test_adb.py
@@ -207,6 +207,28 @@
# reading the response from the adb emu kill command (on Windows).
self.assertEqual(0, p.returncode)
+ def test_connect_ipv4_ipv6(self):
+ """Ensure that `adb connect localhost:1234` will try both IPv4 and IPv6.
+
+ Bug: http://b/30313466
+ """
+ ipv4 = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ ipv4.bind(('127.0.0.1', 0))
+ ipv4.listen(1)
+
+ ipv6 = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+ ipv6.bind(('::1', ipv4.getsockname()[1] + 1))
+ ipv6.listen(1)
+
+ for s in (ipv4, ipv6):
+ port = s.getsockname()[1]
+ output = subprocess.check_output(
+ ['adb', 'connect', 'localhost:{}'.format(port)])
+
+ self.assertEqual(
+ output.strip(), 'connected to localhost:{}'.format(port))
+ s.close()
+
def main():
random.seed(0)