commit a076b15fc7fda35208181fed442967ae10042e54
author Josh Gao <jmgao@google.com> Tue Mar 20 14:25:03 2018 -0700
committer Josh Gao <jmgao@google.com> Wed Mar 21 15:13:07 2018 -0700
tree 9571296ed5f41e9e577ee8eb3920be9e3924746e
parent 4f8504e18f88de8d495a9c05d3bf2063d74c61da

adb: bump the local socket backlog to the maximum.

The listen backlog seems to be more meaningful on Darwin than on Linux,
resulting in connections failing with ECONNRESET. Bump it up to the
maximum supported value to make this less likely. 128 pending
connections ought to be enough for anybody.

Bug: http://b/74616284
Test: python test_device.py
Change-Id: I5fe0205924188cf18ca1fc1204f923ab5523eeb2

sysdeps/posix/network.cpp

diff --git a/sysdeps/posix/network.cpp b/sysdeps/posix/network.cpp
index 45da5af..ecd1fd2 100644
--- a/sysdeps/posix/network.cpp
+++ b/sysdeps/posix/network.cpp
@@ -105,8 +105,7 @@
     }
 
     if (type == SOCK_STREAM || type == SOCK_SEQPACKET) {
-        // Arbitrarily selected value, ported from libcutils.
-        if (listen(s, 4) != 0) {
+        if (listen(s, SOMAXCONN) != 0) {
             set_error(error);
             return -1;
         }

sysdeps_win32.cpp

diff --git a/sysdeps_win32.cpp b/sysdeps_win32.cpp
index 5873b2b..cd7d187 100644
--- a/sysdeps_win32.cpp
+++ b/sysdeps_win32.cpp
@@ -747,8 +747,6 @@
     return fd;
 }
 
-#define LISTEN_BACKLOG 4
-
 // interface_address is INADDR_LOOPBACK or INADDR_ANY.
 static int _network_server(int port, int type, u_long interface_address, std::string* error) {
     struct sockaddr_in addr;
@@ -805,7 +803,7 @@
         return -1;
     }
     if (type == SOCK_STREAM) {
-        if (listen(s, LISTEN_BACKLOG) == SOCKET_ERROR) {
+        if (listen(s, SOMAXCONN) == SOCKET_ERROR) {
             const DWORD err = WSAGetLastError();
             *error = android::base::StringPrintf(
                 "cannot listen on socket: %s", android::base::SystemErrorCodeToString(err).c_str());