From: Sage Weil <sage@redhat.com>
Date: Wed, 11 May 2016 16:39:48 +0000 (-0400)
Subject: msg/xio: use set_sockaddr
X-Git-Tag: v11.0.0~549^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c19d2cebf91f0bf3f2f96ab564e2ddf40e201361;p=ceph.git

msg/xio: use set_sockaddr

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

diff --git a/src/msg/xio/XioMessenger.cc b/src/msg/xio/XioMessenger.cc
index 8927cb2e570d..15046a2cb4c6 100644
--- a/src/msg/xio/XioMessenger.cc
+++ b/src/msg/xio/XioMessenger.cc
@@ -480,8 +480,8 @@ int XioMessenger::session_event(struct xio_session *session,
     (void) xio_query_connection(conn, &xcona,
 				XIO_CONNECTION_ATTR_LOCAL_ADDR|
 				XIO_CONNECTION_ATTR_PEER_ADDR);
-    (void) entity_addr_from_sockaddr(&peer_addr_for_me, (struct sockaddr *) &xcona.local_addr);
-    (void) entity_addr_from_sockaddr(&paddr, (struct sockaddr *) &xcona.peer_addr);
+    peer_addr_for_me.set_sockaddr((struct sockaddr *)&xcona.local_addr);
+    paddr.set_sockaddr((struct sockaddr *)&xcona.peer_addr);
     //set_myaddr(peer_addr_for_me);
     learned_addr(peer_addr_for_me);
     ldout(cct,2) << "client: connected from " << peer_addr_for_me << " to " << paddr << dendl;
@@ -504,9 +504,8 @@ int XioMessenger::session_event(struct xio_session *session,
 				XIO_CONNECTION_ATTR_PEER_ADDR|
 				XIO_CONNECTION_ATTR_LOCAL_ADDR);
     /* XXX assumes RDMA */
-    (void) entity_addr_from_sockaddr(&s_inst.addr,
-				     (struct sockaddr *) &xcona.peer_addr);
-    (void) entity_addr_from_sockaddr(&peer_addr_for_me, (struct sockaddr *) &xcona.local_addr);
+    s_inst.addr.set_sockaddr((struct sockaddr *)&xcona.peer_addr);
+    peer_addr_for_me.set_sockaddr((struct sockaddr *)&xcona.local_addr);
 
     xcon = new XioConnection(this, XioConnection::PASSIVE, s_inst);
     xcon->session = session;