ensure DataHeader's are always passed by reference;

src/p25/lc/AMBT.cpp

@@ -85,7 +85,7 @@ void AMBT::encode(uint8_t* data, bool rawTSBK, bool noTrellis)
 /// </summary>
 /// <param name="tsbk"></param>
 /// <returns></returns>
-ulong64_t AMBT::toValue(const data::DataHeader dataHeader, const uint8_t* pduUserData)
+ulong64_t AMBT::toValue(const data::DataHeader& dataHeader, const uint8_t* pduUserData)
 {
     ulong64_t tsbkValue = 0U;
 
@@ -109,7 +109,7 @@ ulong64_t AMBT::toValue(const data::DataHeader dataHeader, const uint8_t* pduUse
 /// <param name="blocks"></param>
 /// <param name="pduUserData"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool AMBT::decode(const data::DataHeader dataHeader, const data::DataBlock* blocks, uint8_t* pduUserData)
+bool AMBT::decode(const data::DataHeader& dataHeader, const data::DataBlock* blocks, uint8_t* pduUserData)
 {
     assert(blocks != nullptr);
     assert(pduUserData != nullptr);

src/p25/lc/AMBT.h

@@ -46,7 +46,7 @@ namespace p25
             AMBT();
 
             /// <summary>Decode a alternate trunking signalling block.</summary>
-            virtual bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks) = 0;
+            virtual bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) = 0;
             /// <summary>Encode a alternate trunking signalling block.</summary>
             virtual void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) = 0;
 
@@ -57,10 +57,10 @@ namespace p25
 
         protected:
             /// <summary>Internal helper to convert TSBK bytes to a 64-bit long value.</summary>
-            static ulong64_t toValue(const data::DataHeader dataHeader, const uint8_t* pduUserData);
+            static ulong64_t toValue(const data::DataHeader& dataHeader, const uint8_t* pduUserData);
 
             /// <summary>Internal helper to decode a trunking signalling block.</summary>
-            bool decode(const data::DataHeader dataHeader, const data::DataBlock* blocks, uint8_t* pduUserData);
+            bool decode(const data::DataHeader& dataHeader, const data::DataBlock* blocks, uint8_t* pduUserData);
             /// <summary>Internal helper to encode a trunking signalling block.</summary>
             void encode(data::DataHeader& dataHeader, uint8_t* pduUserData);
         };

src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.cpp

@@ -53,7 +53,7 @@ MBT_IOSP_ACK_RSP::MBT_IOSP_ACK_RSP() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_ACK_RSP::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_ACK_RSP::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_IOSP_ACK_RSP.h

@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_ACK_RSP();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.cpp

@@ -53,7 +53,7 @@ MBT_IOSP_CALL_ALRT::MBT_IOSP_CALL_ALRT() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_CALL_ALRT::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_CALL_ALRT::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_IOSP_CALL_ALRT.h

@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_CALL_ALRT();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.cpp

@@ -54,7 +54,7 @@ MBT_IOSP_EXT_FNCT::MBT_IOSP_EXT_FNCT() : AMBT(),
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_EXT_FNCT::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_EXT_FNCT::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_IOSP_EXT_FNCT.h

@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_EXT_FNCT();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.cpp

@@ -53,7 +53,7 @@ MBT_IOSP_GRP_AFF::MBT_IOSP_GRP_AFF() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_GRP_AFF::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_GRP_AFF::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_IOSP_GRP_AFF.h

@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_GRP_AFF();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.cpp

@@ -54,7 +54,7 @@ MBT_IOSP_MSG_UPDT::MBT_IOSP_MSG_UPDT() : AMBT(),
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_MSG_UPDT::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_MSG_UPDT::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_IOSP_MSG_UPDT.h

@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_MSG_UPDT();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.cpp

@@ -54,7 +54,7 @@ MBT_IOSP_STS_UPDT::MBT_IOSP_STS_UPDT() : AMBT(),
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_IOSP_STS_UPDT::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_IOSP_STS_UPDT::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_IOSP_STS_UPDT.h

