]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/simple/Accepter: use sockaddr accessors for bind
authorSage Weil <sage@redhat.com>
Fri, 6 May 2016 14:01:26 +0000 (10:01 -0400)
committerSage Weil <sage@redhat.com>
Wed, 11 May 2016 12:12:25 +0000 (08:12 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/msg/simple/Accepter.cc

index 3944792b4b089e713e14daf456b0f2e131890df0..dd7b257fec968f655891fe4f7f8c46024ff48853 100644 (file)
@@ -91,10 +91,11 @@ int Accepter::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) << "accepter.bind unable to bind to " << listen_addr.ss_addr()
-                             << ": " << cpp_strerror(errno) << dendl;
+            lderr(msgr->cct) << "accepter.bind unable to bind to " << listen_addr
+                            << ": " << cpp_strerror(errno) << dendl;
             r = -errno;
             continue;
         }
@@ -105,12 +106,13 @@ int Accepter::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) << "accepter.bind unable to bind to " << listen_addr.ss_addr()
+            lderr(msgr->cct) << "accepter.bind 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)