diff options
| author | Elliott Hughes <enh@google.com> | 2016-02-23 18:51:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-23 18:51:22 +0000 |
| commit | 773e8c5e7c2bec23a2d7378891bebaabfd22d772 (patch) | |
| tree | 2709896084903ae2f90033a53afa633c6f128c7b /libsysutils | |
| parent | b9d75acace816146077651e9bcf5a8d54a1ff653 (diff) | |
| parent | f5a2f6e963b4c82adbb129b2df460594524ebedf (diff) | |
| download | system_core-773e8c5e7c2bec23a2d7378891bebaabfd22d772.tar.gz system_core-773e8c5e7c2bec23a2d7378891bebaabfd22d772.tar.bz2 system_core-773e8c5e7c2bec23a2d7378891bebaabfd22d772.zip | |
Merge "Clean up CLOEXEC in SocketListener." am: ed83cfba68
am: f5a2f6e963
* commit 'f5a2f6e963b4c82adbb129b2df460594524ebedf':
Clean up CLOEXEC in SocketListener.
Diffstat (limited to 'libsysutils')
| -rw-r--r-- | libsysutils/src/SocketListener.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libsysutils/src/SocketListener.cpp b/libsysutils/src/SocketListener.cpp index 168899c56..4d602a6aa 100644 --- a/libsysutils/src/SocketListener.cpp +++ b/libsysutils/src/SocketListener.cpp @@ -206,7 +206,7 @@ void SocketListener::runListener() { do { alen = sizeof(ss); - c = accept(mSock, addrp, &alen); + c = accept4(mSock, addrp, &alen, SOCK_CLOEXEC); SLOGV("%s got %d from accept", mSocketName, c); } while (c < 0 && errno == EINTR); if (c < 0) { @@ -214,7 +214,6 @@ void SocketListener::runListener() { sleep(1); continue; } - fcntl(c, F_SETFD, FD_CLOEXEC); pthread_mutex_lock(&mClientsLock); mClients->push_back(new SocketClient(c, true, mUseCmdNum)); pthread_mutex_unlock(&mClientsLock); |