remove DMR disable network grant demand options (it made no sense);

configs/config.example.yml

@@ -198,10 +198,6 @@ protocols:
             # authentication key is requested from the upstream FNE through the existing LLA key path.
             requireAuthForReg: false
         
-        # Flag indicating whether or not network calls will generate a channel grant.
-        #   (This applies only in conventional operations where channel granting is utilized and RF-only talkgroup
-        #    steering is required.)
-        disableNetworkGrant: false
         # Flag indicating whether or not a TGID will be tested for affiliations before being granted.
         ignoreAffiliationCheck: false
         # Flag indicating the host should send a network grant demand for conventional traffic.

src/host/dmr/Control.cpp

@@ -242,13 +242,6 @@ void Control::setOptions(yaml::Node& conf, bool supervisor, ::lookups::VoiceChDa
             uint8_t slotNo, uint32_t peerId, uint32_t ssrc, uint32_t streamId) { processInCallCtrl(command, dstId, slotNo); });
     }
 
-    /*
-    ** Network Grant Disables
-    */
-    bool disableNetworkGrant = dmrProtocol["disableNetworkGrant"].as<bool>(false);
-    m_slot1->m_disableNetworkGrant = disableNetworkGrant;
-    m_slot2->m_disableNetworkGrant = disableNetworkGrant;
-
     bool convNetGrantDemand = dmrProtocol["convNetGrantDemand"].as<bool>(false);
     m_slot1->m_convNetGrantDemand = convNetGrantDemand;
     m_slot2->m_convNetGrantDemand = convNetGrantDemand;
@@ -265,9 +258,6 @@ void Control::setOptions(yaml::Node& conf, bool supervisor, ::lookups::VoiceChDa
             if (m_supervisor)
                 LogInfoEx(LOG_DMR, "Host is configured to operate as a DMR TSCC, site controller mode.");
         }
-        if (disableNetworkGrant) {
-            LogInfo("    Disable Network Grants: yes");
-        }
 
         if (defaultNetIdleTalkgroup != 0U) {
             LogInfo("    Default Network Idle Talkgroup: %u", defaultNetIdleTalkgroup);

src/host/dmr/Slot.cpp

@@ -152,7 +152,6 @@ Slot::Slot(uint32_t slotNo, uint32_t timeout, uint32_t tgHang, uint32_t queueSiz
     m_enableTSCC(false),
     m_dedicatedTSCC(false),
     m_ignoreAffiliationCheck(false),
-    m_disableNetworkGrant(false),
     m_convNetGrantDemand(false),
     m_legacyGroupReg(false),
     m_defaultNetIdleTalkgroup(0U),
@@ -460,16 +459,6 @@ void Slot::processNetwork(const data::NetData& dmrData)
                 bool unitToUnit = (dmrData.getControl() & network::NET_CTRL_U2U) == network::NET_CTRL_U2U;
                 
                 if (grantDemand) {
-                    if (m_disableNetworkGrant) {
-                        break;
-                    }
-
-                    // if we're non-dedicated control, and if we're not in a listening or idle state, ignore any grant
-                    // demands
-                    if (!dedicatedTSCC && (m_rfState != RS_RF_LISTENING || m_netState != RS_NET_IDLE)) {
-                        break;
-                    }
-
                     // validate source RID
                     if (!acl::AccessControl::validateSrcId(dmrData.getSrcId())) {
                         break;
@@ -497,15 +486,11 @@ void Slot::processNetwork(const data::NetData& dmrData)
             break;
         }
 
-        // if *this slot* is the TSCC slot, stop processing after this point
-        if (m_enableTSCC && m_dedicatedTSCC)
-        {
-            if (dataType != DataType::CSBK && dataType != DataType::MBC_HEADER && dataType != DataType::MBC_DATA)
+        if (dataType != DataType::CSBK && dataType != DataType::MBC_HEADER && dataType != DataType::MBC_DATA)
+            return;
+        else {
+            if (m_slotNo != s_dmr->m_tsccSlotNo)
                 return;
-            else {
-                if (m_slotNo != s_dmr->m_tsccSlotNo)
-                    return;
-            }
         }
     }
 

src/host/dmr/Slot.h

@@ -494,7 +494,6 @@ namespace dmr
         bool m_enableTSCC;
         bool m_dedicatedTSCC;
         bool m_ignoreAffiliationCheck;
-        bool m_disableNetworkGrant;
         bool m_convNetGrantDemand;
         bool m_legacyGroupReg;