From 2aecd682c3058f0e2d5eb489258a55505fca7ffb Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Wed, 9 Feb 2022 22:19:34 -0500
Subject: [PATCH] implement disableCompositeFlag configuration parameter to
 disable flagging the control channel as composite in a voice on control
 condition;

---
 config.yml      | 1 +
 p25/Control.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config.yml b/config.yml
index 3ba20f8c..349f8e8f 100644
--- a/config.yml
+++ b/config.yml
@@ -56,6 +56,7 @@ protocols:
             interval: 300
             duration: 1
         voiceOnControl: false
+        disableCompositeFlag: false
         inhibitIllegal: false
         legacyGroupGrnt: true
         legacyGroupReg: false
diff --git a/p25/Control.cpp b/p25/Control.cpp
index d4c47e5c..e13cdd30 100644
--- a/p25/Control.cpp
+++ b/p25/Control.cpp
@@ -222,13 +222,16 @@ void Control::setOptions(yaml::Node& conf, const std::string cwCallsign, const s
 
     m_disableNetworkHDU = p25Protocol["disableNetworkHDU"].as<bool>(false);
 
+    bool disableCompositeFlag = p25Protocol["disableCompositeFlag"].as<bool>(false);
     uint8_t serviceClass = P25_SVC_CLS_VOICE | P25_SVC_CLS_DATA;
     if (m_control) {
         serviceClass |= P25_SVC_CLS_REG;
     }
 
     if (m_voiceOnControl) {
-        serviceClass |= P25_SVC_CLS_COMPOSITE;
+        if (!disableCompositeFlag) {
+            serviceClass |= P25_SVC_CLS_COMPOSITE;
+        }
     }
 
     m_siteData = SiteData(netId, sysId, rfssId, siteId, 0U, channelId, channelNo, serviceClass);