Return bytes sent/written in SendMessage() and WriteStringToStream()

refs #5509

diff --git a/lib/base/netstring.cpp b/lib/base/netstring.cpp
index 934097e2b3d3a9684f21c2cded67a346e1d7cf89..dce0208df8868ec1e20dd6b8b8f3005509f1fefe 100644 (file)
--- a/lib/base/netstring.cpp
+++ b/lib/base/netstring.cpp
@@ -102,18 +102,21 @@ StreamReadStatus NetString::ReadStringFromStream(const Stream::Ptr& stream, Stri
 }
 
 /**
- * Writes data into a stream using the netstring format.
+ * Writes data into a stream using the netstring format and returns bytes written.
  *
  * @param stream The stream.
  * @param str The String that is to be written.
+ *
+ * @return The amount of bytes written.
  */
-void NetString::WriteStringToStream(const Stream::Ptr& stream, const String& str)
+size_t NetString::WriteStringToStream(const Stream::Ptr& stream, const String& str)
 {
        std::ostringstream msgbuf;
        WriteStringToStream(msgbuf, str);
 
        String msg = msgbuf.str();
        stream->Write(msg.CStr(), msg.GetLength());
+       return msg.GetLength();
 }
 
 /**

diff --git a/lib/base/netstring.hpp b/lib/base/netstring.hpp
index c24cba028e8c56afb4be8d99127c6eeb87e9790d..e0d0f4082ac6cdf8901a5c8e8b6828be33fe2920 100644 (file)
--- a/lib/base/netstring.hpp
+++ b/lib/base/netstring.hpp
@@ -39,7 +39,7 @@ class I2_BASE_API NetString
 {
 public:
        static StreamReadStatus ReadStringFromStream(const Stream::Ptr& stream, String *message, StreamReadContext& context, bool may_wait = false);
-       static void WriteStringToStream(const Stream::Ptr& stream, const String& message);
+       static size_t WriteStringToStream(const Stream::Ptr& stream, const String& message);
        static void WriteStringToStream(std::ostream& stream, const String& message);
 
 private:

diff --git a/lib/remote/jsonrpc.cpp b/lib/remote/jsonrpc.cpp
index 1d3efd5ca18163e9cf9be02243978b63ac633115..c05a85c2b408a2a70de995e83610d6c853daa12c 100644 (file)
--- a/lib/remote/jsonrpc.cpp
+++ b/lib/remote/jsonrpc.cpp
@@ -54,11 +54,13 @@ static bool GetDebugJsonRpcCached(void)
 #endif /* I2_DEBUG */
 
 /**
- * Sends a message to the connected peer.
+ * Sends a message to the connected peer and returns the bytes sent.
  *
  * @param message The message.
+ *
+ * @return The amount of bytes sent.
  */
-void JsonRpc::SendMessage(const Stream::Ptr& stream, const Dictionary::Ptr& message)
+size_t JsonRpc::SendMessage(const Stream::Ptr& stream, const Dictionary::Ptr& message)
 {
        String json = JsonEncode(message);
 
@@ -67,7 +69,7 @@ void JsonRpc::SendMessage(const Stream::Ptr& stream, const Dictionary::Ptr& mess
                std::cerr << ConsoleColorTag(Console_ForegroundBlue) << ">> " << json << ConsoleColorTag(Console_Normal) << "\n";
 #endif /* I2_DEBUG */
 
-       NetString::WriteStringToStream(stream, json);
+       return NetString::WriteStringToStream(stream, json);
 }
 
 StreamReadStatus JsonRpc::ReadMessage(const Stream::Ptr& stream, String *message, StreamReadContext& src, bool may_wait)

diff --git a/lib/remote/jsonrpc.hpp b/lib/remote/jsonrpc.hpp
index 3589b365a05595b58305a5063aea0429ba56889f..df19e22222cd910b616c2c8a6ed21e6b0ffc675f 100644 (file)
--- a/lib/remote/jsonrpc.hpp
+++ b/lib/remote/jsonrpc.hpp
@@ -35,7 +35,7 @@ namespace icinga
 class I2_REMOTE_API JsonRpc
 {
 public:
-       static void SendMessage(const Stream::Ptr& stream, const Dictionary::Ptr& message);
+       static size_t SendMessage(const Stream::Ptr& stream, const Dictionary::Ptr& message);
        static StreamReadStatus ReadMessage(const Stream::Ptr& stream, String *message, StreamReadContext& src, bool may_wait = false);
        static Dictionary::Ptr DecodeMessage(const String& message);