remove old patch group code (this code never did what it was supposed and was more of a PoC to test patching, a real implementation will need to be done in the future);

pull/12/head
Bryan Biedenkapp 4 years ago
parent cee085d870
commit fa26392ff2

@ -326,12 +326,6 @@ bool VoicePacket::process(uint8_t* data, uint32_t len)
::ActivityLog("P25", true, "RF %svoice transmission from %u to %s%u", encrypted ? "encrypted ": "", srcId, group ? "TG " : "", dstId);
if (m_p25->m_control) {
if (group && (m_lastPatchGroup != dstId) &&
(dstId != m_p25->m_trunk->m_patchSuperGroup)) {
m_p25->m_trunk->writeRF_TSDU_Mot_Patch(dstId, 0U, 0U);
m_lastPatchGroup = dstId;
}
// if the group wasn't granted out -- explicitly grant the group
if (!m_p25->m_trunk->hasDstIdGranted(dstId)) {
if (m_p25->m_legacyGroupGrnt) {
@ -905,7 +899,6 @@ VoicePacket::VoicePacket(Control* p25, network::BaseNetwork* network, bool debug
m_lastIMBE(NULL),
m_hadVoice(false),
m_lastRejectId(0U),
m_lastPatchGroup(0U),
m_silenceThreshold(DEFAULT_SILENCE_THRESHOLD),
m_vocLDU1Count(0U),
m_verbose(verbose),
@ -1193,14 +1186,6 @@ void VoicePacket::writeNet_LDU1()
::ActivityLog("P25", false, "network %svoice transmission from %u to %s%u", m_netLC.getEncrypted() ? "encrypted " : "", srcId, group ? "TG " : "", dstId);
if (m_p25->m_control) {
if (group && (m_lastPatchGroup != dstId) &&
(dstId != m_p25->m_trunk->m_patchSuperGroup)) {
m_p25->m_trunk->writeRF_TSDU_Mot_Patch(dstId, 0U, 0U);
m_lastPatchGroup = dstId;
}
}
// single-channel trunking or voice on control support?
if (m_p25->m_control && m_p25->m_voiceOnControl) {
m_p25->m_ccRunning = false; // otherwise the grant will be bundled with other packets

@ -107,8 +107,6 @@ namespace p25
bool m_hadVoice;
uint32_t m_lastRejectId;
uint32_t m_lastPatchGroup;
uint32_t m_silenceThreshold;
uint8_t m_vocLDU1Count;

Loading…
Cancel
Save

Powered by TurnKey Linux.