From c76947e8b932791d0fddbcee9765774aea02167c Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Tue, 19 Feb 2019 11:29:45 +0100
Subject: [PATCH] JsonRpc::ReadMessage(): add Boost ASIO overload

---
 lib/remote/jsonrpc.cpp | 13 +++++++++++++
 lib/remote/jsonrpc.hpp |  1 +
 2 files changed, 14 insertions(+)

diff --git a/lib/remote/jsonrpc.cpp b/lib/remote/jsonrpc.cpp
index b07d0e6ed..5f4b6ae91 100644
--- a/lib/remote/jsonrpc.cpp
+++ b/lib/remote/jsonrpc.cpp
@@ -9,6 +9,7 @@
 #include "base/tlsstream.hpp"
 #include <iostream>
 #include <memory>
+#include <utility>
 #include <boost/asio/spawn.hpp>
 
 using namespace icinga;
@@ -95,6 +96,18 @@ StreamReadStatus JsonRpc::ReadMessage(const Stream::Ptr& stream, String *message
 	return StatusNewItem;
 }
 
+String JsonRpc::ReadMessage(const std::shared_ptr<AsioTlsStream>& stream, boost::asio::yield_context yc, ssize_t maxMessageLength)
+{
+	String jsonString = NetString::ReadStringFromStream(stream, yc, maxMessageLength);
+
+#ifdef I2_DEBUG
+	if (GetDebugJsonRpcCached())
+		std::cerr << ConsoleColorTag(Console_ForegroundBlue) << "<< " << jsonString << ConsoleColorTag(Console_Normal) << "\n";
+#endif /* I2_DEBUG */
+
+	return std::move(jsonString);
+}
+
 Dictionary::Ptr JsonRpc::DecodeMessage(const String& message)
 {
 	Value value = JsonDecode(message);
diff --git a/lib/remote/jsonrpc.hpp b/lib/remote/jsonrpc.hpp
index 2efe8022b..137d42a3b 100644
--- a/lib/remote/jsonrpc.hpp
+++ b/lib/remote/jsonrpc.hpp
@@ -24,6 +24,7 @@ public:
 	static size_t SendMessage(const Stream::Ptr& stream, const Dictionary::Ptr& message);
 	static size_t SendMessage(const std::shared_ptr<AsioTlsStream>& stream, const Dictionary::Ptr& message, boost::asio::yield_context yc);
 	static StreamReadStatus ReadMessage(const Stream::Ptr& stream, String *message, StreamReadContext& src, bool may_wait = false, ssize_t maxMessageLength = -1);
+	static String ReadMessage(const std::shared_ptr<AsioTlsStream>& stream, boost::asio::yield_context yc, ssize_t maxMessageLength = -1);
 	static Dictionary::Ptr DecodeMessage(const String& message);
 
 private: