From 79e32705609ddde0227b1ccbccd45ed29122ec15 Mon Sep 17 00:00:00 2001
From: Doug McLain <doug@nostar.net>
Date: Fri, 19 Jun 2020 14:02:00 -0400
Subject: [PATCH] When startup id == 20 (P252DMR), then do not change P25
 reflectors

---
 P25Gateway/P25Gateway.cpp | 9 +++++++--
 P25Gateway/Reflectors.cpp | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/P25Gateway/P25Gateway.cpp b/P25Gateway/P25Gateway.cpp
index 41bd9da..1b5c038 100644
--- a/P25Gateway/P25Gateway.cpp
+++ b/P25Gateway/P25Gateway.cpp
@@ -232,6 +232,8 @@ void CP25Gateway::run()
 	unsigned int currentPort = 0U;
 
 	unsigned int startupId = m_conf.getNetworkStartup();
+	bool p252dmr_enabled = (startupId == 20) ? true : false;
+	
 	if (startupId != 9999U) {
 		CP25Reflector* reflector = reflectors.find(startupId);
 		if (reflector != NULL) {
@@ -291,8 +293,11 @@ void CP25Gateway::run()
 				srcId  = (buffer[1U] << 16) & 0xFF0000U;
 				srcId |= (buffer[2U] << 8)  & 0x00FF00U;
 				srcId |= (buffer[3U] << 0)  & 0x0000FFU;
-
-				if (dstId != currentId) {
+				
+				if(p252dmr_enabled){
+					currentId = dstId;
+				}
+				else if (dstId != currentId) {
 					CP25Reflector* reflector = NULL;
 					if (dstId != 9999U)
 						reflector = reflectors.find(dstId);
diff --git a/P25Gateway/Reflectors.cpp b/P25Gateway/Reflectors.cpp
index 2bc532c..bbaa4ff 100644
--- a/P25Gateway/Reflectors.cpp
+++ b/P25Gateway/Reflectors.cpp
@@ -148,7 +148,7 @@ bool CReflectors::load()
 		refl->m_address = CUDPSocket::lookup(m_p252dmrAddress);
 		refl->m_port    = m_p252dmrPort;
 		m_reflectors.push_back(refl);
-		LogInfo("Loaded P25 parrot (TG%u)", refl->m_id);
+		LogInfo("Loaded P252DMR (TG%u)", refl->m_id);
 	}
 
 	size = m_reflectors.size();