From: Sage Weil <sage@redhat.com>
Date: Fri, 6 May 2016 15:16:49 +0000 (-0400)
Subject: msg/msg_types: dump via sockaddr* operator<<
X-Git-Tag: v11.0.0~549^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b8fc360e966f31c81e52ead30f3c803f837775b;p=ceph.git

msg/msg_types: dump via sockaddr* operator<<

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

diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc
index c966cea42a0..227522d1396 100644
--- a/src/msg/msg_types.cc
+++ b/src/msg/msg_types.cc
@@ -18,7 +18,7 @@ void entity_name_t::dump(Formatter *f) const
 void entity_addr_t::dump(Formatter *f) const
 {
   f->dump_unsigned("nonce", nonce);
-  f->dump_stream("addr") << addr;
+  f->dump_stream("addr") << get_sockaddr();
 }
 
 void entity_name_t::generate_test_instances(list<entity_name_t*>& o)
diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h
index 32177c9e240..b8548838f98 100644
--- a/src/msg/msg_types.h
+++ b/src/msg/msg_types.h
@@ -398,7 +398,7 @@ WRITE_CLASS_ENCODER(entity_addr_t)
 
 inline ostream& operator<<(ostream& out, const entity_addr_t &addr)
 {
-  return out << addr.addr << '/' << addr.nonce;
+  return out << addr.get_sockaddr() << '/' << addr.nonce;
 }
 
 inline bool operator==(const entity_addr_t& a, const entity_addr_t& b) { return memcmp(&a, &b, sizeof(a)) == 0; }