MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-20 22:45:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

use findWithName() to display user information when netork voice transmission

Browse Source
This commit is contained in:
SASANO Takayoshi
2020-03-15 10:36:57 +09:00
parent e036ac8be3
commit d7d83ff4d0
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
NXDNControl.cpp
View File

@@ -835,15 +835,16 @@ void CNXDNControl::writeNetwork()
unsigned short dstId = m_netLayer3.getDestinationGroupId(); unsigned short dstId = m_netLayer3.getDestinationGroupId();
bool grp = m_netLayer3.getIsGroup(); bool grp = m_netLayer3.getIsGroup();
std::string source = m_lookup->find(m_netLayer3.getSourceUnitId()); class CUserDBentry source;
m_lookup->findWithName(m_netLayer3.getSourceUnitId(), &source);
if (type == NXDN_MESSAGE_TYPE_TX_REL) { if (type == NXDN_MESSAGE_TYPE_TX_REL) {
m_netFrames++; m_netFrames++;
LogMessage("NXDN, received network end of transmission from %s to %s%u, %.1f seconds", source.c_str(), grp ? "TG " : "", dstId, float(m_netFrames) / 12.5F); LogMessage("NXDN, received network end of transmission from %s to %s%u, %.1f seconds", source.get(keyCALLSIGN).c_str(), grp ? "TG " : "", dstId, float(m_netFrames) / 12.5F);
writeEndNet(); writeEndNet();
} else if (type == NXDN_MESSAGE_TYPE_VCALL) { } else if (type == NXDN_MESSAGE_TYPE_VCALL) {
LogMessage("NXDN, received network transmission from %s to %s%u", source.c_str(), grp ? "TG " : "", dstId); LogMessage("NXDN, received network transmission from %s to %s%u", source.get(keyCALLSIGN).c_str(), grp ? "TG " : "", dstId);
m_display->writeNXDN(source.c_str(), grp, dstId, "N"); m_display->writeNXDN(source, grp, dstId, "N");
m_netTimeoutTimer.start(); m_netTimeoutTimer.start();
m_packetTimer.start(); m_packetTimer.start();
@@ -892,9 +893,10 @@ void CNXDNControl::writeNetwork()
unsigned short dstId = m_netLayer3.getDestinationGroupId(); unsigned short dstId = m_netLayer3.getDestinationGroupId();
bool grp = m_netLayer3.getIsGroup(); bool grp = m_netLayer3.getIsGroup();
std::string source = m_lookup->find(srcId); class CUserDBentry source;
LogMessage("NXDN, received network transmission from %s to %s%u", source.c_str(), grp ? "TG " : "", dstId); m_lookup->findWithName(srcId, &source);
m_display->writeNXDN(source.c_str(), grp, dstId, "N"); LogMessage("NXDN, received network transmission from %s to %s%u", source.get(keyCALLSIGN).c_str(), grp ? "TG " : "", dstId);
m_display->writeNXDN(source, grp, dstId, "N");
m_netTimeoutTimer.start(); m_netTimeoutTimer.start();
m_packetTimer.start(); m_packetTimer.start();