From: Sage Weil <sage@redhat.com>
Date: Fri, 6 May 2016 17:11:55 +0000 (-0400)
Subject: msg/async/AsyncConnection: do not use sizeof(entity_addr_t)
X-Git-Tag: v11.0.0~549^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f987e8f3ba7c2fdbad966a845da1c5cfc819e5bb;p=ceph.git

msg/async/AsyncConnection: do not use sizeof(entity_addr_t)

Protocol is defined in terms of ceph_entity_addr.

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

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index c58787fe41f6..31f5701dc67f 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -1124,7 +1124,7 @@ ssize_t AsyncConnection::_process_connection()
         entity_addr_t paddr, peer_addr_for_me;
         bufferlist myaddrbl;
 
-        r = read_until(sizeof(paddr)*2, state_buffer);
+        r = read_until(sizeof(ceph_entity_addr)*2, state_buffer);
         if (r < 0) {
           ldout(async_msgr->cct, 1) << __func__ << " read identify peeraddr failed" << dendl;
           goto fail;
@@ -1133,7 +1133,7 @@ ssize_t AsyncConnection::_process_connection()
         }
 
         bufferlist bl;
-        bl.append(state_buffer, sizeof(paddr)*2);
+        bl.append(state_buffer, sizeof(ceph_entity_addr)*2);
         bufferlist::iterator p = bl.begin();
         try {
           ::decode(paddr, p);
@@ -1428,7 +1428,7 @@ ssize_t AsyncConnection::_process_connection()
         bufferlist addr_bl;
         entity_addr_t peer_addr;
 
-        r = read_until(strlen(CEPH_BANNER) + sizeof(peer_addr), state_buffer);
+        r = read_until(strlen(CEPH_BANNER) + sizeof(ceph_entity_addr), state_buffer);
         if (r < 0) {
           ldout(async_msgr->cct, 1) << __func__ << " read peer banner and addr failed" << dendl;
           goto fail;
@@ -1442,7 +1442,7 @@ ssize_t AsyncConnection::_process_connection()
           goto fail;
         }
 
-        addr_bl.append(state_buffer+strlen(CEPH_BANNER), sizeof(peer_addr));
+        addr_bl.append(state_buffer+strlen(CEPH_BANNER), sizeof(ceph_entity_addr));
         {
           bufferlist::iterator ti = addr_bl.begin();
           ::decode(peer_addr, ti);