Skip to content

Commit c3b31d2

Browse files
committed
hide the excessive noise during isPeerPermitted() where the FNE will complain of a peer with a uninitialized affiliations lookup;
1 parent 6b4d7c5 commit c3b31d2

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/fne/network/callhandler/TagDMRData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ bool TagDMRData::isPeerPermitted(uint32_t peerId, data::NetData& data, uint32_t
732732
lookups::AffiliationLookup* aff = m_network->m_peerAffiliations[lookupPeerId];
733733
if (aff == nullptr) {
734734
std::string peerIdentity = m_network->resolvePeerIdentity(lookupPeerId);
735-
LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str());
735+
//LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str());
736736
return false; // this will cause no traffic to pass for this peer now...I'm not sure this is good behavior
737737
}
738738
else {

src/fne/network/callhandler/TagNXDNData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ bool TagNXDNData::isPeerPermitted(uint32_t peerId, lc::RTCH& lc, uint8_t message
539539
lookups::AffiliationLookup* aff = m_network->m_peerAffiliations[lookupPeerId];
540540
if (aff == nullptr) {
541541
std::string peerIdentity = m_network->resolvePeerIdentity(lookupPeerId);
542-
LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str());
542+
//LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str());
543543
return false; // this will cause no traffic to pass for this peer now...I'm not sure this is good behavior
544544
}
545545
else {

src/fne/network/callhandler/TagP25Data.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ bool TagP25Data::processTSDUTo(uint8_t* buffer, uint32_t peerId, uint8_t duid)
835835
lookups::AffiliationLookup* aff = m_network->m_peerAffiliations[lookupPeerId];
836836
if (aff == nullptr) {
837837
std::string peerIdentity = m_network->resolvePeerIdentity(lookupPeerId);
838-
LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str());
838+
//LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str());
839839
return false; // this will cause no TSDU to pass for this peer now...I'm not sure this is good behavior
840840
}
841841
else {
@@ -1050,7 +1050,7 @@ bool TagP25Data::isPeerPermitted(uint32_t peerId, lc::LC& control, DUID::E duid,
10501050
lookups::AffiliationLookup* aff = m_network->m_peerAffiliations[lookupPeerId];
10511051
if (aff == nullptr) {
10521052
std::string peerIdentity = m_network->resolvePeerIdentity(lookupPeerId);
1053-
LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str());
1053+
//LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str());
10541054
return false; // this will cause no traffic to pass for this peer now...I'm not sure this is good behavior
10551055
}
10561056
else {

0 commit comments

Comments
 (0)