@@ -47,7 +47,7 @@ namespace p25
                 MBT_IOSP_STS_UPDT();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.cpp

@@ -74,7 +74,7 @@ MBT_ISP_AUTH_RESP_M::~MBT_ISP_AUTH_RESP_M()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_ISP_AUTH_RESP_M::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_ISP_AUTH_RESP_M::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_ISP_AUTH_RESP_M.h

@@ -48,7 +48,7 @@ namespace p25
                 ~MBT_ISP_AUTH_RESP_M();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.cpp

@@ -53,7 +53,7 @@ MBT_ISP_AUTH_SU_DMD::MBT_ISP_AUTH_SU_DMD() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_ISP_AUTH_SU_DMD::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_ISP_AUTH_SU_DMD::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_ISP_AUTH_SU_DMD.h

@@ -46,7 +46,7 @@ namespace p25
                 MBT_ISP_AUTH_SU_DMD();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.cpp

@@ -53,7 +53,7 @@ MBT_ISP_CAN_SRV_REQ::MBT_ISP_CAN_SRV_REQ() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_ISP_CAN_SRV_REQ::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_ISP_CAN_SRV_REQ::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_ISP_CAN_SRV_REQ.h

@@ -46,7 +46,7 @@ namespace p25
                 MBT_ISP_CAN_SRV_REQ();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.cpp

@@ -59,7 +59,7 @@ MBT_OSP_ADJ_STS_BCAST::MBT_OSP_ADJ_STS_BCAST() : AMBT(),
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_OSP_ADJ_STS_BCAST::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_OSP_ADJ_STS_BCAST::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_OSP_ADJ_STS_BCAST.h

@@ -46,7 +46,7 @@ namespace p25
                 MBT_OSP_ADJ_STS_BCAST();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.cpp

@@ -74,7 +74,7 @@ MBT_OSP_AUTH_DMD::~MBT_OSP_AUTH_DMD()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_OSP_AUTH_DMD::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_OSP_AUTH_DMD::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_OSP_AUTH_DMD.h

@@ -48,7 +48,7 @@ namespace p25
                 ~MBT_OSP_AUTH_DMD();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.cpp

@@ -53,7 +53,7 @@ MBT_OSP_NET_STS_BCAST::MBT_OSP_NET_STS_BCAST() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_OSP_NET_STS_BCAST::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_OSP_NET_STS_BCAST::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_OSP_NET_STS_BCAST.h

@@ -46,7 +46,7 @@ namespace p25
                 MBT_OSP_NET_STS_BCAST();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.cpp

@@ -53,7 +53,7 @@ MBT_OSP_RFSS_STS_BCAST::MBT_OSP_RFSS_STS_BCAST() : AMBT()
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns>True, if TSBK was decoded, otherwise false.</returns>
-bool MBT_OSP_RFSS_STS_BCAST::decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+bool MBT_OSP_RFSS_STS_BCAST::decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != NULL);
 

src/p25/lc/tsbk/MBT_OSP_RFSS_STS_BCAST.h

@@ -46,7 +46,7 @@ namespace p25
                 MBT_OSP_RFSS_STS_BCAST();
 
                 /// <summary>Decode a alternate trunking signalling block.</summary>
-                bool decodeMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
                 /// <summary>Encode a alternate trunking signalling block.</summary>
                 void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
 

src/p25/lc/tsbk/TSBKFactory.cpp

@@ -247,7 +247,7 @@ std::unique_ptr<TSBK> TSBKFactory::createTSBK(const uint8_t* data, bool rawTSBK)
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns></returns>
-std::unique_ptr<AMBT> TSBKFactory::createAMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks)
+std::unique_ptr<AMBT> TSBKFactory::createAMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(blocks != nullptr);
 
