Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

normalize log formatting better;

Browse Source
pull/55/head
Bryan Biedenkapp 2 years ago
parent 9cfde0e57e
commit 1cdd2aa56d
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File

6
src/fne/network/DiagNetwork.cpp
Unescape View File

@ -189,7 +189,7 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
connection->pktNextSeq(0U); connection->pktNextSeq(0U);
} else { } else {
if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq()) && (pktSeq != (RTP_END_OF_CALL_SEQ - 1U))) { if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq()) && (pktSeq != (RTP_END_OF_CALL_SEQ - 1U))) {
LogWarning(LOG_NET, "PEER %u (%8s) stream %u out-of-sequence; %u != %u", peerId, connection->identity().c_str(), LogWarning(LOG_NET, "PEER %u (%s) stream %u out-of-sequence; %u != %u", peerId, connection->identity().c_str(),
streamId, pktSeq, connection->pktNextSeq()); streamId, pktSeq, connection->pktNextSeq());
} }
@ -223,7 +223,7 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
::memcpy(rawPayload, req->buffer + 11U, req->length - 11U); ::memcpy(rawPayload, req->buffer + 11U, req->length - 11U);
std::string payload(rawPayload, rawPayload + (req->length - 11U)); std::string payload(rawPayload, rawPayload + (req->length - 11U));
::ActivityLog("%u (%8s) %s", peerId, connection->identity().c_str(), payload.c_str()); ::ActivityLog("%.9u (%8s) %s", peerId, connection->identity().c_str(), payload.c_str());
// report activity log to InfluxDB // report activity log to InfluxDB
if (network->m_enableInfluxDB) { if (network->m_enableInfluxDB) {
@ -259,7 +259,7 @@ void* DiagNetwork::threadedNetworkRx(void* arg)
bool currState = g_disableTimeDisplay; bool currState = g_disableTimeDisplay;
g_disableTimeDisplay = true; g_disableTimeDisplay = true;
::Log(9999U, nullptr, "%u (%8s) %s", peerId, connection->identity().c_str(), payload.c_str()); ::Log(9999U, nullptr, "%.9u (%8s) %s", peerId, connection->identity().c_str(), payload.c_str());
g_disableTimeDisplay = currState; g_disableTimeDisplay = currState;
// report diagnostic log to InfluxDB // report diagnostic log to InfluxDB

46
src/fne/network/FNENetwork.cpp
Unescape View File

@ -268,7 +268,7 @@ void FNENetwork::clock(uint32_t ms)
if (connection->connected()) { if (connection->connected()) {
uint64_t dt = connection->lastPing() + (m_host->m_pingTime * m_host->m_maxMissedPings); uint64_t dt = connection->lastPing() + (m_host->m_pingTime * m_host->m_maxMissedPings);
if (dt < now) { if (dt < now) {
LogInfoEx(LOG_NET, "PEER %u (%8s) timed out, dt = %u, now = %u", id, connection->identity().c_str(), LogInfoEx(LOG_NET, "PEER %u (%s) timed out, dt = %u, now = %u", id, connection->identity().c_str(),
dt, now); dt, now);
peersToRemove.push_back(id); peersToRemove.push_back(id);
} }
@ -409,7 +409,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
connection->pktNextSeq(0U); connection->pktNextSeq(0U);
} else { } else {
if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq()) && (pktSeq != (RTP_END_OF_CALL_SEQ - 1U))) { if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq()) && (pktSeq != (RTP_END_OF_CALL_SEQ - 1U))) {
LogWarning(LOG_NET, "PEER %u (%8s) stream %u out-of-sequence; %u != %u", peerId, connection->identity().c_str(), LogWarning(LOG_NET, "PEER %u (%s) stream %u out-of-sequence; %u != %u", peerId, connection->identity().c_str(),
streamId, pktSeq, connection->pktNextSeq()); streamId, pktSeq, connection->pktNextSeq());
} }
@ -428,7 +428,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
// if we don't have a stream ID and are receiving call data -- throw an error and discard // if we don't have a stream ID and are receiving call data -- throw an error and discard
if (streamId == 0 && req->fneHeader.getFunction() == NET_FUNC_PROTOCOL) { if (streamId == 0 && req->fneHeader.getFunction() == NET_FUNC_PROTOCOL) {
std::string peerIdentity = network->resolvePeerIdentity(peerId); std::string peerIdentity = network->resolvePeerIdentity(peerId);
LogError(LOG_NET, "PEER %u (%8s) malformed packet (no stream ID for a call?)", peerId, peerIdentity.c_str()); LogError(LOG_NET, "PEER %u (%s) malformed packet (no stream ID for a call?)", peerId, peerIdentity.c_str());
if (req->buffer != nullptr) if (req->buffer != nullptr)
delete req->buffer; delete req->buffer;
@ -544,7 +544,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
FNEPeerConnection* connection = network->m_peers[peerId]; FNEPeerConnection* connection = network->m_peers[peerId];
if (connection != nullptr) { if (connection != nullptr) {
if (connection->connectionState() == NET_STAT_RUNNING) { if (connection->connectionState() == NET_STAT_RUNNING) {
LogMessage(LOG_NET, "PEER %u (%8s) resetting peer connection, connectionState = %u", peerId, connection->identity().c_str(), LogMessage(LOG_NET, "PEER %u (%s) resetting peer connection, connectionState = %u", peerId, connection->identity().c_str(),
connection->connectionState()); connection->connectionState());
delete connection; delete connection;
@ -557,7 +557,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
} else { } else {
network->writePeerNAK(peerId, TAG_REPEATER_LOGIN, NET_CONN_NAK_BAD_CONN_STATE, req->address, req->addrLen); network->writePeerNAK(peerId, TAG_REPEATER_LOGIN, NET_CONN_NAK_BAD_CONN_STATE, req->address, req->addrLen);
LogWarning(LOG_NET, "PEER %u (%8s) RPTL NAK, bad connection state, connectionState = %u", peerId, connection->identity().c_str(), LogWarning(LOG_NET, "PEER %u (%s) RPTL NAK, bad connection state, connectionState = %u", peerId, connection->identity().c_str(),
connection->connectionState()); connection->connectionState());
delete connection; delete connection;
@ -693,7 +693,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
if (peerConfig["identity"].is<std::string>()) { if (peerConfig["identity"].is<std::string>()) {
std::string identity = peerConfig["identity"].get<std::string>(); std::string identity = peerConfig["identity"].get<std::string>();
connection->identity(identity); connection->identity(identity);
LogInfoEx(LOG_NET, "PEER %u reports identity [%8s]", peerId, identity.c_str()); LogInfoEx(LOG_NET, "PEER %u reports identity [%s]", peerId, identity.c_str());
} }
if (peerConfig["externalPeer"].is<bool>()) { if (peerConfig["externalPeer"].is<bool>()) {
@ -728,7 +728,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
} }
} }
else { else {
LogWarning(LOG_NET, "PEER %u (%8s) RPTC NAK, login exchange while in an incorrect state, connectionState = %u", peerId, connection->identity().c_str(), LogWarning(LOG_NET, "PEER %u (%s) RPTC NAK, login exchange while in an incorrect state, connectionState = %u", peerId, connection->identity().c_str(),
connection->connectionState()); connection->connectionState());
network->writePeerNAK(peerId, TAG_REPEATER_CONFIG, NET_CONN_NAK_BAD_CONN_STATE); network->writePeerNAK(peerId, TAG_REPEATER_CONFIG, NET_CONN_NAK_BAD_CONN_STATE);
network->erasePeer(peerId); network->erasePeer(peerId);
@ -751,7 +751,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
// validate peer (simple validation really) // validate peer (simple validation really)
if (connection->connected() && connection->address() == ip) { if (connection->connected() && connection->address() == ip) {
LogInfoEx(LOG_NET, "PEER %u (%8s) is closing down", peerId, connection->identity().c_str()); LogInfoEx(LOG_NET, "PEER %u (%s) is closing down", peerId, connection->identity().c_str());
if (network->erasePeer(peerId)) { if (network->erasePeer(peerId)) {
network->erasePeerAffiliations(peerId); network->erasePeerAffiliations(peerId);
delete connection; delete connection;
@ -781,7 +781,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
// does this peer need an ACL update? // does this peer need an ACL update?
uint64_t dt = connection->lastACLUpdate() + network->m_updateLookupTime; uint64_t dt = connection->lastACLUpdate() + network->m_updateLookupTime;
if (dt < now) { if (dt < now) {
LogInfoEx(LOG_NET, "PEER %u (%8s) updating ACL list, dt = %u, now = %u", peerId, connection->identity().c_str(), LogInfoEx(LOG_NET, "PEER %u (%s) updating ACL list, dt = %u, now = %u", peerId, connection->identity().c_str(),
dt, now); dt, now);
network->peerACLUpdate(peerId); network->peerACLUpdate(peerId);
connection->lastACLUpdate(now); connection->lastACLUpdate(now);
@ -791,7 +791,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
network->writePeerCommand(peerId, { NET_FUNC_PONG, NET_SUBFUNC_NOP }); network->writePeerCommand(peerId, { NET_FUNC_PONG, NET_SUBFUNC_NOP });
if (network->m_reportPeerPing) { if (network->m_reportPeerPing) {
LogInfoEx(LOG_NET, "PEER %u (%8s) ping, pingsReceived = %u, lastPing = %u", peerId, connection->identity().c_str(), LogInfoEx(LOG_NET, "PEER %u (%s) ping, pingsReceived = %u, lastPing = %u", peerId, connection->identity().c_str(),
connection->pingsReceived(), lastPing); connection->pingsReceived(), lastPing);
} }
} }
@ -884,7 +884,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
::memcpy(rawPayload, req->buffer + 11U, req->length - 11U); ::memcpy(rawPayload, req->buffer + 11U, req->length - 11U);
std::string payload(rawPayload, rawPayload + (req->length - 11U)); std::string payload(rawPayload, rawPayload + (req->length - 11U));
::ActivityLog("%u (%8s) %s", peerId, connection->identity().c_str(), payload.c_str()); ::ActivityLog("%.9u (%8s) %s", peerId, connection->identity().c_str(), payload.c_str());
// report activity log to InfluxDB // report activity log to InfluxDB
if (network->m_enableInfluxDB) { if (network->m_enableInfluxDB) {
@ -920,7 +920,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
bool currState = g_disableTimeDisplay; bool currState = g_disableTimeDisplay;
g_disableTimeDisplay = true; g_disableTimeDisplay = true;
::Log(9999U, nullptr, "%u (%8s) %s", peerId, connection->identity().c_str(), payload.c_str()); ::Log(9999U, nullptr, "%.9u (%8s) %s", peerId, connection->identity().c_str(), payload.c_str());
g_disableTimeDisplay = currState; g_disableTimeDisplay = currState;
// report diagnostic log to InfluxDB // report diagnostic log to InfluxDB
@ -957,7 +957,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
std::string ip = udp::Socket::address(req->address); std::string ip = udp::Socket::address(req->address);
lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId]; lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId];
if (aff == nullptr) { if (aff == nullptr) {
LogError(LOG_NET, "PEER %u (%8s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str()); LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str());
} }
// validate peer (simple validation really) // validate peer (simple validation really)
@ -980,7 +980,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
std::string ip = udp::Socket::address(req->address); std::string ip = udp::Socket::address(req->address);
lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId]; lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId];
if (aff == nullptr) { if (aff == nullptr) {
LogError(LOG_NET, "PEER %u (%8s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str()); LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str());
} }
// validate peer (simple validation really) // validate peer (simple validation really)
@ -1001,7 +1001,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
std::string ip = udp::Socket::address(req->address); std::string ip = udp::Socket::address(req->address);
lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId]; lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId];
if (aff == nullptr) { if (aff == nullptr) {
LogError(LOG_NET, "PEER %u (%8s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str()); LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str());
} }
// validate peer (simple validation really) // validate peer (simple validation really)
@ -1025,7 +1025,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
if (connection->connected() && connection->address() == ip) { if (connection->connected() && connection->address() == ip) {
lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId]; lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId];
if (aff == nullptr) { if (aff == nullptr) {
LogError(LOG_NET, "PEER %u (%8s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str()); LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str());
} }
if (aff != nullptr) { if (aff != nullptr) {
@ -1041,7 +1041,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
aff->groupAff(srcId, dstId); aff->groupAff(srcId, dstId);
offs += 8U; offs += 8U;
} }
LogMessage(LOG_NET, "PEER %u (%8s) announced %u affiliations", peerId, connection->identity().c_str(), len); LogMessage(LOG_NET, "PEER %u (%s) announced %u affiliations", peerId, connection->identity().c_str(), len);
} }
} }
else { else {
@ -1071,7 +1071,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
} }
offs += 4U; offs += 4U;
} }
LogMessage(LOG_NET, "PEER %u (%8s) announced %u VCs", peerId, connection->identity().c_str(), len); LogMessage(LOG_NET, "PEER %u (%s) announced %u VCs", peerId, connection->identity().c_str(), len);
} }
else { else {
network->writePeerNAK(peerId, TAG_ANNOUNCE, NET_CONN_NAK_FNE_UNAUTHORIZED); network->writePeerNAK(peerId, TAG_ANNOUNCE, NET_CONN_NAK_FNE_UNAUTHORIZED);
@ -1235,7 +1235,7 @@ void* FNENetwork::threadedACLUpdate(void* arg)
::pthread_detach(req->thread); ::pthread_detach(req->thread);
std::string peerIdentity = req->network->resolvePeerIdentity(req->peerId); std::string peerIdentity = req->network->resolvePeerIdentity(req->peerId);
LogInfoEx(LOG_NET, "PEER %u (%8s) sending ACL list updates", req->peerId, peerIdentity.c_str()); LogInfoEx(LOG_NET, "PEER %u (%s) sending ACL list updates", req->peerId, peerIdentity.c_str());
req->network->writeWhitelistRIDs(req->peerId); req->network->writeWhitelistRIDs(req->peerId);
req->network->writeBlacklistRIDs(req->peerId); req->network->writeBlacklistRIDs(req->peerId);
@ -1308,7 +1308,7 @@ void FNENetwork::writeWhitelistRIDs(uint32_t peerId)
uint32_t id = ridWhitelist.at(j + (i * MAX_RID_LIST_CHUNK)); uint32_t id = ridWhitelist.at(j + (i * MAX_RID_LIST_CHUNK));
if (m_debug) if (m_debug)
LogDebug(LOG_NET, "PEER %u (%8s) whitelisting RID %u (%d / %d)", peerId, connection->identity().c_str(), LogDebug(LOG_NET, "PEER %u (%s) whitelisting RID %u (%d / %d)", peerId, connection->identity().c_str(),
id, i, j); id, i, j);
__SET_UINT32(id, payload, offs); __SET_UINT32(id, payload, offs);
@ -1383,7 +1383,7 @@ void FNENetwork::writeBlacklistRIDs(uint32_t peerId)
uint32_t id = ridBlacklist.at(j + (i * MAX_RID_LIST_CHUNK)); uint32_t id = ridBlacklist.at(j + (i * MAX_RID_LIST_CHUNK));
if (m_debug) if (m_debug)
LogDebug(LOG_NET, "PEER %u (%8s) blacklisting RID %u (%d / %d)", peerId, connection->identity().c_str(), LogDebug(LOG_NET, "PEER %u (%s) blacklisting RID %u (%d / %d)", peerId, connection->identity().c_str(),
id, i, j); id, i, j);
__SET_UINT32(id, payload, offs); __SET_UINT32(id, payload, offs);
@ -1465,7 +1465,7 @@ void FNENetwork::writeTGIDs(uint32_t peerId)
for (std::pair<uint32_t, uint8_t> tg : tgidList) { for (std::pair<uint32_t, uint8_t> tg : tgidList) {
if (m_debug) { if (m_debug) {
std::string peerIdentity = resolvePeerIdentity(peerId); std::string peerIdentity = resolvePeerIdentity(peerId);
LogDebug(LOG_NET, "PEER %u (%8s) activating TGID %u TS %u", peerId, peerIdentity.c_str(), LogDebug(LOG_NET, "PEER %u (%s) activating TGID %u TS %u", peerId, peerIdentity.c_str(),
tg.first, tg.second); tg.first, tg.second);
} }
__SET_UINT32(tg.first, payload, offs); __SET_UINT32(tg.first, payload, offs);
@ -1527,7 +1527,7 @@ void FNENetwork::writeDeactiveTGIDs(uint32_t peerId)
for (std::pair<uint32_t, uint8_t> tg : tgidList) { for (std::pair<uint32_t, uint8_t> tg : tgidList) {
if (m_debug) { if (m_debug) {
std::string peerIdentity = resolvePeerIdentity(peerId); std::string peerIdentity = resolvePeerIdentity(peerId);
LogDebug(LOG_NET, "PEER %u (%8s) deactivating TGID %u TS %u", peerId, peerIdentity.c_str(), LogDebug(LOG_NET, "PEER %u (%s) deactivating TGID %u TS %u", peerId, peerIdentity.c_str(),
tg.first, tg.second); tg.first, tg.second);
} }
__SET_UINT32(tg.first, payload, offs); __SET_UINT32(tg.first, payload, offs);

4
src/fne/network/fne/TagDMRData.cpp
Unescape View File

@ -590,7 +590,7 @@ bool TagDMRData::processCSBK(uint8_t* buffer, uint32_t peerId, dmr::data::Data&
} }
} else { } else {
std::string peerIdentity = m_network->resolvePeerIdentity(peerId); std::string peerIdentity = m_network->resolvePeerIdentity(peerId);
LogWarning(LOG_NET, "PEER %u (%8s), passing CSBK that failed to decode? csbk == nullptr", peerId, peerIdentity.c_str()); LogWarning(LOG_NET, "PEER %u (%s), passing CSBK that failed to decode? csbk == nullptr", peerId, peerIdentity.c_str());
} }
} }
@ -663,7 +663,7 @@ bool TagDMRData::isPeerPermitted(uint32_t peerId, data::Data& data, uint32_t str
lookups::AffiliationLookup* aff = m_network->m_peerAffiliations[lookupPeerId]; lookups::AffiliationLookup* aff = m_network->m_peerAffiliations[lookupPeerId];
if (aff == nullptr) { if (aff == nullptr) {
std::string peerIdentity = m_network->resolvePeerIdentity(lookupPeerId); std::string peerIdentity = m_network->resolvePeerIdentity(lookupPeerId);
LogError(LOG_NET, "PEER %u (%8s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str()); LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str());
return false; // this will cause no traffic to pass for this peer now...I'm not sure this is good behavior return false; // this will cause no traffic to pass for this peer now...I'm not sure this is good behavior
} }
else { else {

2
src/fne/network/fne/TagNXDNData.cpp
Unescape View File

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

6
src/fne/network/fne/TagP25Data.cpp
Unescape View File

@ -694,7 +694,7 @@ bool TagP25Data::processTSDU(uint8_t* buffer, uint32_t peerId, uint8_t duid)
} }
} else { } else {
std::string peerIdentity = m_network->resolvePeerIdentity(peerId); std::string peerIdentity = m_network->resolvePeerIdentity(peerId);
LogWarning(LOG_NET, "PEER %u (%8s), passing TSBK that failed to decode? tsbk == nullptr", peerId, peerIdentity.c_str()); LogWarning(LOG_NET, "PEER %u (%s), passing TSBK that failed to decode? tsbk == nullptr", peerId, peerIdentity.c_str());
} }
} }
@ -742,7 +742,7 @@ bool TagP25Data::processTSDUToExternal(uint8_t* buffer, uint32_t srcPeerId, uint
} }
} else { } else {
std::string peerIdentity = m_network->resolvePeerIdentity(srcPeerId); std::string peerIdentity = m_network->resolvePeerIdentity(srcPeerId);
LogWarning(LOG_NET, "PEER %u (%8s), passing TSBK that failed to decode? tsbk == nullptr", srcPeerId, peerIdentity.c_str()); LogWarning(LOG_NET, "PEER %u (%s), passing TSBK that failed to decode? tsbk == nullptr", srcPeerId, peerIdentity.c_str());
} }
} }
@ -823,7 +823,7 @@ bool TagP25Data::isPeerPermitted(uint32_t peerId, lc::LC& control, uint8_t duid,
lookups::AffiliationLookup* aff = m_network->m_peerAffiliations[lookupPeerId]; lookups::AffiliationLookup* aff = m_network->m_peerAffiliations[lookupPeerId];
if (aff == nullptr) { if (aff == nullptr) {
std::string peerIdentity = m_network->resolvePeerIdentity(lookupPeerId); std::string peerIdentity = m_network->resolvePeerIdentity(lookupPeerId);
LogError(LOG_NET, "PEER %u (%8s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str()); LogError(LOG_NET, "PEER %u (%s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", lookupPeerId, peerIdentity.c_str());
return false; // this will cause no traffic to pass for this peer now...I'm not sure this is good behavior return false; // this will cause no traffic to pass for this peer now...I'm not sure this is good behavior
} }
else { else {

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.