diff --git a/DMR2NXDN/DMR2NXDN.cpp b/DMR2NXDN/DMR2NXDN.cpp index 7ae0996..047731b 100644 --- a/DMR2NXDN/DMR2NXDN.cpp +++ b/DMR2NXDN/DMR2NXDN.cpp @@ -97,16 +97,29 @@ int main(int argc, char** argv) } CDMR2NXDN::CDMR2NXDN(const std::string& configFile) : +m_nxdnTG(1U), m_conf(configFile), m_dmrNetwork(NULL), -m_dmrSrc(0U), -m_dmrDst(0U), -m_nxdnSrc(0U), -m_nxdnDst(0U), +m_nxdnNetwork(NULL), +m_dmrlookup(NULL), +m_nxdnlookup(NULL), +m_conv(), +m_colorcode(1U), +m_defsrcid(1U), +m_dstid(1U), +m_dmrSrc(1U), +m_dmrDst(1U), +m_nxdnSrc(1U), +m_nxdnDst(1U), m_dmrLastDT(0U), +m_nxdnFrame(NULL), +m_dmrFrame(NULL), m_dmrFrames(0U), m_nxdnFrames(0U), +m_EmbeddedLC(), +m_dmrflco(FLCO_GROUP), m_dmrinfo(false), +m_nxdninfo(false), m_config(NULL), m_configLen(0U) { diff --git a/DMR2YSF/DMR2YSF.cpp b/DMR2YSF/DMR2YSF.cpp index 815096e..1f8e29d 100644 --- a/DMR2YSF/DMR2YSF.cpp +++ b/DMR2YSF/DMR2YSF.cpp @@ -106,15 +106,27 @@ CDMR2YSF::CDMR2YSF(const std::string& configFile) : m_callsign(), m_conf(configFile), m_dmrNetwork(NULL), +m_ysfNetwork(NULL), +m_conv(), +m_colorcode(1U), m_srcid(1U), +m_defsrcid(1U), m_dstid(1U), +m_dmrpc(false), +m_netSrc(), +m_netDst(), +m_ysfSrc(), m_dmrLastDT(0U), +m_ysfFrame(NULL), +m_dmrFrame(NULL), m_dmrFrames(0U), m_ysfFrames(0U), +m_EmbeddedLC(), +m_dmrflco(FLCO_GROUP), m_dmrinfo(false), m_config(NULL), m_configLen(0U), -m_command(), +m_command(NULL), m_tgUnlink(4000U), m_currTGList(), m_lastTG(0U) diff --git a/NXDN2DMR/NXDN2DMR.cpp b/NXDN2DMR/NXDN2DMR.cpp index 6003add..fee4ec6 100644 --- a/NXDN2DMR/NXDN2DMR.cpp +++ b/NXDN2DMR/NXDN2DMR.cpp @@ -103,18 +103,35 @@ int main(int argc, char** argv) CNXDN2DMR::CNXDN2DMR(const std::string& configFile) : m_callsign(), +m_nxdnTG(1U), m_conf(configFile), m_dmrNetwork(NULL), -m_dmrSrc(0U), -m_dmrDst(0U), -m_nxdnSrc(0U), -m_nxdnDst(0U), +m_nxdnNetwork(NULL), +m_dmrlookup(NULL), +m_nxdnlookup(NULL), +m_conv(), +m_colorcode(1U), +m_srcHS(1U), +m_defsrcid(1U), +m_dstid(1U), +m_dmrpc(false), +m_dmrSrc(1U), +m_dmrDst(1U), +m_nxdnSrc(1U), +m_nxdnDst(1U), m_dmrLastDT(0U), +m_nxdnFrame(NULL), +m_dmrFrame(NULL), m_dmrFrames(0U), m_nxdnFrames(0U), +m_EmbeddedLC(), +m_dmrflco(FLCO_GROUP), m_dmrinfo(false), +m_nxdninfo(false), m_xlxmodule(), -m_xlxConnected(false) +m_xlxConnected(false), +m_xlxReflectors(NULL), +m_xlxrefl(0U) { m_nxdnFrame = new unsigned char[200U]; m_dmrFrame = new unsigned char[50U]; diff --git a/YSF2DMR/YSF2DMR.cpp b/YSF2DMR/YSF2DMR.cpp index a2f7a46..36ff9f6 100644 --- a/YSF2DMR/YSF2DMR.cpp +++ b/YSF2DMR/YSF2DMR.cpp @@ -110,16 +110,39 @@ m_suffix(), m_conf(configFile), m_wiresX(NULL), m_dmrNetwork(NULL), +m_ysfNetwork(NULL), +m_lookup(NULL), +m_conv(), +m_colorcode(1U), +m_srcHS(1U), +m_srcid(1U), +m_defsrcid(1U), +m_dstid(1U), +m_ptt_dstid(1U), +m_ptt_pc(false), +m_dmrpc(false), +m_netSrc(), +m_netDst(), +m_ysfSrc(), m_dmrLastDT(0U), +m_ysfFrame(NULL), +m_dmrFrame(NULL), m_gps(NULL), m_dtmf(NULL), m_APRS(NULL), m_dmrFrames(0U), m_ysfFrames(0U), +m_EmbeddedLC(), +m_TGList(), +m_dmrflco(FLCO_GROUP), m_dmrinfo(false), m_idUnlink(4000U), m_flcoUnlink(FLCO_GROUP), m_enableWiresX(false), +m_xlxmodule(), +m_xlxConnected(false), +m_xlxReflectors(NULL), +m_xlxrefl(0U), m_remoteGateway(false), m_hangTime(1000U) { diff --git a/YSF2NXDN/YSF2NXDN.cpp b/YSF2NXDN/YSF2NXDN.cpp index 7f2f2b9..ae64620 100644 --- a/YSF2NXDN/YSF2NXDN.cpp +++ b/YSF2NXDN/YSF2NXDN.cpp @@ -107,6 +107,17 @@ m_suffix(), m_conf(configFile), m_wiresX(NULL), m_nxdnNetwork(NULL), +m_ysfNetwork(NULL), +m_lookup(NULL), +m_conv(), +m_srcid(1U), +m_defsrcid(1U), +m_dstid(1U), +m_netSrc(), +m_netDst(), +m_ysfSrc(), +m_ysfFrame(NULL), +m_nxdnFrame(NULL), m_gps(NULL), m_dtmf(NULL), m_APRS(NULL), diff --git a/YSF2P25/YSF2P25.cpp b/YSF2P25/YSF2P25.cpp index 50e7146..04b0d0e 100644 --- a/YSF2P25/YSF2P25.cpp +++ b/YSF2P25/YSF2P25.cpp @@ -158,9 +158,21 @@ int main(int argc, char** argv) CYSF2P25::CYSF2P25(const std::string& configFile) : m_callsign(), +m_suffix(), m_conf(configFile), m_wiresX(NULL), m_p25Network(NULL), +m_ysfNetwork(NULL), +m_lookup(NULL), +m_conv(), +m_srcid(1U), +m_defsrcid(1U), +m_dstid(1U), +m_netSrc(), +m_netDst(), +m_ysfSrc(), +m_ysfFrame(NULL), +m_p25Frame(NULL), m_dtmf(NULL), m_p25Frames(0U), m_ysfFrames(0U),