ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2026-06-05 07:34:40 -04:00
Code Issues Projects Releases Wiki Activity

Fix the NXCore to NXDN network transfer.

Browse Source
This commit is contained in:
Jonathan Naylor
2018-03-19 19:03:06 +00:00
parent 788cc74c5f
commit d0eb3802bc
3 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NXDNReflector/NXDNReflector.cpp
+9 -4
View File
@@ -194,6 +194,10 @@ void CNXDNReflector::run()
CNXDNRepeater* current = NULL;
bool nxCore = false;
unsigned short srcId = 0U;
unsigned short dstId = 0U;
bool grp = false;
CTimer watchdogTimer(1000U, 0U, 1500U);
for (;;) {
@@ -282,9 +286,10 @@ void CNXDNReflector::run()
if (current == NULL) {
if (!nxCore) {
if ((buffer[0U] == 0x81U || buffer[0U] == 0x83U) && buffer[5U] == 0x01U) {
bool grp = (buffer[7U] & 0x20U) == 0x20U;
unsigned short srcId = (buffer[8U] << 8) | buffer[9U];
unsigned short dstId = (buffer[10U] << 8) | buffer[11U];
// Save the grp, src and dest for use in the NXDN Protocol messages
grp = (buffer[7U] & 0x20U) == 0x20U;
srcId = (buffer[8U] << 8) | buffer[9U];
dstId = (buffer[10U] << 8) | buffer[11U];
std::string callsign = lookup->find(srcId);
LogMessage("Transmission from %s at NXCore to %s%u", callsign.c_str(), grp ? "TG " : "", dstId);
@@ -299,7 +304,7 @@ void CNXDNReflector::run()
for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
in_addr addr = (*it)->m_address;
unsigned int prt = (*it)->m_port;
nxdnNetwork.write(buffer, len, addr, prt);
nxdnNetwork.write(buffer, len, srcId, dstId, grp, addr, prt);
}
if ((buffer[0U] == 0x81U || buffer[0U] == 0x83U) && buffer[5U] == 0x08U) {