From: Sage Weil <sage@redhat.com>
Date: Fri, 6 May 2016 14:01:36 +0000 (-0400)
Subject: msg/async/AsyncMessenger: use sockaddr accessors for bind
X-Git-Tag: v11.0.0~549^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=147ffd4ffcce33b797f297fed9fab98c1de202ed;p=ceph.git

msg/async/AsyncMessenger: use sockaddr accessors for bind

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

diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index 395936d84d2f..6e08b42231a4 100644
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -116,9 +116,10 @@ int Processor::bind(const entity_addr_t &bind_addr, const set<int>& avoid_ports)
         continue;
       }
 
-      rc = ::bind(listen_sd, (struct sockaddr *) &listen_addr.ss_addr(), listen_addr.addr_size());
+      rc = ::bind(listen_sd, listen_addr.get_sockaddr(),
+		  listen_addr.get_sockaddr_len());
       if (rc < 0) {
-        lderr(msgr->cct) << __func__ << " unable to bind to " << listen_addr.ss_addr()
+        lderr(msgr->cct) << __func__ << " unable to bind to " << listen_addr
                          << ": " << cpp_strerror(errno) << dendl;
         r = -errno;
         continue;
@@ -130,12 +131,13 @@ int Processor::bind(const entity_addr_t &bind_addr, const set<int>& avoid_ports)
           continue;
 
         listen_addr.set_port(port);
-        rc = ::bind(listen_sd, (struct sockaddr *) &listen_addr.ss_addr(), listen_addr.addr_size());
+        rc = ::bind(listen_sd, listen_addr.get_sockaddr(),
+		    listen_addr.get_sockaddr_len());
         if (rc == 0)
           break;
       }
       if (rc < 0) {
-        lderr(msgr->cct) << __func__ << " unable to bind to " << listen_addr.ss_addr()
+        lderr(msgr->cct) << __func__ << " unable to bind to " << listen_addr
                          << " on any port in range " << msgr->cct->_conf->ms_bind_port_min
                          << "-" << msgr->cct->_conf->ms_bind_port_max << ": "
                          << cpp_strerror(errno) << dendl;