diff --git a/DMR2NXDN/DMR2NXDN.cpp b/DMR2NXDN/DMR2NXDN.cpp index d0580ca..0aae745 100644 --- a/DMR2NXDN/DMR2NXDN.cpp +++ b/DMR2NXDN/DMR2NXDN.cpp @@ -105,14 +105,19 @@ m_dmrinfo(false), m_config(NULL), m_configLen(0U) { + m_nxdnFrame = new unsigned char[200U]; + m_dmrFrame = new unsigned char[50U]; + m_config = new unsigned char[400U]; + ::memset(m_nxdnFrame, 0U, 200U); ::memset(m_dmrFrame, 0U, 50U); - - m_config = new unsigned char[400U]; } CDMR2NXDN::~CDMR2NXDN() { + delete[] m_nxdnFrame; + delete[] m_dmrFrame; + delete[] m_config; } int CDMR2NXDN::run() diff --git a/DMR2NXDN/DMR2NXDN.h b/DMR2NXDN/DMR2NXDN.h index fe24a30..c8425b8 100644 --- a/DMR2NXDN/DMR2NXDN.h +++ b/DMR2NXDN/DMR2NXDN.h @@ -73,8 +73,8 @@ private: unsigned int m_nxdnSrc; unsigned int m_nxdnDst; unsigned char m_dmrLastDT; - unsigned char m_nxdnFrame[200U]; - unsigned char m_dmrFrame[50U]; + unsigned char* m_nxdnFrame; + unsigned char* m_dmrFrame; unsigned int m_dmrFrames; unsigned int m_nxdnFrames; CDMREmbeddedData m_EmbeddedLC; diff --git a/DMR2NXDN/Version.h b/DMR2NXDN/Version.h index 6330a5a..5f8e1f7 100644 --- a/DMR2NXDN/Version.h +++ b/DMR2NXDN/Version.h @@ -20,6 +20,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20180728"; +const char* VERSION = "20180729"; #endif diff --git a/DMR2YSF/Version.h b/DMR2YSF/Version.h index 6330a5a..5f8e1f7 100644 --- a/DMR2YSF/Version.h +++ b/DMR2YSF/Version.h @@ -20,6 +20,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20180728"; +const char* VERSION = "20180729"; #endif diff --git a/NXDN2DMR/NXDN2DMR.cpp b/NXDN2DMR/NXDN2DMR.cpp index c8bd543..1799168 100644 --- a/NXDN2DMR/NXDN2DMR.cpp +++ b/NXDN2DMR/NXDN2DMR.cpp @@ -111,12 +111,17 @@ m_dmrinfo(false), m_xlxmodule(), m_xlxConnected(false) { + m_nxdnFrame = new unsigned char[200U]; + m_dmrFrame = new unsigned char[50U]; + ::memset(m_nxdnFrame, 0U, 200U); ::memset(m_dmrFrame, 0U, 50U); } CNXDN2DMR::~CNXDN2DMR() { + delete[] m_nxdnFrame; + delete[] m_dmrFrame; } int CNXDN2DMR::run() diff --git a/NXDN2DMR/NXDN2DMR.h b/NXDN2DMR/NXDN2DMR.h index 6994f39..851b213 100644 --- a/NXDN2DMR/NXDN2DMR.h +++ b/NXDN2DMR/NXDN2DMR.h @@ -84,8 +84,8 @@ private: unsigned int m_nxdnSrc; unsigned int m_nxdnDst; unsigned char m_dmrLastDT; - unsigned char m_nxdnFrame[200U]; - unsigned char m_dmrFrame[50U]; + unsigned char* m_nxdnFrame; + unsigned char* m_dmrFrame; unsigned int m_dmrFrames; unsigned int m_nxdnFrames; CDMREmbeddedData m_EmbeddedLC; diff --git a/NXDN2DMR/Version.h b/NXDN2DMR/Version.h index 6330a5a..5f8e1f7 100644 --- a/NXDN2DMR/Version.h +++ b/NXDN2DMR/Version.h @@ -20,6 +20,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20180728"; +const char* VERSION = "20180729"; #endif diff --git a/YSF2DMR/Version.h b/YSF2DMR/Version.h index 6330a5a..5f8e1f7 100644 --- a/YSF2DMR/Version.h +++ b/YSF2DMR/Version.h @@ -20,6 +20,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20180728"; +const char* VERSION = "20180729"; #endif diff --git a/YSF2DMR/YSF2DMR.cpp b/YSF2DMR/YSF2DMR.cpp index 346d1e8..d925383 100644 --- a/YSF2DMR/YSF2DMR.cpp +++ b/YSF2DMR/YSF2DMR.cpp @@ -118,12 +118,17 @@ m_enableWiresX(false), m_remoteGateway(false), m_hangTime(1000U) { + m_ysfFrame = new unsigned char[200U]; + m_dmrFrame = new unsigned char[50U]; + ::memset(m_ysfFrame, 0U, 200U); ::memset(m_dmrFrame, 0U, 50U); } CYSF2DMR::~CYSF2DMR() { + delete[] m_ysfFrame; + delete[] m_dmrFrame; } int CYSF2DMR::run() diff --git a/YSF2DMR/YSF2DMR.h b/YSF2DMR/YSF2DMR.h index d299e51..0a3db21 100644 --- a/YSF2DMR/YSF2DMR.h +++ b/YSF2DMR/YSF2DMR.h @@ -86,8 +86,8 @@ private: std::string m_netDst; std::string m_ysfSrc; unsigned char m_dmrLastDT; - unsigned char m_ysfFrame[200U]; - unsigned char m_dmrFrame[50U]; + unsigned char* m_ysfFrame; + unsigned char* m_dmrFrame; CGPS* m_gps; CDTMF* m_dtmf; CAPRSReader* m_APRS; diff --git a/YSF2NXDN/Version.h b/YSF2NXDN/Version.h index 6330a5a..5f8e1f7 100644 --- a/YSF2NXDN/Version.h +++ b/YSF2NXDN/Version.h @@ -20,6 +20,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20180728"; +const char* VERSION = "20180729"; #endif diff --git a/YSF2NXDN/YSF2NXDN.cpp b/YSF2NXDN/YSF2NXDN.cpp index 0874b95..8b97571 100644 --- a/YSF2NXDN/YSF2NXDN.cpp +++ b/YSF2NXDN/YSF2NXDN.cpp @@ -109,12 +109,17 @@ m_nxdnFrames(0U), m_ysfFrames(0U), m_nxdninfo(false) { + m_ysfFrame = new unsigned char[200U]; + m_nxdnFrame = new unsigned char[200U]; + ::memset(m_ysfFrame, 0U, 200U); - ::memset(m_nxdnFrame, 0U, 50U); + ::memset(m_nxdnFrame, 0U, 200U); } CYSF2NXDN::~CYSF2NXDN() { + delete[] m_ysfFrame; + delete[] m_nxdnFrame; } int CYSF2NXDN::run() diff --git a/YSF2NXDN/YSF2NXDN.h b/YSF2NXDN/YSF2NXDN.h index d7cb0ae..6ce00c6 100644 --- a/YSF2NXDN/YSF2NXDN.h +++ b/YSF2NXDN/YSF2NXDN.h @@ -73,8 +73,8 @@ private: std::string m_netSrc; std::string m_netDst; std::string m_ysfSrc; - unsigned char m_ysfFrame[200U]; - unsigned char m_nxdnFrame[200U]; + unsigned char* m_ysfFrame; + unsigned char* m_nxdnFrame; CGPS* m_gps; CDTMF* m_dtmf; CAPRSReader* m_APRS; diff --git a/YSF2P25/Version.h b/YSF2P25/Version.h index 6330a5a..5f8e1f7 100644 --- a/YSF2P25/Version.h +++ b/YSF2P25/Version.h @@ -20,6 +20,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20180728"; +const char* VERSION = "20180729"; #endif diff --git a/YSF2P25/YSF2P25.cpp b/YSF2P25/YSF2P25.cpp index a6929b8..b011431 100644 --- a/YSF2P25/YSF2P25.cpp +++ b/YSF2P25/YSF2P25.cpp @@ -161,12 +161,17 @@ m_p25Frames(0U), m_ysfFrames(0U), m_p25info(false) { + m_ysfFrame = new unsigned char[200U]; + m_p25Frame = new unsigned char[100U]; + ::memset(m_ysfFrame, 0U, 200U); ::memset(m_p25Frame, 0U, 100U); } CYSF2P25::~CYSF2P25() { + delete[] m_ysfFrame; + delete[] m_p25Frame; } int CYSF2P25::run() diff --git a/YSF2P25/YSF2P25.h b/YSF2P25/YSF2P25.h index 465f83e..2aedf87 100644 --- a/YSF2P25/YSF2P25.h +++ b/YSF2P25/YSF2P25.h @@ -66,8 +66,8 @@ private: std::string m_netSrc; std::string m_netDst; std::string m_ysfSrc; - unsigned char m_ysfFrame[200U]; - unsigned char m_p25Frame[100U]; + unsigned char* m_ysfFrame; + unsigned char* m_p25Frame; CDTMF* m_dtmf; unsigned int m_p25Frames; unsigned int m_ysfFrames;