From 7374ce9de5679cca52473e2063b786df59148a1f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 6 May 2016 13:09:10 -0400 Subject: [PATCH] msg/simple/Pipe: do not use sizeof(entity_addr_t) The protocol is defined in terms of ceph_entity_addr; use that. Signed-off-by: Sage Weil --- src/msg/simple/Pipe.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc index 2aeb6d68be3fe..4e6dfebcb4f5d 100644 --- a/src/msg/simple/Pipe.cc +++ b/src/msg/simple/Pipe.cc @@ -334,7 +334,7 @@ int Pipe::accept() goto fail_unlocked; } { - bufferptr tp(sizeof(peer_addr)); + bufferptr tp(sizeof(ceph_entity_addr)); addrbl.push_back(std::move(tp)); } if (tcp_read(addrbl.c_str(), addrbl.length()) < 0) { @@ -949,7 +949,7 @@ int Pipe::connect() // identify peer { #if defined(__linux__) || defined(DARWIN) || defined(__FreeBSD__) - bufferptr p(sizeof(paddr) * 2); + bufferptr p(sizeof(ceph_entity_addr) * 2); #else int wirelen = sizeof(__u32) * 2 + sizeof(ceph_sockaddr_storage); bufferptr p(wirelen * 2); -- 2.39.5