From: Sage Weil <sage@inktank.com>
Date: Thu, 11 Jul 2013 18:42:02 +0000 (-0700)
Subject: msg/Message: use old footer for encoded message dump
X-Git-Tag: v0.67-rc1~59^2~15^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93b3e63f4346d3a43a5a3f1653538bcb6c65a96e;p=ceph.git

msg/Message: use old footer for encoded message dump

This avoids the need for a conditional decoding check on ceph-dencoder,
and makes it match up with what encode_message() is doing.  The new(ish)
fields in the footer (the signature) is not useful for the object
corpus.

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

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index dddf30f3e04c..b9dc54848db4 100644
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -190,7 +190,15 @@ void Message::encode(uint64_t features, bool datacrc)
 #ifdef ENCODE_DUMP
     bufferlist bl;
     ::encode(get_header(), bl);
-    ::encode(get_footer(), bl);
+
+    // dump the old footer format
+    ceph_msg_footer_old old_footer;
+    old_footer.front_crc = footer.front_crc;
+    old_footer.middle_crc = footer.middle_crc;
+    old_footer.data_crc = footer.data_crc;
+    old_footer.flags = footer.flags;
+    ::encode(old_footer, bl);
+
     ::encode(get_payload(), bl);
     ::encode(get_middle(), bl);
     ::encode(get_data(), bl);