From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Tue, 19 Feb 2019 20:51:36 +0000 (+0100)
Subject: msg/async, v2: follow the const bl& concept in authenticated_encrypt_update().
X-Git-Tag: v14.1.1~157^2~11
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=da0766454a125f57b6c6c64e64981195d64dbf89;p=ceph-ci.git

msg/async, v2: follow the const bl& concept in authenticated_encrypt_update().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index 5a3093b0252..4b657f49c0f 100644
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -978,6 +978,10 @@ ssize_t ProtocolV2::write_message(Message *m, bool more) {
 			     m->get_middle().length(),
 			     m->get_data().length());
 
+  ceph_assert(m->get_payload().length() == header.front_len);
+  ceph_assert(m->get_middle().length() == header.middle_len);
+  ceph_assert(m->get_data().length() == header.data_len);
+
   if (auth_meta->is_mode_secure()) {
     ceph_assert(session_stream_handlers.tx);
 
@@ -999,15 +1003,15 @@ ssize_t ProtocolV2::write_message(Message *m, bool more) {
     // TODO: switch TxHandler from `bl&&` to `const bl&`.
     if (m->get_payload().length()) {
       session_stream_handlers.tx->authenticated_encrypt_update(
-	ceph::bufferlist(m->get_payload()));
+	m->get_payload());
     }
     if (m->get_middle().length()) {
       session_stream_handlers.tx->authenticated_encrypt_update(
-	ceph::bufferlist(m->get_middle()));
+	m->get_middle());
     }
     if (m->get_data().length()) {
       session_stream_handlers.tx->authenticated_encrypt_update(
-	ceph::bufferlist(m->get_data()));
+	m->get_data());
     }
 
     auto cipherbl = session_stream_handlers.tx->authenticated_encrypt_final();