From c4d4679ed99d0ac6b6409225085a879acdf8acc7 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 21 Jun 2015 21:47:44 -0700 Subject: [PATCH] Finish EXECUTE_RPC and RPC_RESPONSE handling. Change-Id: I927711c0625527093899f63c171302901ff8277a --- src/nt_messagereader.cpp | 12 ++++++++---- src/nt_messagereader.h | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/nt_messagereader.cpp b/src/nt_messagereader.cpp index f22d9ff1d2..f6957cef19 100644 --- a/src/nt_messagereader.cpp +++ b/src/nt_messagereader.cpp @@ -174,8 +174,10 @@ MessageReader::Run() if (!Read16(&uid)) return false; unsigned long size; if (!ReadULEB128(&size)) return false; - char *buf; - if (!Read(&buf, size)) return false; + char *params; + if (!Read(¶ms, size)) return false; + m_handler.GotExecuteRpc(id, uid, params, size); + break; } case NT_MSG_RPC_RESPONSE: { @@ -189,8 +191,10 @@ MessageReader::Run() if (!Read16(&uid)) return false; unsigned long size; if (!ReadULEB128(&size)) return false; - char *buf; - if (!Read(&buf, size)) return false; + char *results; + if (!Read(&results, size)) return false; + m_handler.GotRpcResponse(id, uid, results, size); + break; } default: m_error = "unrecognized message type"; diff --git a/src/nt_messagereader.h b/src/nt_messagereader.h index bac60957b9..6d87653fdc 100644 --- a/src/nt_messagereader.h +++ b/src/nt_messagereader.h @@ -44,10 +44,12 @@ public: virtual void GotClearEntries() = 0; virtual void GotExecuteRpc(unsigned int id, unsigned int uid, - const char *params) = 0; + const char *params, + std::size_t params_len) = 0; virtual void GotRpcResponse(unsigned int id, unsigned int uid, - const char *results) = 0; + const char *results, + std::size_t results_len) = 0; private: MessageHandler(const MessageHandler&);