ensure DMR doesn't try to perform supervisory control for the opposing slot on a CC instance; correct TSBK ToString();

src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.cpp

@@ -95,7 +95,7 @@ void ISP_SNDCP_CH_REQ::encode(uint8_t* data, bool rawTSBK, bool noTrellis)
 /// <returns></returns>
 std::string ISP_SNDCP_CH_REQ::toString(bool isp)
 {
-    return std::string("TSBK_ISP_SNDCP_CH_REQ (Authentication FNE Result)");
+    return std::string("TSBK_ISP_SNDCP_CH_REQ (SNDCP Data Channel Request)");
 }
 
 // ---------------------------------------------------------------------------

src/host/dmr/packet/ControlSignaling.cpp

@@ -920,7 +920,8 @@ bool ControlSignaling::writeRF_CSBK_Grant(uint32_t srcId, uint32_t dstId, uint8_
         }
 
         // callback REST API to permit the granted TG on the specified voice channel
-        if (m_tscc->m_authoritative && m_tscc->m_supervisor) {
+        if (m_tscc->m_authoritative && m_tscc->m_supervisor &&
+            m_tscc->m_channelNo != chNo) {
             ::lookups::VoiceChData voiceChData = m_tscc->m_affiliations->getRFChData(chNo);
             if (voiceChData.isValidCh() && !voiceChData.address().empty() && voiceChData.port() > 0) {
                 json::object req = json::object();
@@ -997,7 +998,8 @@ bool ControlSignaling::writeRF_CSBK_Grant(uint32_t srcId, uint32_t dstId, uint8_
         }
 
         // callback REST API to permit the granted TG on the specified voice channel
-        if (m_tscc->m_authoritative && m_tscc->m_supervisor) {
+        if (m_tscc->m_authoritative && m_tscc->m_supervisor &&
+            m_tscc->m_channelNo != chNo) {
             ::lookups::VoiceChData voiceChData = m_tscc->m_affiliations->getRFChData(chNo);
             if (voiceChData.isValidCh() && !voiceChData.address().empty() && voiceChData.port() > 0) {
                 json::object req = json::object();