CProtocols::m_Protocols is std::unique_ptr<CProtocol>

radmin

@@ -130,11 +130,12 @@ do
 		ps -aux | grep -e xlxd -e xrfd -e ambed | grep -v grep
 	fi
 	echo
-	echo "        Reflector Administration, Version #200716"
+	echo "        Reflector Administration, Version #200723"
 	echo
 	echo "ls : List the configuration file"
 	echo "cl : Clean (remove) compiled objects and executables"
 	echo "gp : Pull the latest software from the repo"
+	echo "br : Change git branch to <value>"
 	echo "co : Compile the system executable(s)"
 	if [ -e $xlxserv ] || [ -e $xrfserv ]; then
 		if [ -e $xlxserv ] && [ -e $xrfserv ]; then
@@ -195,6 +196,11 @@ do
 		git pull
 		echo
 		read -p "<Enter> to continue: " ans
+	elif [[ "$key" == br* ]]; then
+		echo
+		git checkout "$value"
+		echo
+		read -p "<Enter> to continue: " ans
 	elif [[ "$key" == rr* ]]; then
 		if   [[ "$callsign" == XLX* ]] && [ -e $xlxserv ]; then
 			sudo systemctl restart xlxd

src/cdcsprotocol.cpp

@@ -36,7 +36,7 @@
 bool CDcsProtocol::Init(void)
 {
     // base class
-    if (! Initialize("DCS", DCS_PORT, DSTAR_IPV4, DSTAR_IPV6))
+    if (! CProtocol::Initialize("DCS", DCS_PORT, DSTAR_IPV4, DSTAR_IPV6))
 		return false;
 
     // update time

src/cdextraprotocol.cpp

@@ -35,10 +35,10 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 // operation
 
-bool CDextraProtocol::Init(void)
+bool CDextraProtocol::Initialize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6)
 {
     // base class
-    if (! Initialize("XRF", DEXTRA_PORT, DSTAR_IPV4, DSTAR_IPV6))
+    if (! CProtocol::Initialize(type, port, has_ipv4, has_ipv6))
 		return false;
 
     // update time

src/cdextraprotocol.h

@@ -59,7 +59,7 @@ class CDextraProtocol : public CProtocol
 {
 public:
     // initialization
-    bool Init(void);
+    bool Initialize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6);
 
     // task
     void Task(void);

src/cdmrmmdvmprotocol.cpp

@@ -54,10 +54,10 @@ static uint8 g_DmrSyncMSData[]     = { 0x0D,0x5D,0x7F,0x77,0xFD,0x75,0x70 };
 ////////////////////////////////////////////////////////////////////////////////////////
 // operation
 
-bool CDmrmmdvmProtocol::Init(void)
+bool CDmrmmdvmProtocol::Initalize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6)
 {
     // base class
-    if (! Initialize(nullptr, DMRMMDVM_PORT, DMR_IPV4, DMR_IPV6))
+    if (! CProtocol::Initialize(type, port, has_ipv4, has_ipv6))
 		return false;
 
     // update time

src/cdmrmmdvmprotocol.h

@@ -67,7 +67,7 @@ class CDmrmmdvmProtocol : public CProtocol
 {
 public:
     // initialization
-    bool Init(void);
+    bool Initalize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6);
 
     // task
     void Task(void);

src/cdmrplusprotocol.cpp

@@ -47,10 +47,10 @@ static uint8 g_DmrSyncMSData[]     = { 0x0D,0x5D,0x7F,0x77,0xFD,0x75,0x70 };
 ////////////////////////////////////////////////////////////////////////////////////////
 // operation
 
-bool CDmrplusProtocol::Init()
+bool CDmrplusProtocol::Initalize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6)
 {
     // base class
-    if (! Initialize(nullptr, DMRPLUS_PORT, DMR_IPV4, DMR_IPV6))
+    if (! CProtocol::Initialize(type, port, has_ipv4, has_ipv6))
 		return false;
 
     // update time

src/cdmrplusprotocol.h

@@ -57,7 +57,7 @@ class CDmrplusProtocol : public CProtocol
 {
 public:
     // initialization
-    bool Init();
+    bool Initalize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6);
 
     // task
     void Task(void);

src/cdplusprotocol.cpp

@@ -34,10 +34,10 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 // operation
 
-bool CDplusProtocol::Init(void)
+bool CDplusProtocol::Initalize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6)
 {
     // base class
-    if (! Initialize("REF", DPLUS_PORT, DSTAR_IPV4, DSTAR_IPV6))
+    if (! CProtocol::Initialize(type, port, has_ipv4, has_ipv6))
 		return false;
 
     // update time

src/cdplusprotocol.h

@@ -52,7 +52,7 @@ class CDplusProtocol : public CProtocol
 {
 public:
     // initialization
-    bool Init(void);
+    bool Initalize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6);
 
     // task
     void Task(void);

src/cg3protocol.cpp

@@ -38,7 +38,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 // operation
 
-bool CG3Protocol::Init(void)
+bool CG3Protocol::Initalize(const char */*type*/, const uint16 /*port*/, const bool /*has_ipv4*/, const bool /*has_ipv6*/)
 {
     ReadOptions();
 

src/cg3protocol.h

@@ -67,7 +67,7 @@ public:
     CG3Protocol() : m_GwAddress(0u), m_Modules("*"), m_LastModTime(0) {}
 
     // initialization
-    bool Init(void);
+    bool Initalize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6);
 
     // close
     void Close(void);

src/cprotocol.h

@@ -77,7 +77,7 @@ public:
     virtual ~CProtocol();
 
     // initialization
-    bool Initialize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6);
+    virtual bool Initialize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6);
     virtual void Close(void);
 
     // queue

