diff options
| author | Steven Laver <lavers@google.com> | 2019-12-12 15:29:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-12 15:29:36 +0000 |
| commit | a239544c7b06814b70fd970de7eaac234682fa52 (patch) | |
| tree | a4298d61f9b73642f350799b1157e49b65f4e1e8 /adb/sysdeps_win32.cpp | |
| parent | 63de1e1c8d7824c241f22de67edf54f4f1eaeea5 (diff) | |
| parent | 5319412e5305a3b4bcecf251a2955c09a6e9837e (diff) | |
Merge "Merge RP1A.191203.001" into r-keystone-qcom-dev
Diffstat (limited to 'adb/sysdeps_win32.cpp')
| -rw-r--r-- | adb/sysdeps_win32.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/adb/sysdeps_win32.cpp b/adb/sysdeps_win32.cpp index 4d6cf3de5..d9cc36f83 100644 --- a/adb/sysdeps_win32.cpp +++ b/adb/sysdeps_win32.cpp @@ -920,7 +920,8 @@ static int _network_server(int port, int type, u_long interface_address, std::st return fd; } -int network_loopback_server(int port, int type, std::string* error) { +int network_loopback_server(int port, int type, std::string* error, bool prefer_ipv4) { + // TODO implement IPv6 support on windows return _network_server(port, type, INADDR_LOOPBACK, error); } @@ -1132,7 +1133,7 @@ int adb_socketpair(int sv[2]) { int local_port = -1; std::string error; - server = network_loopback_server(0, SOCK_STREAM, &error); + server = network_loopback_server(0, SOCK_STREAM, &error, true); if (server < 0) { D("adb_socketpair: failed to create server: %s", error.c_str()); goto fail; |