]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/simple/Pipe: do not use sizeof(entity_addr_t)
authorSage Weil <sage@redhat.com>
Fri, 6 May 2016 17:09:10 +0000 (13:09 -0400)
committerSage Weil <sage@redhat.com>
Wed, 11 May 2016 14:41:48 +0000 (10:41 -0400)
The protocol is defined in terms of ceph_entity_addr; use that.

Signed-off-by: Sage Weil <sage@redhat.com>
src/msg/simple/Pipe.cc

index 2aeb6d68be3fe76bb61f7dc2571bb68fcb66e735..4e6dfebcb4f5dd0f6a60dc4348b10cde251b14f9 100644 (file)
@@ -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);