msg: pass Connection to decode_message

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index e19fd017b1c0963502620e0eedd17fdd1bd0e516..bac97fc0da91aa5d86b87a996198aa80ed65eea1 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -276,7 +276,7 @@ Message *decode_message(CephContext *cct, int crcflags,
                        ceph_msg_header& header,
                        ceph_msg_footer& footer,
                        bufferlist& front, bufferlist& middle,
-                       bufferlist& data)
+                       bufferlist& data, Connection* conn)
 {
   // verify crc
   if (crcflags & MSG_CRC_HEADER) {
@@ -812,6 +812,7 @@ Message *decode_message(CephContext *cct, int crcflags,
     return 0;
   }
 
+  m->set_connection(conn);
   m->set_header(header);
   m->set_footer(footer);
   m->set_payload(front);
@@ -890,6 +891,6 @@ Message *decode_message(CephContext *cct, int crcflags, bufferlist::iterator& p)
   ::decode(fr, p);
   ::decode(mi, p);
   ::decode(da, p);
-  return decode_message(cct, crcflags, h, f, fr, mi, da);
+  return decode_message(cct, crcflags, h, f, fr, mi, da, nullptr);
 }
 

diff --git a/src/msg/Message.h b/src/msg/Message.h
index 67c1edce82d07bf0655838bcd29ad08c931f8d6f..c37cd475a737c56b9d195ed0d2d3e763e4ee2fb2 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -471,8 +471,9 @@ typedef boost::intrusive_ptr<Message> MessageRef;
 extern Message *decode_message(CephContext *cct, int crcflags,
                               ceph_msg_header &header,
                               ceph_msg_footer& footer, bufferlist& front,
-                              bufferlist& middle, bufferlist& data);
-inline ostream& operator<<(ostream &out, const Message &m) {
+                              bufferlist& middle, bufferlist& data,
+                              Connection* conn);
+inline ostream& operator<<(ostream& out, const Message& m) {
   m.print(out);
   if (m.get_header().version)
     out << " v" << m.get_header().version;

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 0624427f35eeff20f69913dd10732bd6d75a75d2..69518697e6021b8149d8b47a4c7641b01fa762e8 100644 (file)
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -698,7 +698,8 @@ void AsyncConnection::process()
 
           ldout(async_msgr->cct, 20) << __func__ << " got " << front.length() << " + " << middle.length()
                               << " + " << data.length() << " byte message" << dendl;
-          Message *message = decode_message(async_msgr->cct, async_msgr->crcflags, current_header, footer, front, middle, data);
+          Message *message = decode_message(async_msgr->cct, async_msgr->crcflags, current_header, footer,
+                                            front, middle, data, this);
           if (!message) {
             ldout(async_msgr->cct, 1) << __func__ << " decode message failed " << dendl;
             goto fail;

diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
index 771c920790391539585146e46927fe9ff4ccf21d..9e7b0bc9bc28efc3782984e404c2ee070b0a15f5 100644 (file)
--- a/src/msg/simple/Pipe.cc
+++ b/src/msg/simple/Pipe.cc
@@ -2196,7 +2196,8 @@ int Pipe::read_message(Message **pm, AuthSessionHandler* auth_handler)
 
   ldout(msgr->cct,20) << "reader got " << front.length() << " + " << middle.length() << " + " << data.length()
           << " byte message" << dendl;
-  message = decode_message(msgr->cct, msgr->crcflags, header, footer, front, middle, data);
+  message = decode_message(msgr->cct, msgr->crcflags, header, footer,
+                           front, middle, data, connection_state.get());
   if (!message) {
     ret = -EINVAL;
     goto out_dethrottle;

diff --git a/src/msg/xio/XioConnection.cc b/src/msg/xio/XioConnection.cc
index 98eebcc822481443ef5e1602ba8e97c028afa2f6..107a489a44e72d8ac93c534a5fd0c2e14b0d2026 100644 (file)
--- a/src/msg/xio/XioConnection.cc
+++ b/src/msg/xio/XioConnection.cc
@@ -435,9 +435,8 @@ int XioConnection::handle_data_msg(struct xio_session *session,
   /* update connection timestamp */
   recv.set(tmsg->timestamp);
 
-  Message *m =
-    decode_message(msgr->cct, msgr->crcflags, header, footer, payload, middle,
-                  data);
+  Message *m = decode_message(msgr->cct, msgr->crcflags, header, footer,
+                              payload, middle, data, this);
 
   if (m) {
     /* completion */