TG Rewrite - add manual dial of UA talkgroup - same mechanism as

reflectors
dc7jzb · Oct 7, 2016 · c9b4700 · c9b4700
1 parent b715b27
commit c9b4700
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/DMRAccessControl.cpp b/DMRAccessControl.cpp
@@ -234,8 +234,14 @@ unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid,
   } else if (m_BMAutoRewrite && did == 9U && m_dstRewriteID != 9U && m_dstRewriteID != 0U && (m_time + m_callHang) > currenttime && dmrLC->getFLCO() == FLCO_GROUP ) {
 	      LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from %u to %u (return traffic during CallHang)",slot,did,m_dstRewriteID);
 	      return(m_dstRewriteID);
-  }  else if (m_BMAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U) {
-      m_dstRewriteID = did;
+
+  } else if (m_BMAutoRewrite && (did < 4000 || did > 5000) && did > 0 && did !=9 && did < 99999 && dmrLC->getFLCO() == FLCO_USER_USER) {
+	      m_dstRewriteID = did;
+	      dmrLC->setFLCO(FLCO_GROUP);
+	      LogMessage("DMR Slot %u, Rewrite outbound private call to %u Group Call (Connect talkgroup by private call)",slot,did);
+	      return did;
+  } else if (m_BMAutoRewrite && (did < 4000 || did > 5000) && did > 0 && did !=9 && did > 99999) {
+	      m_dstRewriteID = did;
   } 
   return 0U;
 }