Merge branch 'bugfix/G2Headers_#64' into develop closes #64

Common/G2Handler.cpp

@@ -72,7 +72,7 @@ void CG2Handler::setHeaderLogger(CHeaderLogger* logger)
 	m_headerLogger = logger;
 }
 
-void CG2Handler::process(CHeaderData& header)
+void CG2Handler::process(CHeaderData &header)
 {
 	// Is this a busy reply?
 	unsigned char flag1 = header.getFlag1();
@@ -84,8 +84,8 @@ void CG2Handler::process(CHeaderData& header)
 
 #ifdef USE_STARNET
 	// Check to see if this is for StarNet
-	CStarNetHandler* handler = CStarNetHandler::findStarNet(header);
-	if (handler != NULL) {
+	CStarNetHandler *handler = CStarNetHandler::findStarNet(header);
+	if (handler != NULL){
 		// Write to Header.log if it's enabled
 		if (m_headerLogger != NULL)
 			m_headerLogger->write("StarNet", header);
@@ -103,15 +103,31 @@ void CG2Handler::process(CHeaderData& header)
 	unsigned int id = header.getId();
 
 	// Find the destination repeater
-	CRepeaterHandler* repeater = CRepeaterHandler::findDVRepeater(header.getRptCall2());
+	CRepeaterHandler *repeater = CRepeaterHandler::findDVRepeater(header.getRptCall2());
 	if (repeater == NULL) {
 		CLog::logInfo("Incoming G2 header from %s to unknown repeater - %s", header.getMyCall1().c_str(), header.getRptCall2().c_str());
 		return; // Not found, ignore
 	}
 
-	CG2Handler* route = new CG2Handler(repeater, address, id);
+	CG2Handler *route = new CG2Handler(repeater, address, id);
 
-	for (unsigned int i = 0U; i < m_maxRoutes; i++) {
+	for (unsigned int i = 0U; i < m_maxRoutes; i++)
+	{
+		if (m_routes[i] != NULL)
+		{
+			if (m_routes[i]->m_id == id)
+			{
+				// This should never happen, but if it does, delete the old route and replace it with the new one
+				CLog::logDebug("Duplicate G2 route received, replacing existing route");
+
+				delete m_routes[i];
+				m_routes[i] = route;
+
+				repeater->process(header, DIR_INCOMING, AS_G2);
+				return;
+			}
+		} 
+		else {
 			if (m_routes[i] == NULL) {
 				m_routes[i] = route;
 
@@ -123,6 +139,7 @@ void CG2Handler::process(CHeaderData& header)
 				return;
 			}
 		}
+	}
 
 	CLog::logInfo("No space to add new G2 route, ignoring");
 

README.md

@@ -158,6 +158,7 @@ The testing framwework used is Google Test.
 
 # 6. Version History
 ## 6.1. Version 1.0
+- [**Bugfix**] Fix duplicate G2 routes ([#64](https://github.com/F4FXL/DStarGateway/issues/64))
 - [**Bugfix**] Fix decoding of DTMF commands with leading 0 ([#61](https://github.com/F4FXL/DStarGateway/issues/61))
 - [**Improvement**] Add second French voice ([#60](https://github.com/F4FXL/DStarGateway/issues/60))
 - [**Improvement**] Clarify French "Linking to" announcement ([#60](https://github.com/F4FXL/DStarGateway/issues/60))