cleanup incorrect variable usage (inclusion vs exclusion);

pull/32/head
Bryan Biedenkapp 3 years ago
parent 85b72d46b7
commit f719bffbba

@ -778,13 +778,15 @@ void FNENetwork::writeTGIDs(uint32_t peerId, bool queueOnly)
if (inclusion.size() > 0) {
auto it = std::find(inclusion.begin(), inclusion.end(), peerId);
if (it == inclusion.end()) {
// LogDebug(LOG_NET, "PEER %u TGID %u TS %u -- not included peer", peerId, entry.source().tgId(), entry.source().tgSlot());
continue;
}
}
else {
if (exclusion.size() > 0) {
auto it = std::find(exclusion.begin(), exclusion.end(), peerId);
if (it != inclusion.end()) {
if (it != exclusion.end()) {
// LogDebug(LOG_NET, "PEER %u TGID %u TS %u -- excluded peer", peerId, entry.source().tgId(), entry.source().tgSlot());
continue;
}
}
@ -846,13 +848,15 @@ void FNENetwork::writeDeactiveTGIDs(uint32_t peerId, bool queueOnly)
if (inclusion.size() > 0) {
auto it = std::find(inclusion.begin(), inclusion.end(), peerId);
if (it == inclusion.end()) {
// LogDebug(LOG_NET, "PEER %u TGID %u TS %u -- not included peer", peerId, entry.source().tgId(), entry.source().tgSlot());
continue;
}
}
else {
if (exclusion.size() > 0) {
auto it = std::find(exclusion.begin(), exclusion.end(), peerId);
if (it != inclusion.end()) {
if (it != exclusion.end()) {
// LogDebug(LOG_NET, "PEER %u TGID %u TS %u -- excluded peer", peerId, entry.source().tgId(), entry.source().tgSlot());
continue;
}
}

@ -281,7 +281,7 @@ bool TagDMRData::isPeerPermitted(uint32_t peerId, dmr::data::Data& data, uint32_
else {
if (exclusion.size() > 0) {
auto it = std::find(exclusion.begin(), exclusion.end(), peerId);
if (it != inclusion.end()) {
if (it != exclusion.end()) {
return false;
}
}

@ -254,7 +254,7 @@ bool TagNXDNData::isPeerPermitted(uint32_t peerId, nxdn::lc::RTCH& lc, uint8_t m
else {
if (exclusion.size() > 0) {
auto it = std::find(exclusion.begin(), exclusion.end(), peerId);
if (it != inclusion.end()) {
if (it != exclusion.end()) {
return false;
}
}

@ -300,7 +300,7 @@ bool TagP25Data::isPeerPermitted(uint32_t peerId, p25::lc::LC& control, uint8_t
else {
if (exclusion.size() > 0) {
auto it = std::find(exclusion.begin(), exclusion.end(), peerId);
if (it != inclusion.end()) {
if (it != exclusion.end()) {
return false;
}
}

Loading…
Cancel
Save

Powered by TurnKey Linux.