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 /debuggerd/debuggerd.cpp | |
| 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 'debuggerd/debuggerd.cpp')
| -rw-r--r-- | debuggerd/debuggerd.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp index a26aa9879..8f08c0831 100644 --- a/debuggerd/debuggerd.cpp +++ b/debuggerd/debuggerd.cpp @@ -872,12 +872,8 @@ static int do_server() { ALOGI("debuggerd: starting\n"); for (;;) { - sockaddr_storage ss; - sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss); - socklen_t alen = sizeof(ss); - ALOGV("waiting for connection\n"); - int fd = accept4(s, addrp, &alen, SOCK_CLOEXEC | SOCK_NONBLOCK); + int fd = accept4(s, nullptr, nullptr, SOCK_CLOEXEC | SOCK_NONBLOCK); if (fd == -1) { ALOGE("accept failed: %s\n", strerror(errno)); continue; |