commit 1099215e30c3b09dfa390c638a45487c43b2b1e1
author Josh Gao <jmgao@google.com> Mon Sep 19 17:31:55 2016 -0700
committer Josh Gao <jmgao@google.com> Tue Sep 20 13:55:43 2016 -0700
tree 8038b651c02b071f20039fe7f1eb9d1fa4e15ec6
parent 41595685482aec3ec4413c4e0bedf03c34a35a94

adb: parse tcp socket specs with base::ParseNetAddress.

libbase already has IPv6-aware address parsing, so use it instead of
adb's handrolled IPv4-only parsing.

Bug: http://b/31537253
Change-Id: I4e9ce56b55d7d02787c0fa67b724490bf49ce479
Test: mma && adb start-server && \
      adb -L 'tcp:[::ffff:127.0.0.1]:5037' devices && \
      adb -L 'tcp:localhost:5037' devices && \
      adb -L 'tcp:127.0.0.1:5037' devices && \
      adb -L 'tcp:5037' devices && \
      $ANDROID_HOST_OUT/nativetest64/adb_test/adb_test

adb/socket_spec.h

diff --git a/adb/socket_spec.h b/adb/socket_spec.h
index 6302da5..6920e91 100644
--- a/adb/socket_spec.h
+++ b/adb/socket_spec.h
@@ -25,3 +25,7 @@
 int socket_spec_connect(const std::string& spec, std::string* error);
 int socket_spec_listen(const std::string& spec, std::string* error,
                        int* resolved_tcp_port = nullptr);
+
+// Exposed for testing.
+bool parse_tcp_socket_spec(const std::string& spec, std::string* hostname, int* port,
+                           std::string* error);