diff options
| author | Elliott Hughes <enh@google.com> | 2016-08-23 23:05:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-23 23:05:59 +0000 |
| commit | 66e5e2432a88a4b2ba8bacbc3137438e95eb4011 (patch) | |
| tree | 4c48120999e51c26adff6d7936e3ee4b6fab207a /libsysutils | |
| parent | c8146aa39f6845b95f8a098015f5b195098ac921 (diff) | |
| parent | 8615d79d85e53c86028b702152bc00864b18f9d5 (diff) | |
| download | system_core-66e5e2432a88a4b2ba8bacbc3137438e95eb4011.tar.gz system_core-66e5e2432a88a4b2ba8bacbc3137438e95eb4011.tar.bz2 system_core-66e5e2432a88a4b2ba8bacbc3137438e95eb4011.zip | |
Merge "Most accept/accept4 calls in system/core don't actually want the remote address." am: 299d64144b
am: 8615d79d85
Change-Id: I89aeabf6efa8217c9acd3f8a766bbd18f7e994fa
Diffstat (limited to 'libsysutils')
| -rw-r--r-- | libsysutils/src/SocketListener.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libsysutils/src/SocketListener.cpp b/libsysutils/src/SocketListener.cpp index 4d602a6aa..608abaea5 100644 --- a/libsysutils/src/SocketListener.cpp +++ b/libsysutils/src/SocketListener.cpp @@ -199,16 +199,7 @@ void SocketListener::runListener() { continue; } if (mListen && FD_ISSET(mSock, &read_fds)) { - sockaddr_storage ss; - sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss); - socklen_t alen; - int c; - - do { - alen = sizeof(ss); - c = accept4(mSock, addrp, &alen, SOCK_CLOEXEC); - SLOGV("%s got %d from accept", mSocketName, c); - } while (c < 0 && errno == EINTR); + int c = TEMP_FAILURE_RETRY(accept4(mSock, nullptr, nullptr, SOCK_CLOEXEC)); if (c < 0) { SLOGE("accept failed (%s)", strerror(errno)); sleep(1); |