Fixed bug when StreamFrameReader::addData() was running forever.

silicon-heaven · Feb 2, 2024 · 8f4da55 · 8f4da55
1 parent 4b5ac81
commit 8f4da55
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/libshvchainpack/include/shv/chainpack/utils.h b/libshvchainpack/include/shv/chainpack/utils.h
@@ -18,6 +18,7 @@ namespace utils {
 
 SHVCHAINPACK_DECL_EXPORT std::string hexArray(const char *bytes, size_t n);
 SHVCHAINPACK_DECL_EXPORT std::string hexDump(const char *bytes, size_t n);
+SHVCHAINPACK_DECL_EXPORT std::string hexDump(const std::string_view &bytes);
 SHVCHAINPACK_DECL_EXPORT std::string byteToHex( uint8_t i );
 SHVCHAINPACK_DECL_EXPORT void byteToHex( std::array<char, 2> &arr, uint8_t i );
 
@@ -51,7 +52,6 @@ class SHVCHAINPACK_DECL_EXPORT Utils
 	static std::string toHex(const std::basic_string<uint8_t> &bytes);
 	static char fromHex(char c);
 	static std::string fromHex(const std::string &bytes);
-	static std::string hexDump(const std::string_view &bytes);
 
 	template <typename I>
 	static std::string toString(I n)

diff --git a/libshvchainpack/src/chainpack/rpcdriver.cpp b/libshvchainpack/src/chainpack/rpcdriver.cpp
@@ -48,7 +48,7 @@ void RpcDriver::sendRpcFrame(RpcFrame &&frame)
 void RpcDriver::onFrameDataRead(std::string &&frame_data)
 {
 	logRpcData() << __PRETTY_FUNCTION__ << "+++++++++++++++++++++++++++++++++";
-	logRpcData().nospace() << "FRAME DATA " << frame_data.size() << " bytes of data read:\n" << shv::chainpack::Utils::hexDump(frame_data);
+	logRpcData().nospace() << "FRAME DATA " << frame_data.size() << " bytes of data read:\n" << shv::chainpack::utils::hexDump(frame_data);
 	try {
 		auto frame = RpcFrame::fromChainPack(std::move(frame_data));
 		onRpcFrameReceived(std::move(frame));

diff --git a/libshvchainpack/src/chainpack/utils.cpp b/libshvchainpack/src/chainpack/utils.cpp
@@ -72,6 +72,11 @@ string hexArray(const char *bytes, size_t n)
 	return ret + ']';
 }
 
+string hexDump(const std::string_view &bytes)
+{
+	return utils::hexDump(bytes.data(), bytes.size());
+}
+
 }
 std::string Utils::removeJsonComments(const std::string &json_str)
 {
@@ -152,11 +157,6 @@ std::string Utils::fromHex(const std::string &bytes)
 	return ret;
 }
 
-std::string Utils::hexDump(const std::string_view &bytes)
-{
-	return utils::hexDump(bytes.data(), bytes.size());
-}
-
 RpcValue Utils::mergeMaps(const RpcValue &value_base, const RpcValue &value_over)
 {
 	if(value_over.isMap() && value_base.isMap()) {

diff --git a/libshviotqt/src/rpc/socket.cpp b/libshviotqt/src/rpc/socket.cpp
@@ -61,6 +61,7 @@ void FrameWriter::flushToWebSocket(QWebSocket *socket)
 void StreamFrameReader::addData(std::string_view data)
 {
 	m_readBuffer += data;
+	shvDebug() << "received:\n" << chainpack::utils::hexDump(data);
 	while (true) {
 		std::istringstream in(m_readBuffer);
 		int err_code;
@@ -82,6 +83,9 @@ void StreamFrameReader::addData(std::string_view data)
 			m_readBuffer = std::string(m_readBuffer, consumed_len + frame_size);
 			m_frames.push_back(std::move(frame));
 		}
+		else {
+			break;
+		}
 	}
 }