report destination ID being rejected when for non-authoratative mode;

pull/39/head
Bryan Biedenkapp 3 years ago
parent 952606b304
commit ca3810fa12

@ -54,13 +54,13 @@ using namespace dmr::packet;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#define CHECK_AUTHORITATIVE(_DST_ID) \ #define CHECK_AUTHORITATIVE(_DST_ID) \
if (!m_slot->m_authoritative && m_slot->m_permittedDstId != dstId) { \ if (!m_slot->m_authoritative && m_slot->m_permittedDstId != _DST_ID) { \
LogWarning(LOG_RF, "[NON-AUTHORITATIVE] Ignoring RF traffic, destination not permitted!"); \ LogWarning(LOG_RF, "[NON-AUTHORITATIVE] Ignoring RF traffic, destination not permitted, dstId = %u", _DST_ID); \
return false; \ return false; \
} }
#define CHECK_NET_AUTHORITATIVE(_DST_ID) \ #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; \ return; \
} }

@ -125,8 +125,8 @@ using namespace nxdn::packet;
} \ } \
} \ } \
\ \
if (!m_nxdn->m_authoritative && m_nxdn->m_permittedDstId != dstId) { \ if (!m_nxdn->m_authoritative && m_nxdn->m_permittedDstId != _DST_ID) { \
LogWarning(LOG_NET, "[NON-AUTHORITATIVE] Ignoring network traffic, destination not permitted!"); \ LogWarning(LOG_NET, "[NON-AUTHORITATIVE] Ignoring network traffic, destination not permitted, dstId = %u", _DST_ID); \
resetNet(); \ resetNet(); \
if (m_network != nullptr) \ if (m_network != nullptr) \
m_network->resetNXDN(); \ m_network->resetNXDN(); \

@ -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 // don't process network frames if this modem isn't authoritative
if (!m_p25->m_authoritative && m_p25->m_permittedDstId != dstId) { 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(); resetNet();
if (m_network != nullptr) if (m_network != nullptr)
m_network->resetP25(); m_network->resetP25();

Loading…
Cancel
Save

Powered by TurnKey Linux.