From 7dc850669a837eb964aa2732297448c4621c35c9 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sat, 3 Feb 2024 12:21:37 -0500 Subject: [PATCH] reorganize messages for ADJ_STS_BCAST; --- src/fne/network/fne/TagP25Data.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/fne/network/fne/TagP25Data.cpp b/src/fne/network/fne/TagP25Data.cpp index 3c919c68..17ddeb7e 100644 --- a/src/fne/network/fne/TagP25Data.cpp +++ b/src/fne/network/fne/TagP25Data.cpp @@ -498,16 +498,16 @@ bool TagP25Data::processTSDUToExternal(uint8_t* buffer, uint32_t srcPeerId, uint switch (tsbk->getLCO()) { case TSBK_OSP_ADJ_STS_BCAST: { - lc::tsbk::OSP_ADJ_STS_BCAST* osp = static_cast(tsbk.get()); - - if (m_network->m_verbose) { - LogMessage(LOG_NET, P25_TSDU_STR ", %s, sysId = $%03X, rfss = $%02X, site = $%02X, chId = %u, chNo = %u, svcClass = $%02X", tsbk->toString().c_str(), - osp->getAdjSiteSysId(), osp->getAdjSiteRFSSId(), osp->getAdjSiteId(), osp->getAdjSiteChnId(), osp->getAdjSiteChnNo(), osp->getAdjSiteSvcClass()); - } - if (m_network->m_disallowP25AdjStsBcast) { - LogWarning(LOG_NET, "PEER %u, passing ADJ_STS_BCAST to external peers is prohibited, dropping", dstPeerId); + // LogWarning(LOG_NET, "PEER %u, passing ADJ_STS_BCAST to external peers is prohibited, dropping", dstPeerId); return false; + } else { + lc::tsbk::OSP_ADJ_STS_BCAST* osp = static_cast(tsbk.get()); + + if (m_network->m_verbose) { + LogMessage(LOG_NET, P25_TSDU_STR ", %s, sysId = $%03X, rfss = $%02X, site = $%02X, chId = %u, chNo = %u, svcClass = $%02X", tsbk->toString().c_str(), + osp->getAdjSiteSysId(), osp->getAdjSiteRFSSId(), osp->getAdjSiteId(), osp->getAdjSiteChnId(), osp->getAdjSiteChnNo(), osp->getAdjSiteSvcClass()); + } } } break;