From: Sage Weil <sage@redhat.com>
Date: Fri, 6 May 2016 13:59:17 +0000 (-0400)
Subject: msg/async/AsyncMessenger: use sockaddr_storage for accept
X-Git-Tag: v11.0.0~549^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f37a8d3e3b6609c3877e8cd34c7c0657dc9cf18;p=ceph.git

msg/async/AsyncMessenger: use sockaddr_storage for accept

No need for entity_addr_t.  We drop this value anyway.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index ded2cedeca48..395936d84d2f 100644
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -236,9 +236,9 @@ void Processor::accept()
   ldout(msgr->cct, 10) << __func__ << " listen_sd=" << listen_sd << dendl;
   int errors = 0;
   while (errors < 4) {
-    entity_addr_t addr;
-    socklen_t slen = sizeof(addr.ss_addr());
-    int sd = ::accept(listen_sd, (sockaddr*)&addr.ss_addr(), &slen);
+    sockaddr_storage ss;
+    socklen_t slen = sizeof(ss);
+    int sd = ::accept(listen_sd, (sockaddr*)&ss, &slen);
     if (sd >= 0) {
       errors = 0;
       ldout(msgr->cct, 10) << __func__ << " accepted incoming on sd " << sd << dendl;