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

add support to report the textual identity in the logs for a peer along with its peer ID in most cases;

Browse Source
pull/55/head
Bryan Biedenkapp 2 years ago
parent 75dbc9e025
commit bcd2cf21e7
6 changed files with 87 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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

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

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

@ -268,7 +268,8 @@ void FNENetwork::clock(uint32_t ms)
if (connection->connected()) {
uint64_t dt = connection->lastPing() + (m_host->m_pingTime * m_host->m_maxMissedPings);
if (dt < now) {
LogInfoEx(LOG_NET, "PEER %u timed out, dt = %u, now = %u", id, dt, now);
LogInfoEx(LOG_NET, "PEER %u (%8s) timed out, dt = %u, now = %u", id, connection->identity().c_str(),
dt, now);
peersToRemove.push_back(id);
}
}
@ -408,7 +409,8 @@ void* FNENetwork::threadedNetworkRx(void* arg)
connection->pktNextSeq(0U);
} else {
if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq()) && (pktSeq != (RTP_END_OF_CALL_SEQ - 1U))) {
LogWarning(LOG_NET, "PEER %u stream %u out-of-sequence; %u != %u", peerId, streamId, pktSeq, connection->pktNextSeq());
LogWarning(LOG_NET, "PEER %u (%8s) stream %u out-of-sequence; %u != %u", peerId, connection->identity().c_str(),
streamId, pktSeq, connection->pktNextSeq());
}
connection->currStreamId(streamId);
@ -424,9 +426,9 @@ void* FNENetwork::threadedNetworkRx(void* arg)
}
// 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)
{
LogError(LOG_NET, "PEER %u malformed packet (no stream ID for a call?)", peerId);
if (streamId == 0 && req->fneHeader.getFunction() == NET_FUNC_PROTOCOL) {
std::string peerIdentity = network->resolvePeerIdentity(peerId);
LogError(LOG_NET, "PEER %u (%8s) malformed packet (no stream ID for a call?)", peerId, peerIdentity.c_str());
if (req->buffer != nullptr)
delete req->buffer;
@ -542,7 +544,8 @@ void* FNENetwork::threadedNetworkRx(void* arg)
FNEPeerConnection* connection = network->m_peers[peerId];
if (connection != nullptr) {
if (connection->connectionState() == NET_STAT_RUNNING) {
LogMessage(LOG_NET, "PEER %u resetting peer connection, connectionState = %u", peerId, connection->connectionState());
LogMessage(LOG_NET, "PEER %u (%8s) resetting peer connection, connectionState = %u", peerId, connection->identity().c_str(),
connection->connectionState());
delete connection;
connection = new FNEPeerConnection(peerId, req->address, req->addrLen);
@ -554,7 +557,8 @@ void* FNENetwork::threadedNetworkRx(void* arg)
} else {
network->writePeerNAK(peerId, TAG_REPEATER_LOGIN, NET_CONN_NAK_BAD_CONN_STATE, req->address, req->addrLen);
LogWarning(LOG_NET, "PEER %u RPTL NAK, bad connection state, connectionState = %u", peerId, connection->connectionState());
LogWarning(LOG_NET, "PEER %u (%8s) RPTL NAK, bad connection state, connectionState = %u", peerId, connection->identity().c_str(),
connection->connectionState());
delete connection;
network->erasePeer(peerId);
@ -686,6 +690,12 @@ void* FNENetwork::threadedNetworkRx(void* arg)
LogInfoEx(LOG_NET, "PEER %u RPTC ACK, completed the configuration exchange", peerId);
json::object peerConfig = connection->config();
if (peerConfig["identity"].is<std::string>()) {
std::string identity = peerConfig["identity"].get<std::string>();
connection->identity(identity);
LogInfoEx(LOG_NET, "PEER %u reports identity [%8s]", peerId, identity.c_str());
}
if (peerConfig["externalPeer"].is<bool>()) {
bool external = peerConfig["externalPeer"].get<bool>();
connection->isExternalPeer(external);
@ -718,7 +728,8 @@ void* FNENetwork::threadedNetworkRx(void* arg)
}
}
else {
LogWarning(LOG_NET, "PEER %u RPTC NAK, login exchange while in an incorrect state, connectionState = %u", peerId, connection->connectionState());
LogWarning(LOG_NET, "PEER %u (%8s) RPTC NAK, login exchange while in an incorrect state, connectionState = %u", peerId, connection->identity().c_str(),
connection->connectionState());
network->writePeerNAK(peerId, TAG_REPEATER_CONFIG, NET_CONN_NAK_BAD_CONN_STATE);
network->erasePeer(peerId);
}
@ -740,7 +751,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
// validate peer (simple validation really)
if (connection->connected() && connection->address() == ip) {
LogInfoEx(LOG_NET, "PEER %u is closing down", peerId);
LogInfoEx(LOG_NET, "PEER %u (%8s) is closing down", peerId, connection->identity().c_str());
if (network->erasePeer(peerId)) {
network->erasePeerAffiliations(peerId);
delete connection;
@ -770,7 +781,8 @@ void* FNENetwork::threadedNetworkRx(void* arg)
// does this peer need an ACL update?
uint64_t dt = connection->lastACLUpdate() + network->m_updateLookupTime;
if (dt < now) {
LogInfoEx(LOG_NET, "PEER %u updating ACL list, dt = %u, now = %u", peerId, dt, now);
LogInfoEx(LOG_NET, "PEER %u (%8s) updating ACL list, dt = %u, now = %u", peerId, connection->identity().c_str(),
dt, now);
network->peerACLUpdate(peerId);
connection->lastACLUpdate(now);
}
@ -779,7 +791,8 @@ void* FNENetwork::threadedNetworkRx(void* arg)
network->writePeerCommand(peerId, { NET_FUNC_PONG, NET_SUBFUNC_NOP });
if (network->m_reportPeerPing) {
LogInfoEx(LOG_NET, "PEER %u ping, pingsReceived = %u, lastPing = %u", peerId, connection->pingsReceived(), lastPing);
LogInfoEx(LOG_NET, "PEER %u (%8s) ping, pingsReceived = %u, lastPing = %u", peerId, connection->identity().c_str(),
connection->pingsReceived(), lastPing);
}
}
else {
@ -942,7 +955,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
std::string ip = udp::Socket::address(req->address);
lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId];
if (aff == nullptr) {
LogError(LOG_NET, "PEER %u has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId);
LogError(LOG_NET, "PEER %u (%8s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str());
}
// validate peer (simple validation really)
@ -965,7 +978,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
std::string ip = udp::Socket::address(req->address);
lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId];
if (aff == nullptr) {
LogError(LOG_NET, "PEER %u has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId);
LogError(LOG_NET, "PEER %u (%8s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str());
}
// validate peer (simple validation really)
@ -986,7 +999,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
std::string ip = udp::Socket::address(req->address);
lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId];
if (aff == nullptr) {
LogError(LOG_NET, "PEER %u has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId);
LogError(LOG_NET, "PEER %u (%8s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str());
}
// validate peer (simple validation really)
@ -1010,7 +1023,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
if (connection->connected() && connection->address() == ip) {
lookups::AffiliationLookup* aff = network->m_peerAffiliations[peerId];
if (aff == nullptr) {
LogError(LOG_NET, "PEER %u has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId);
LogError(LOG_NET, "PEER %u (%8s) has an invalid affiliations lookup? This shouldn't happen BUGBUG.", peerId, connection->identity().c_str());
}
if (aff != nullptr) {
@ -1026,7 +1039,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
aff->groupAff(srcId, dstId);
offs += 8U;
}
LogMessage(LOG_NET, "PEER %u announced %u affiliations", peerId, len);
LogMessage(LOG_NET, "PEER %u (%8s) announced %u affiliations", peerId, connection->identity().c_str(), len);
}
}
else {
@ -1056,7 +1069,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
}
offs += 4U;
}
LogMessage(LOG_NET, "PEER %u announced %u VCs", peerId, len);
LogMessage(LOG_NET, "PEER %u (%8s) announced %u VCs", peerId, connection->identity().c_str(), len);
}
else {
network->writePeerNAK(peerId, TAG_ANNOUNCE, NET_CONN_NAK_FNE_UNAUTHORIZED);
@ -1142,6 +1155,25 @@ bool FNENetwork::erasePeer(uint32_t peerId)
return false;
}
/// <summary>
/// Helper to resolve the peer ID to its identity string.
/// </summary>
/// <param name="peerId"></param>
/// <returns></returns>
std::string FNENetwork::resolvePeerIdentity(uint32_t peerId)
{
std::lock_guard<std::mutex> lock(m_peerMutex);
auto it = std::find_if(m_peers.begin(), m_peers.end(), [&](PeerMapPair x) { return x.first == peerId; });
if (it != m_peers.end()) {
if (it->second != nullptr) {
FNEPeerConnection* peer = it->second;
return peer->identity();
}
}
return std::string();
}
/// <summary>
/// Helper to complete setting up a repeater login request.
/// </summary>
@ -1200,7 +1232,8 @@ void* FNENetwork::threadedACLUpdate(void* arg)
if (req != nullptr) {
::pthread_detach(req->thread);
LogInfoEx(LOG_NET, "PEER %u sending ACL list updates", 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());
req->network->writeWhitelistRIDs(req->peerId);
req->network->writeBlacklistRIDs(req->peerId);
@ -1273,7 +1306,8 @@ void FNENetwork::writeWhitelistRIDs(uint32_t peerId)
uint32_t id = ridWhitelist.at(j + (i * MAX_RID_LIST_CHUNK));
if (m_debug)
LogDebug(LOG_NET, "PEER %u whitelisting RID %u (%d / %d)", peerId, id, i, j);
LogDebug(LOG_NET, "PEER %u (%8s) whitelisting RID %u (%d / %d)", peerId, connection->identity().c_str(),
id, i, j);
__SET_UINT32(id, payload, offs);
offs += 4U;
@ -1347,7 +1381,8 @@ void FNENetwork::writeBlacklistRIDs(uint32_t peerId)
uint32_t id = ridBlacklist.at(j + (i * MAX_RID_LIST_CHUNK));
if (m_debug)
LogDebug(LOG_NET, "PEER %u blacklisting RID %u (%d / %d)", peerId, id, i, j);
LogDebug(LOG_NET, "PEER %u (%8s) blacklisting RID %u (%d / %d)", peerId, connection->identity().c_str(),
id, i, j);
__SET_UINT32(id, payload, offs);
offs += 4U;
@ -1426,8 +1461,11 @@ void FNENetwork::writeTGIDs(uint32_t peerId)
// write talkgroup IDs to active TGID payload
uint32_t offs = 4U;
for (std::pair<uint32_t, uint8_t> tg : tgidList) {
if (m_debug)
LogDebug(LOG_NET, "PEER %u activating TGID %u TS %u", peerId, tg.first, tg.second);
if (m_debug) {
std::string peerIdentity = resolvePeerIdentity(peerId);
LogDebug(LOG_NET, "PEER %u (%8s) activating TGID %u TS %u", peerId, peerIdentity.c_str(),
tg.first, tg.second);
}
__SET_UINT32(tg.first, payload, offs);
payload[offs + 4U] = tg.second;
offs += 5U;
@ -1485,8 +1523,11 @@ void FNENetwork::writeDeactiveTGIDs(uint32_t peerId)
// write talkgroup IDs to deactive TGID payload
uint32_t offs = 4U;
for (std::pair<uint32_t, uint8_t> tg : tgidList) {
if (m_debug)
LogDebug(LOG_NET, "PEER %u deactivating TGID %u TS %u", peerId, tg.first, tg.second);
if (m_debug) {
std::string peerIdentity = resolvePeerIdentity(peerId);
LogDebug(LOG_NET, "PEER %u (%8s) deactivating TGID %u TS %u", peerId, peerIdentity.c_str(),
tg.first, tg.second);
}
__SET_UINT32(tg.first, payload, offs);
payload[offs + 4U] = tg.second;
offs += 5U;

5
src/fne/network/FNENetwork.h
Unescape View File

@ -133,6 +133,8 @@ namespace network
public:
/// <summary>Peer ID.</summary>
__PROPERTY_PLAIN(uint32_t, id);
/// <summary>Peer Identity.</summary>
__PROPERTY_PLAIN(std::string, identity);
/// <summary>Control Channel Peer ID.</summary>
__PROPERTY_PLAIN(uint32_t, ccPeerId);
@ -326,6 +328,9 @@ namespace network
/// <summary>Helper to erase the peer from the peers list.</summary>
bool erasePeer(uint32_t peerId);
/// <summary>Helper to resolve the peer ID to its identity string.</summary>
std::string resolvePeerIdentity(uint32_t peerId);
/// <summary>Helper to complete setting up a repeater login request.</summary>
void setupRepeaterLogin(uint32_t peerId, FNEPeerConnection* connection);

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

@ -589,7 +589,8 @@ bool TagDMRData::processCSBK(uint8_t* buffer, uint32_t peerId, dmr::data::Data&
break;
}
} else {
LogWarning(LOG_NET, "PEER %u, passing CSBK that failed to decode? csbk == nullptr", 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());
}
}
@ -661,7 +662,8 @@ bool TagDMRData::isPeerPermitted(uint32_t peerId, data::Data& data, uint32_t str
// check the affiliations for this peer to see if we can repeat traffic
lookups::AffiliationLookup* aff = m_network->m_peerAffiliations[lookupPeerId];
if (aff == nullptr) {
LogError(LOG_NET, "PEER %u has an invalid affiliations lookup? This shouldn't happen BUGBUG.", 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());
return false; // this will cause no traffic to pass for this peer now...I'm not sure this is good behavior
}
else {

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

@ -471,7 +471,8 @@ bool TagNXDNData::isPeerPermitted(uint32_t peerId, lc::RTCH& lc, uint8_t message
// check the affiliations for this peer to see if we can repeat traffic
lookups::AffiliationLookup* aff = m_network->m_peerAffiliations[lookupPeerId];
if (aff == nullptr) {
LogError(LOG_NET, "PEER %u has an invalid affiliations lookup? This shouldn't happen BUGBUG.", 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());
return false; // this will cause no traffic to pass for this peer now...I'm not sure this is good behavior
}
else {

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

@ -693,7 +693,8 @@ bool TagP25Data::processTSDU(uint8_t* buffer, uint32_t peerId, uint8_t duid)
break;
}
} else {
LogWarning(LOG_NET, "PEER %u, passing TSBK that failed to decode? tsbk == nullptr", 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());
}
}
@ -740,7 +741,8 @@ bool TagP25Data::processTSDUToExternal(uint8_t* buffer, uint32_t srcPeerId, uint
break;
}
} else {
LogWarning(LOG_NET, "PEER %u, passing TSBK that failed to decode? tsbk == nullptr", 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());
}
}
@ -820,7 +822,8 @@ bool TagP25Data::isPeerPermitted(uint32_t peerId, lc::LC& control, uint8_t duid,
// check the affiliations for this peer to see if we can repeat traffic
lookups::AffiliationLookup* aff = m_network->m_peerAffiliations[lookupPeerId];
if (aff == nullptr) {
LogError(LOG_NET, "PEER %u has an invalid affiliations lookup? This shouldn't happen BUGBUG.", 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());
return false; // this will cause no traffic to pass for this peer now...I'm not sure this is good behavior
}
else {

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.