From: Sage Weil <sage@redhat.com>
Date: Fri, 6 May 2016 14:00:31 +0000 (-0400)
Subject: msg/simple/Accepter: use set_sockaddr for getsockname
X-Git-Tag: v11.0.0~549^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ceedc9477daf33ab6c0a1dfed30184cc2f2a629;p=ceph.git

msg/simple/Accepter: use set_sockaddr for getsockname

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

diff --git a/src/msg/simple/Accepter.cc b/src/msg/simple/Accepter.cc
index 3d6f1f7a5e79..73ef3e4c4dba 100644
--- a/src/msg/simple/Accepter.cc
+++ b/src/msg/simple/Accepter.cc
@@ -133,13 +133,15 @@ int Accepter::bind(const entity_addr_t &bind_addr, const set<int>& avoid_ports)
   }
 
   // what port did we get?
-  socklen_t llen = sizeof(listen_addr.ss_addr());
-  rc = getsockname(listen_sd, (sockaddr*)&listen_addr.ss_addr(), &llen);
+  sockaddr_storage ss;
+  socklen_t llen = sizeof(ss);
+  rc = getsockname(listen_sd, (sockaddr*)&ss, &llen);
   if (rc < 0) {
     rc = -errno;
     lderr(msgr->cct) << "accepter.bind failed getsockname: " << cpp_strerror(rc) << dendl;
     return rc;
   }
+  listen_addr.set_sockaddr((sockaddr*)&ss);
   
   if (msgr->cct->_conf->ms_tcp_rcvbuf) {
     int size = msgr->cct->_conf->ms_tcp_rcvbuf;