From 375464c1cc82849bb40170e980ad5c12bd3059c8 Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Tue, 14 Mar 2023 10:55:42 -0700
Subject: [PATCH] added p25 and usrp data to DVFramePacket(), bumped version

---
 reflector/DVFramePacket.cpp  | 20 ++++++--------------
 reflector/DVFramePacket.h    |  3 ---
 reflector/DVHeaderPacket.cpp | 31 -------------------------------
 reflector/DVHeaderPacket.h   |  3 ---
 reflector/Main.cpp           |  2 +-
 5 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/reflector/DVFramePacket.cpp b/reflector/DVFramePacket.cpp
index eaab0a5..0dfc2b1 100644
--- a/reflector/DVFramePacket.cpp
+++ b/reflector/DVFramePacket.cpp
@@ -175,7 +175,7 @@ std::unique_ptr<CPacket> CDvFramePacket::Copy(void)
 // Network
 unsigned int CDvFramePacket::GetNetworkSize()
 {
-	return CPacket::GetNetworkSize() + 4 + 3 + 7 + 14 + 9 + 9 + 16;
+	return CPacket::GetNetworkSize() + 4 + 3 + 7 + 14 + 9 + 9 + 16 + 11 + 320;
 }
 
 CDvFramePacket::CDvFramePacket(const CBuffer &buf) : CPacket(buf)
@@ -194,6 +194,8 @@ CDvFramePacket::CDvFramePacket(const CBuffer &buf) : CPacket(buf)
 		memcpy(m_TCPack.dstar,	data+off, 9);	off += 9;
 		memcpy(m_TCPack.dmr,	data+off, 9);	off += 9;
 		memcpy(m_TCPack.m17,	data+off, 16);	off += 16;
+		memcpy(m_TCPack.p25,    data+off, 11);	off += 11;
+		memcpy(m_TCPack.usrp,   data+off, 320);
 		SetTCParams(seq);
 	}
 	else
@@ -215,7 +217,9 @@ void CDvFramePacket::EncodeInterlinkPacket(CBuffer &buf) const
 	memcpy(data+off, m_Nonce,        14); off += 14;
 	memcpy(data+off, m_TCPack.dstar,  9); off += 9;
 	memcpy(data+off, m_TCPack.dmr,    9); off += 9;
-	memcpy(data+off, m_TCPack.m17,   16);
+	memcpy(data+off, m_TCPack.m17,   16); off += 16;
+	memcpy(data+off, m_TCPack.p25,   11); off += 11;
+	memcpy(data+off, m_TCPack.usrp, 320);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -262,15 +266,3 @@ void CDvFramePacket::SetTCParams(uint32_t seq)
 	m_TCPack.module = m_cModule;
 	m_TCPack.rt_timer.start();
 }
-
-////////////////////////////////////////////////////////////////////////////////////////
-// operators
-
-bool CDvFramePacket::operator ==(const CDvFramePacket &DvFrame) const
-{
-	return ( (memcmp(m_TCPack.dstar, DvFrame.m_TCPack.dstar, 9) == 0)
-			 && (memcmp(m_uiDvData, DvFrame.m_uiDvData, 3) == 0)
-			 && (memcmp(m_TCPack.dmr, DvFrame.m_TCPack.dmr, 9) == 0)
-			 && (memcmp(m_uiDvSync, DvFrame.m_uiDvSync, 7) == 0)
-		   );
-}
diff --git a/reflector/DVFramePacket.h b/reflector/DVFramePacket.h
index 21bbcd8..d4c964a 100644
--- a/reflector/DVFramePacket.h
+++ b/reflector/DVFramePacket.h
@@ -80,9 +80,6 @@ public:
 	void SetCodecData(const STCPacket *pack);
 	void SetTCParams(uint32_t seq);
 
-	// operators
-	bool operator ==(const CDvFramePacket &) const;
-
 protected:
 	// data (dstar)
 	uint8_t m_uiDvData[3];
diff --git a/reflector/DVHeaderPacket.cpp b/reflector/DVHeaderPacket.cpp
index bc23760..d037faa 100644
--- a/reflector/DVHeaderPacket.cpp
+++ b/reflector/DVHeaderPacket.cpp
@@ -201,34 +201,3 @@ bool CDvHeaderPacket::IsValid(void) const
 
 	return valid;
 }
-
-
-////////////////////////////////////////////////////////////////////////////////////////
-// operators
-
-bool CDvHeaderPacket::operator ==(const CDvHeaderPacket &Header) const
-{
-	return ( (m_uiFlag1 == Header.m_uiFlag1) &&
-			 (m_uiFlag2 == Header.m_uiFlag2) &&
-			 (m_uiFlag3 == Header.m_uiFlag3) &&
-			 (m_csUR == Header.m_csUR) &&
-			 (m_csRPT1 == Header.m_csRPT1) &&
-			 (m_csRPT2 == Header.m_csRPT2) &&
-			 (m_csMY == Header.m_csMY) );
-}
-
-#ifdef IMPLEMENT_CDVHEADERPACKET_CONST_CHAR_OPERATOR
-CDvHeaderPacket::operator const char *() const
-{
-	char *sz = (char *)(const char *)m_sz;
-
-	std::sprintf(sz, "%02X %02X %02X\n%s\n%s\n%s\n%s",
-				 m_uiFlag1, m_uiFlag2, m_uiFlag3,
-				 (const char *)m_csUR,
-				 (const char *)m_csRPT1,
-				 (const char *)m_csRPT2,
-				 (const char *)m_csMY);
-
-	return m_sz;
-}
-#endif
diff --git a/reflector/DVHeaderPacket.h b/reflector/DVHeaderPacket.h
index 7bbfd29..63793be 100644
--- a/reflector/DVHeaderPacket.h
+++ b/reflector/DVHeaderPacket.h
@@ -92,9 +92,6 @@ public:
 	void SetRpt2Callsign(const CCallsign &cs)       { m_csRPT2 = cs; }
 	void SetRpt2Module(char c)                      { m_csRPT2.SetCSModule(c); }
 
-	// operators
-	bool operator ==(const CDvHeaderPacket &) const;
-
 protected:
 	// data
 	uint8_t     m_uiFlag1;
diff --git a/reflector/Main.cpp b/reflector/Main.cpp
index afa2209..098d35a 100644
--- a/reflector/Main.cpp
+++ b/reflector/Main.cpp
@@ -28,7 +28,7 @@ SJsonKeys   g_Keys;
 CReflector  g_Reflector;
 CGateKeeper g_GateKeeper;
 CConfigure  g_Configure;
-CVersion    g_Version(3,0,0); // The major byte should only change if the interlink packet changes!
+CVersion    g_Version(3,0,1); // The major byte should only change if the interlink packet changes!
 CLookupDmr  g_LDid;
 CLookupNxdn g_LNid;
 CLookupYsf  g_LYtr;