Improved acl logging (added dataType)
This commit is contained in:
parent
c4384bffe1
commit
03280cd4e4
28
DMRSlot.cpp
28
DMRSlot.cpp
|
@ -795,12 +795,12 @@ void CDMRSlot::writeNetwork (const CDMRData& dmrData)
|
||||||
unsigned int did;
|
unsigned int did;
|
||||||
did = m_netLC->getDstId();
|
did = m_netLC->getDstId();
|
||||||
if (DstIdBlacklist(did,m_slotNo)) {
|
if (DstIdBlacklist(did,m_slotNo)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
||||||
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -883,12 +883,12 @@ void CDMRSlot::writeNetwork (const CDMRData& dmrData)
|
||||||
unsigned int did;
|
unsigned int did;
|
||||||
did = m_netLC->getDstId();
|
did = m_netLC->getDstId();
|
||||||
if (DstIdBlacklist(did,m_slotNo)) {
|
if (DstIdBlacklist(did,m_slotNo)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
||||||
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -910,12 +910,12 @@ void CDMRSlot::writeNetwork (const CDMRData& dmrData)
|
||||||
unsigned int did;
|
unsigned int did;
|
||||||
did = m_netLC->getDstId();
|
did = m_netLC->getDstId();
|
||||||
if (DstIdBlacklist(did,m_slotNo)) {
|
if (DstIdBlacklist(did,m_slotNo)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
||||||
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Regenerate the Slot Type
|
// Regenerate the Slot Type
|
||||||
|
@ -970,12 +970,12 @@ void CDMRSlot::writeNetwork (const CDMRData& dmrData)
|
||||||
unsigned int did;
|
unsigned int did;
|
||||||
did = m_netLC->getDstId();
|
did = m_netLC->getDstId();
|
||||||
if (DstIdBlacklist(did,m_slotNo)) {
|
if (DstIdBlacklist(did,m_slotNo)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
||||||
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Regenerate the data header
|
// Regenerate the data header
|
||||||
|
@ -1021,12 +1021,12 @@ void CDMRSlot::writeNetwork (const CDMRData& dmrData)
|
||||||
unsigned int did;
|
unsigned int did;
|
||||||
did = m_netLC->getDstId();
|
did = m_netLC->getDstId();
|
||||||
if (DstIdBlacklist(did,m_slotNo)) {
|
if (DstIdBlacklist(did,m_slotNo)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
||||||
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1123,12 +1123,12 @@ void CDMRSlot::writeNetwork (const CDMRData& dmrData)
|
||||||
unsigned int did;
|
unsigned int did;
|
||||||
did = m_netLC->getDstId();
|
did = m_netLC->getDstId();
|
||||||
if (DstIdBlacklist(did,m_slotNo)) {
|
if (DstIdBlacklist(did,m_slotNo)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
||||||
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
unsigned char fid = m_netLC->getFID();
|
unsigned char fid = m_netLC->getFID();
|
||||||
|
@ -1193,12 +1193,12 @@ void CDMRSlot::writeNetwork (const CDMRData& dmrData)
|
||||||
unsigned int did;
|
unsigned int did;
|
||||||
did = dstId;
|
did = dstId;
|
||||||
if (DstIdBlacklist(did,m_slotNo)) {
|
if (DstIdBlacklist(did,m_slotNo)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG blacklisted) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
// true sets allow greater than 4k. Need to add boolean in conf for this later.
|
||||||
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
if (!DstIdWhitelist(did,m_slotNo,true)) {
|
||||||
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist)", m_slotNo, did);
|
LogMessage("DMR Network Slot %u, invalid traffic to TG %u (TG not in whitelist) dataType: %s", m_slotNo, did,dataType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Regenerate the CSBK data
|
// Regenerate the CSBK data
|
||||||
|
|
Loading…
Reference in a new issue