src/cprotocols.cpp

@@ -43,16 +43,7 @@
 
 CProtocols::~CProtocols()
 {
-    m_Mutex.lock();
+    Close();
-    {
-        for ( auto it=m_Protocols.begin(); it!=m_Protocols.end(); it++)
-		{
-			(*it)->Close();
-			delete *it;
-		}
-		m_Protocols.clear();
-    }
-    m_Mutex.unlock();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -62,88 +53,40 @@ bool CProtocols::Init(void)
 {
     m_Mutex.lock();
     {
-        auto dextra = new CDextraProtocol;
+		m_Protocols.emplace_back(std::unique_ptr<CDextraProtocol>(new CDextraProtocol));
-        if (dextra->Init())
+		if (! m_Protocols.back()->Initialize("XRF", DEXTRA_PORT, DSTAR_IPV4, DSTAR_IPV6))
-			m_Protocols.push_back(dextra);
-		else
-		{
-			delete dextra;
 			return false;
-		}
 
-
+		m_Protocols.emplace_back(std::unique_ptr<CDplusProtocol>(new CDplusProtocol));
-        // create and initialize DPLUS
+		if (! m_Protocols.back()->Initialize("REF", DPLUS_PORT, DSTAR_IPV4, DSTAR_IPV6))
-        auto dplus = new CDplusProtocol;
-        if (dplus->Init())
-			m_Protocols.push_back(dplus);
-		else
-		{
-			delete dplus;
 			return false;
-		}
 
-        // create and initialize DCS
+		m_Protocols.emplace_back(std::unique_ptr<CDcsProtocol>(new CDcsProtocol));
-        auto dcs = new CDcsProtocol;
+		if (! m_Protocols.back()->Initialize("DCS", DCS_PORT, DSTAR_IPV4, DSTAR_IPV6))
-        if (dcs->Init())
-			m_Protocols.push_back(dcs);
-		else
-		{
-			delete dcs;
 			return false;
-		}
 
 #ifndef NO_XLX
-        // create and initialize XLX - interlink
+		m_Protocols.emplace_back(std::unique_ptr<CDmrmmdvmProtocol>(new CDmrmmdvmProtocol));
-        auto xlx = new CXlxProtocol;
+		if (! m_Protocols.back()->Initialize(nullptr, DMRMMDVM_PORT, DMR_IPV4, DMR_IPV6))
-        if (xlx->Init())
-			m_Protocols.push_back(xlx);
-		else
-		{
-			delete xlx;
 			return false;
-		}
 
-        // create and initialize DMRPLUS
+		m_Protocols.emplace_back(std::unique_ptr<CDmrplusProtocol>(new CDmrplusProtocol));
-        auto dmrplus = new CDmrplusProtocol;
+		if (! m_Protocols.back()->Initialize(nullptr, DMRPLUS_PORT, DMR_IPV4, DMR_IPV6))
-        if (dmrplus->Init())
-			m_Protocols.push_back(dmrplus);
-		else
-		{
-			delete dmrplus;
 			return false;
-		}
 
-        // create and initialize DMRMMDVM
+		m_Protocols.emplace_back(std::unique_ptr<CYsfProtocol>(new CYsfProtocol));
-        auto dmrmmdvm = new CDmrmmdvmProtocol;
+		if (! m_Protocols.back()->Initialize("YSF", YSF_PORT, DMR_IPV4, DMR_IPV6))
-        if (dmrmmdvm->Init())
-			m_Protocols.push_back(dmrmmdvm);
-		else
-		{
-			delete dmrmmdvm;
 			return false;
-		}
 
-        // create and initialize YSF
+		m_Protocols.emplace_back(std::unique_ptr<CXlxProtocol>(new CXlxProtocol));
-        auto ysf = new CYsfProtocol;
+		if (! m_Protocols.back()->Initialize("XLX", XLX_PORT, DMR_IPV4, DMR_IPV6))
-        if (ysf->Init())
-			m_Protocols.push_back(ysf);
-		else
-		{
-			delete ysf;
 			return false;
-		}
 #endif
 
 #ifndef NO_G3
-        // create and initialize G3
+		m_Protocols.emplace_back(std::unique_ptr<CG3Protocol>(new CG3Protocol));
-        auto g3 = new CG3Protocol;
+		if (! m_Protocols.back()->Initialize("XLX", G3_PORT, DMR_IPV4, DMR_IPV6))
-        if (g3->Init())
+			return false;
-			m_Protocols.push_back(g3);
-		else
-		{
-			delete g3;
-			return true;
-		}
 #endif
 
     }
@@ -156,13 +99,6 @@ bool CProtocols::Init(void)
 void CProtocols::Close(void)
 {
     m_Mutex.lock();
-    {
+	m_Protocols.clear();
-        for ( auto it=m_Protocols.begin(); it!=m_Protocols.end(); it++)
-		{
-			(*it)->Close();
-			delete *it;
-		}
-		m_Protocols.clear();
-    }
     m_Mutex.unlock();
 }

src/cprotocols.h

@@ -44,15 +44,17 @@ public:
     // initialization
     bool Init(void);
     void Close(void);
+	void Lock(void)   { m_Mutex.lock(); }
+	void Unlock(void) { m_Mutex.unlock(); }
 
     // pass-thru
-	std::list<CProtocol *>::iterator begin() { return m_Protocols.begin(); }
+	std::list<std::unique_ptr<CProtocol>>::iterator begin() { return m_Protocols.begin(); }
- 	std::list<CProtocol *>::iterator end()   { return m_Protocols.end(); }
+ 	std::list<std::unique_ptr<CProtocol>>::iterator end()   { return m_Protocols.end(); }
 
 protected:
     // data
     std::mutex m_Mutex;
-    std::list<CProtocol *>  m_Protocols;
+    std::list<std::unique_ptr<CProtocol>> m_Protocols;
 };
 
 

src/creflector.cpp

@@ -347,6 +347,7 @@ void CReflector::RouterThread(CReflector *This, CPacketStream *streamIn)
             packet->SetModuleId(uiModuleId);
 
             // iterate on all protocols
+			This->m_Protocols.Lock();
             for ( auto it=This->m_Protocols.begin(); it!=This->m_Protocols.end(); it++ )
             {
                 // duplicate packet
@@ -366,6 +367,7 @@ void CReflector::RouterThread(CReflector *This, CPacketStream *streamIn)
                 queue->push(packetClone);
                 (*it)->ReleaseQueue();
             }
+			This->m_Protocols.Unlock();
             // done
             delete packet;
             packet = nullptr;

src/cxlxprotocol.cpp

@@ -35,9 +35,9 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 // operation
 
-bool CXlxProtocol::Init(void)
+bool CXlxProtocol::Initalize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6)
 {
-    if (! Initialize("XLX", XLX_PORT, XLX_IPV4, XLX_IPV6))
+    if (! CProtocol::Initialize(type, port, has_ipv4, has_ipv6))
 		return false;
 
     // update time

src/cxlxprotocol.h

@@ -41,7 +41,7 @@ class CXlxProtocol : public CDextraProtocol
 {
 public:
     // initialization
-    bool Init(void);
+    bool Initalize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6);
 
     // task
     void Task(void);

src/cysfprotocol.cpp

@@ -45,10 +45,10 @@ CYsfProtocol::CYsfProtocol()
 ////////////////////////////////////////////////////////////////////////////////////////
 // operation
 
-bool CYsfProtocol::Init(void)
+bool CYsfProtocol::Initalize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6)
 {
     // base class
-    if (! Initialize("YSF", YSF_PORT, YSF_IPV4, YSF_IPV6))
+    if (! CProtocol::Initialize(type, port, has_ipv4, has_ipv6))
 		return false;
 
     // init the wiresx cmd handler

src/cysfprotocol.h

@@ -74,10 +74,10 @@ public:
     CYsfProtocol();
 
     // destructor
-    virtual ~CYsfProtocol() {};
+    ~CYsfProtocol() {}
 
     // initialization
-    bool Init(void);
+    bool Initalize(const char *type, const uint16 port, const bool has_ipv4, const bool has_ipv6);
     void Close(void);
 
     // task