From: Adir Lev <adirl@mellanox.com>
Date: Thu, 19 May 2016 11:12:27 +0000 (+0300)
Subject: msg: add const overload to entity_addr_t functions
X-Git-Tag: v11.0.0~339^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5abb3abf21e572b2a5e9d1dd7cdc862b324b027;p=ceph.git

msg: add const overload to entity_addr_t functions

in order to have a cleaner code adding const overload
functions in4_addr and in6_addr

Signed-off-by: Adir Lev <adirl@mellanox.com>
---

diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h
index 0f7439b9f4d3..1722cf7ad454 100644
--- a/src/msg/msg_types.h
+++ b/src/msg/msg_types.h
@@ -229,14 +229,19 @@ struct entity_addr_t {
   void set_family(int f) {
     u.sa.sa_family = f;
   }
-  
+
   sockaddr_in &in4_addr() {
     return u.sin;
   }
-  sockaddr_in6 &in6_addr() {
+  const sockaddr_in &in4_addr() const{
+    return u.sin;
+  }
+  sockaddr_in6 &in6_addr(){
+    return u.sin6;
+  }
+  const sockaddr_in6 &in6_addr() const{
     return u.sin6;
   }
-
   const sockaddr *get_sockaddr() const {
     return &u.sa;
   }
diff --git a/src/msg/xio/XioMessenger.cc b/src/msg/xio/XioMessenger.cc
index abff1eea71d2..f1f1f770b3f3 100644
--- a/src/msg/xio/XioMessenger.cc
+++ b/src/msg/xio/XioMessenger.cc
@@ -209,11 +209,11 @@ static string xio_uri_from_entity(const string &type,
 
   switch(addr.get_family()) {
   case AF_INET:
-    host = inet_ntop(AF_INET, &addr.u.sin.sin_addr, addr_buf,
+    host = inet_ntop(AF_INET, &addr.in4_addr().sin_addr, addr_buf,
 		     INET_ADDRSTRLEN);
     break;
   case AF_INET6:
-    host = inet_ntop(AF_INET6, &addr.u.sin6.sin6_addr, addr_buf,
+    host = inet_ntop(AF_INET6, &addr.in6_addr().sin6_addr, addr_buf,
 		     INET6_ADDRSTRLEN);
     break;
   default:
@@ -424,7 +424,7 @@ void XioMessenger::learned_addr(const entity_addr_t &peer_addr_for_me)
   if (need_addr) {
     entity_addr_t t = peer_addr_for_me;
     t.set_port(my_inst.addr.get_port());
-    my_inst.addr.u = t.u;
+    my_inst.addr.set_sockaddr(t.get_sockaddr());
     ldout(cct,2) << "learned my addr " << my_inst.addr << dendl;
     need_addr = false;
     // init_local_connection();