From baef6c962ed962c1d10b29e576fb7d75a422f47f Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <jonathan.naylor@igence.com>
Date: Fri, 24 Nov 2017 09:02:32 +0000
Subject: [PATCH] Simplify the logic by removing the ring buffer.

---
 DMRNetwork.cpp | 54 +++++++++++++++++++-------------------------------
 DMRNetwork.h   |  5 ++---
 2 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp
index 4ff02f4..f478a89 100644
--- a/DMRNetwork.cpp
+++ b/DMRNetwork.cpp
@@ -51,7 +51,6 @@ m_timeoutTimer(1000U, 60U),
 m_buffer(NULL),
 m_salt(NULL),
 m_streamId(NULL),
-m_rxData(1000U, "DMR Network"),
 m_options(),
 m_callsign(),
 m_rxFrequency(0U),
@@ -148,35 +147,6 @@ bool CDMRNetwork::read(CDMRData& data)
 	if (m_status != RUNNING)
 		return false;
 
-	if (!m_rxData.isEmpty()) {
-		unsigned char length = 0U;
-
-		m_rxData.getData(&length, 1U);
-		m_rxData.getData(m_buffer, length);
-
-		// Is this a data packet?
-		if (::memcmp(m_buffer, "DMRD", 4U) == 0) {
-			unsigned int slotNo = (m_buffer[15U] & 0x80U) == 0x80U ? 2U : 1U;
-
-			bool wanted = true;
-
-			// DMO mode slot disabling
-			if (slotNo == 1U && !m_duplex)
-				wanted = false;
-
-			// Individual slot disabling
-			if (slotNo == 1U && !m_slot1)
-				wanted = false;
-			if (slotNo == 2U && !m_slot2)
-				wanted = false;
-
-			if (wanted) {
-				unsigned char seqNo = m_buffer[4U];
-				m_jitterBuffers[slotNo]->addData(m_buffer, length, seqNo);
-			}
-		}
-	}
-
 	for (unsigned int slotNo = 1U; slotNo <= 2U; slotNo++) {
 		unsigned int length = 0U;
 		JB_STATUS status = m_jitterBuffers[slotNo]->getData(m_buffer, length);
@@ -403,10 +373,7 @@ void CDMRNetwork::clock(unsigned int ms)
 			if (m_enabled) {
 				if (m_debug)
 					CUtils::dump(1U, "Network Received", m_buffer, length);
-
-				unsigned char len = length;
-				m_rxData.addData(&len, 1U);
-				m_rxData.addData(m_buffer, len);
+				receiveData(m_buffer, length);
 			}
 		} else if (::memcmp(m_buffer, "MSTNAK",  6U) == 0) {
 			if (m_status == RUNNING) {
@@ -514,6 +481,25 @@ void CDMRNetwork::reset(unsigned int slotNo)
 	m_jitterBuffers[slotNo]->reset();
 }
 
+void CDMRNetwork::receiveData(const unsigned char* data, unsigned int length)
+{
+	unsigned int slotNo = (m_buffer[15U] & 0x80U) == 0x80U ? 2U : 1U;
+
+	// DMO mode slot disabling
+	if (slotNo == 1U && !m_duplex)
+		return;
+
+	// Individual slot disabling
+	if (slotNo == 1U && !m_slot1)
+		return;
+	if (slotNo == 2U && !m_slot2)
+		return;
+
+	unsigned char seqNo = m_buffer[4U];
+
+	m_jitterBuffers[slotNo]->addData(m_buffer, length, seqNo);
+}
+
 bool CDMRNetwork::writeLogin()
 {
 	unsigned char buffer[8U];
diff --git a/DMRNetwork.h b/DMRNetwork.h
index d475d90..f54e440 100644
--- a/DMRNetwork.h
+++ b/DMRNetwork.h
@@ -22,7 +22,6 @@
 #include "JitterBuffer.h"
 #include "UDPSocket.h"
 #include "Timer.h"
-#include "RingBuffer.h"
 #include "DMRData.h"
 #include "Defines.h"
 
@@ -90,8 +89,6 @@ private:
 	unsigned char* m_salt;
 	uint32_t*      m_streamId;
 
-	CRingBuffer<unsigned char> m_rxData;
-
 	std::string    m_options;
 
 	std::string    m_callsign;
@@ -115,6 +112,8 @@ private:
 	bool writePing();
 
 	bool write(const unsigned char* data, unsigned int length);
+
+	void receiveData(const unsigned char* data, unsigned int length);
 };
 
 #endif