diff --git a/src/dmr/packet/Voice.cpp b/src/dmr/packet/Voice.cpp index 5b375dfb..8db5be99 100644 --- a/src/dmr/packet/Voice.cpp +++ b/src/dmr/packet/Voice.cpp @@ -54,13 +54,13 @@ using namespace dmr::packet; // --------------------------------------------------------------------------- #define CHECK_AUTHORITATIVE(_DST_ID) \ - if (!m_slot->m_authoritative && m_slot->m_permittedDstId != dstId) { \ - LogWarning(LOG_RF, "[NON-AUTHORITATIVE] Ignoring RF traffic, destination not permitted!"); \ + if (!m_slot->m_authoritative && m_slot->m_permittedDstId != _DST_ID) { \ + LogWarning(LOG_RF, "[NON-AUTHORITATIVE] Ignoring RF traffic, destination not permitted, dstId = %u", _DST_ID); \ return false; \ } #define CHECK_NET_AUTHORITATIVE(_DST_ID) \ - if (!m_slot->m_authoritative && m_slot->m_permittedDstId != dstId) { \ + if (!m_slot->m_authoritative && m_slot->m_permittedDstId != _DST_ID) { \ return; \ } diff --git a/src/nxdn/packet/Voice.cpp b/src/nxdn/packet/Voice.cpp index edf2d359..8114f072 100644 --- a/src/nxdn/packet/Voice.cpp +++ b/src/nxdn/packet/Voice.cpp @@ -125,8 +125,8 @@ using namespace nxdn::packet; } \ } \ \ - if (!m_nxdn->m_authoritative && m_nxdn->m_permittedDstId != dstId) { \ - LogWarning(LOG_NET, "[NON-AUTHORITATIVE] Ignoring network traffic, destination not permitted!"); \ + if (!m_nxdn->m_authoritative && m_nxdn->m_permittedDstId != _DST_ID) { \ + LogWarning(LOG_NET, "[NON-AUTHORITATIVE] Ignoring network traffic, destination not permitted, dstId = %u", _DST_ID); \ resetNet(); \ if (m_network != nullptr) \ m_network->resetNXDN(); \ diff --git a/src/p25/packet/Voice.cpp b/src/p25/packet/Voice.cpp index 4c3c9e5a..715986c5 100644 --- a/src/p25/packet/Voice.cpp +++ b/src/p25/packet/Voice.cpp @@ -835,7 +835,7 @@ bool Voice::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L // don't process network frames if this modem isn't authoritative if (!m_p25->m_authoritative && m_p25->m_permittedDstId != dstId) { - LogWarning(LOG_NET, "[NON-AUTHORITATIVE] Ignoring network traffic (LDU1), destination not permitted!"); + LogWarning(LOG_NET, "[NON-AUTHORITATIVE] Ignoring network traffic, destination not permitted, dstId = %u", dstId); resetNet(); if (m_network != nullptr) m_network->resetP25();