@@ -358,7 +358,7 @@ std::unique_ptr<TSBK> TSBKFactory::decode(TSBK* tsbk, const uint8_t* data, bool
 /// <param name="dataHeader"></param>
 /// <param name="blocks"></param>
 /// <returns></returns>
-std::unique_ptr<AMBT> TSBKFactory::decode(AMBT* ambt, const data::DataHeader dataHeader, const data::DataBlock* blocks)
+std::unique_ptr<AMBT> TSBKFactory::decode(AMBT* ambt, const data::DataHeader& dataHeader, const data::DataBlock* blocks)
 {
     assert(ambt != nullptr);
     assert(blocks != nullptr);

src/p25/lc/tsbk/TSBKFactory.h

@@ -116,7 +116,7 @@ namespace p25
                 /// <summary>Create an instance of a TSBK.</summary>
                 static std::unique_ptr<TSBK> createTSBK(const uint8_t* data, bool rawTSBK = false);
                 /// <summary>Create an instance of a AMBT.</summary>
-                static std::unique_ptr<AMBT> createAMBT(const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                static std::unique_ptr<AMBT> createAMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
 
                 /// <summary>Sets the flag indicating CRC-errors should be warnings and not errors.</summary>
                 static void setWarnCRC(bool warnCRC) { m_warnCRC = warnCRC; }
@@ -127,7 +127,7 @@ namespace p25
                 /// <summary></summary>
                 static std::unique_ptr<TSBK> decode(TSBK* tsbk, const uint8_t* data, bool rawTSBK = false);
                 /// <summary></summary>
-                static std::unique_ptr<AMBT> decode(AMBT* ambt, const data::DataHeader dataHeader, const data::DataBlock* blocks);
+                static std::unique_ptr<AMBT> decode(AMBT* ambt, const data::DataHeader& dataHeader, const data::DataBlock* blocks);
             };
         } // namespace tsbk
     } // namespace lc

src/p25/packet/Data.cpp

@@ -679,7 +679,7 @@ bool Data::hasLLIdFNEReg(uint32_t llId) const
 /// <param name="dataHeader"></param>
 /// <param name="pduUserData"></param>
 /// <param name="clearBeforeWrite"></param>
-void Data::writeRF_PDU_User(data::DataHeader dataHeader, const uint8_t* pduUserData, bool clearBeforeWrite)
+void Data::writeRF_PDU_User(data::DataHeader& dataHeader, const uint8_t* pduUserData, bool clearBeforeWrite)
 {
     assert(pduUserData != nullptr);
 

src/p25/packet/Data.h

@@ -74,7 +74,7 @@ namespace p25
             bool hasLLIdFNEReg(uint32_t llId) const;
 
             /// <summary>Helper to write user data as a P25 PDU packet.</summary>
-            void writeRF_PDU_User(data::DataHeader dataHeader, const uint8_t* pduUserData, bool clearBeforeWrite = false);
+            void writeRF_PDU_User(data::DataHeader& dataHeader, const uint8_t* pduUserData, bool clearBeforeWrite = false);
 
             /// <summary>Updates the processor by the passed number of milliseconds.</summary>
             void clock(uint32_t ms);

src/p25/packet/Trunk.cpp

@@ -907,7 +907,7 @@ bool Trunk::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L
 /// </summary>
 /// <param name="dataHeader"></param>
 /// <param name="dataBlock"></param>
-bool Trunk::processMBT(DataHeader dataHeader, DataBlock* blocks)
+bool Trunk::processMBT(DataHeader& dataHeader, DataBlock* blocks)
 {
     if (!m_p25->m_control) {
         return false;

src/p25/packet/Trunk.h

@@ -67,7 +67,7 @@ namespace p25
             virtual bool processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::LowSpeedData& lsd, uint8_t& duid);
 
             /// <summary>Helper used to process AMBTs from PDU data.</summary>
-            bool processMBT(data::DataHeader dataHeader, data::DataBlock* blocks);
+            bool processMBT(data::DataHeader& dataHeader, data::DataBlock* blocks);
 
             /// <summary>Helper to write P25 adjacent site information to the network.</summary>
             void writeAdjSSNetwork();