]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async, v2: follow the const bl& concept in authenticated_encrypt_update().
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Tue, 19 Feb 2019 20:51:36 +0000 (21:51 +0100)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Thu, 21 Feb 2019 22:31:02 +0000 (23:31 +0100)
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/msg/async/ProtocolV2.cc

index 5a3093b02524570ff6814bad115c50ca0884c193..4b657f49c0f90644f4625da7db717f689c966d0e 100644 (file)
@@ -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();