From 299768ef73d8f6b12852ea4d8052340cb1a3fce0 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sun, 25 May 2025 06:33:09 +0200 Subject: [PATCH 1/8] Add some debug info #55 --- Common/RepeaterHandler.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Common/RepeaterHandler.cpp b/Common/RepeaterHandler.cpp index 3fbb913..5d41698 100644 --- a/Common/RepeaterHandler.cpp +++ b/Common/RepeaterHandler.cpp @@ -611,6 +611,7 @@ void CRepeaterHandler::processRepeater(CHeaderData& header) sendToIncoming(header); // Reset the slow data text collector + CLog::logDebug("Issue_55 reset Text Collector"); m_textCollector.reset(); m_text.clear(); @@ -831,11 +832,17 @@ void CRepeaterHandler::processRepeater(CAMBEData& data) if (m_text.empty() && !data.isEnd()) { m_textCollector.writeData(data); + CLog::logDebug("Issue_55, received data end"); + bool hasText = m_textCollector.hasData(); if (hasText) { m_text = m_textCollector.getData(); + CLog::logDebug("Issue_55, received text %s", m_text.c_str()); sendHeard(m_text); } + else { + CLog::logDebug("Issue_55, data had no text"); + } } data.setText(m_text); From ca2e351b6505b343aa12495cbfda4aa37163b48c Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sun, 25 May 2025 06:46:33 +0200 Subject: [PATCH 2/8] Add more debug information #55 --- IRCDDB/IRCDDBMultiClient.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/IRCDDB/IRCDDBMultiClient.cpp b/IRCDDB/IRCDDBMultiClient.cpp index bd8378e..19402d8 100644 --- a/IRCDDB/IRCDDBMultiClient.cpp +++ b/IRCDDB/IRCDDBMultiClient.cpp @@ -125,6 +125,7 @@ bool CIRCDDBMultiClient::sendHeardWithTXMsg(const std::string & myCall, const st for (unsigned int i = 0; i < m_clients.size(); i++) { result = m_clients[i]->sendHeardWithTXMsg(myCall, myCallExt, yourCall, rpt1, rpt2, flag1, flag2, flag3, network_destination, tx_message) && result; + CLog::logDebug("Issue_55 sent %s/%s \"%s\" to ircddb client %i", myCall.c_str(), myCallExt.c_str(), tx_message.c_str(), i); } return result; From 0e63ee91514c2023e0db4f5126789a92cf5ee649 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sun, 25 May 2025 06:54:12 +0200 Subject: [PATCH 3/8] Make debug text prettier #55 --- Common/RepeaterHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/RepeaterHandler.cpp b/Common/RepeaterHandler.cpp index 5d41698..4a58faf 100644 --- a/Common/RepeaterHandler.cpp +++ b/Common/RepeaterHandler.cpp @@ -837,7 +837,7 @@ void CRepeaterHandler::processRepeater(CAMBEData& data) bool hasText = m_textCollector.hasData(); if (hasText) { m_text = m_textCollector.getData(); - CLog::logDebug("Issue_55, received text %s", m_text.c_str()); + CLog::logDebug("Issue_55, received text \"%s\"", m_text.c_str()); sendHeard(m_text); } else { From 71a1d61a3d50528422cdbfaa1a42b9ed429af76f Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sun, 25 May 2025 07:01:03 +0200 Subject: [PATCH 4/8] fixed misleading debug text --- Common/RepeaterHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/RepeaterHandler.cpp b/Common/RepeaterHandler.cpp index 4a58faf..bdf293c 100644 --- a/Common/RepeaterHandler.cpp +++ b/Common/RepeaterHandler.cpp @@ -832,7 +832,7 @@ void CRepeaterHandler::processRepeater(CAMBEData& data) if (m_text.empty() && !data.isEnd()) { m_textCollector.writeData(data); - CLog::logDebug("Issue_55, received data end"); + CLog::logDebug("Issue_55, received text data"); bool hasText = m_textCollector.hasData(); if (hasText) { From 0d434548fc8ad10b3bf499f09db59d806efbc9ed Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 28 May 2025 11:17:39 +0200 Subject: [PATCH 5/8] Add fixed message for testing #55 --- Common/TextCollector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/TextCollector.cpp b/Common/TextCollector.cpp index 5ea9838..50a1b99 100644 --- a/Common/TextCollector.cpp +++ b/Common/TextCollector.cpp @@ -139,5 +139,5 @@ std::string CTextCollector::getData() m_has2 = false; m_has3 = false; - return std::string(m_data); + return std::string("ABCDEFGHIJ0123456789"); } From 4e7a58c5d7a4a5ef500d90b2d86a74a843899165 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 28 May 2025 13:33:02 +0200 Subject: [PATCH 6/8] specifiy length of m_data when constructing string #55 --- Common/TextCollector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/TextCollector.cpp b/Common/TextCollector.cpp index 50a1b99..72ef630 100644 --- a/Common/TextCollector.cpp +++ b/Common/TextCollector.cpp @@ -139,5 +139,5 @@ std::string CTextCollector::getData() m_has2 = false; m_has3 = false; - return std::string("ABCDEFGHIJ0123456789"); + return std::string(m_data, TEXT_DATA_LENGTH); } From a258df9049cb13f99f85271130737c78687343f0 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 28 May 2025 19:24:44 +0200 Subject: [PATCH 7/8] Update readme #55 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index bc147b0..ba80322 100644 --- a/README.md +++ b/README.md @@ -158,11 +158,12 @@ The testing framwework used is Google Test. # 6. Version History ## 6.1. Version 1.0 +- [**Bugfix**] Fix corrupted slow data leading to DV Text Message not being sent to ircddb ([#55](https://github.com/F4FXL/DStarGateway/issues/55)) - [**Improvement**] Add version info to output of --version ([#56](https://github.com/F4FXL/DStarGateway/issues/56)) - [**Improvement**] Automatically download hosts files on startup. It is also possible to specify custom hosts files to override hosts from the internet. Needs some configuration adjustement, see example.cfg. ([#50](https://github.com/F4FXL/DStarGateway/issues/50)) - [**Improvement**] Limit log reporting ([#44](https://github.com/F4FXL/DStarGateway/issues/44)) - [**Improvement**] Improve CI to include all variants of build configurations ([#40](https://github.com/F4FXL/DStarGateway/issues/40)) -- [**Bugfix**] Fix #43 Cache not updated when answering ircddb gateway is only conected to one network ([#43](https://github.com/F4FXL/DStarGateway/issues/43)) +- [**Bugfix**] Fix #43 Cache not updated when answering ircddb gateway is only connected to one network ([#43](https://github.com/F4FXL/DStarGateway/issues/43)) - [**Bugfix**] Fix #37 Unable to transmit multiple files (DGWVoiceTransmit) ([#37](https://github.com/F4FXL/DStarGateway/issues/37)) - [**Bugfix**] Fix #36 Error1 Build fails in some environment ([#36](https://github.com/F4FXL/DStarGateway/issues/36)) - [**Bugfix**] Fix #38 g++ 13 build ([#38](https://github.com/F4FXL/DStarGateway/issues/38)) From e9e7579df0f2ff14d5ecf96f9a04b5986274bcb6 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 28 May 2025 19:26:17 +0200 Subject: [PATCH 8/8] remove debug messages #55 --- Common/RepeaterHandler.cpp | 7 ------- IRCDDB/IRCDDBMultiClient.cpp | 1 - 2 files changed, 8 deletions(-) diff --git a/Common/RepeaterHandler.cpp b/Common/RepeaterHandler.cpp index bdf293c..3fbb913 100644 --- a/Common/RepeaterHandler.cpp +++ b/Common/RepeaterHandler.cpp @@ -611,7 +611,6 @@ void CRepeaterHandler::processRepeater(CHeaderData& header) sendToIncoming(header); // Reset the slow data text collector - CLog::logDebug("Issue_55 reset Text Collector"); m_textCollector.reset(); m_text.clear(); @@ -832,17 +831,11 @@ void CRepeaterHandler::processRepeater(CAMBEData& data) if (m_text.empty() && !data.isEnd()) { m_textCollector.writeData(data); - CLog::logDebug("Issue_55, received text data"); - bool hasText = m_textCollector.hasData(); if (hasText) { m_text = m_textCollector.getData(); - CLog::logDebug("Issue_55, received text \"%s\"", m_text.c_str()); sendHeard(m_text); } - else { - CLog::logDebug("Issue_55, data had no text"); - } } data.setText(m_text); diff --git a/IRCDDB/IRCDDBMultiClient.cpp b/IRCDDB/IRCDDBMultiClient.cpp index 19402d8..bd8378e 100644 --- a/IRCDDB/IRCDDBMultiClient.cpp +++ b/IRCDDB/IRCDDBMultiClient.cpp @@ -125,7 +125,6 @@ bool CIRCDDBMultiClient::sendHeardWithTXMsg(const std::string & myCall, const st for (unsigned int i = 0; i < m_clients.size(); i++) { result = m_clients[i]->sendHeardWithTXMsg(myCall, myCallExt, yourCall, rpt1, rpt2, flag1, flag2, flag3, network_destination, tx_message) && result; - CLog::logDebug("Issue_55 sent %s/%s \"%s\" to ircddb client %i", myCall.c_str(), myCallExt.c_str(), tx_message.c_str(), i); } return result;