ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2025-07-29 19:22:25 -04:00
Code Issues Projects Releases Wiki Activity

Fix end of transmission markers in the NXDN protocol.

Browse Source
This commit is contained in:
Jonathan Naylor 2018-03-15 18:58:43 +00:00
parent 50d109aefe
commit 6db1672ff7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NXDNGateway/NXDNNetwork.cpp
View File

@ -67,8 +67,8 @@ bool CNXDNNetwork::writeData(const unsigned char* data, unsigned int length, uns
buffer[9U] |= grp ? 0x01U : 0x00U;
if (data[0U] == 0x81U || data[0U] == 0x83U) {
buffer[9U] |= buffer[5U] == 0x01U ? 0x04U : 0x00U;
buffer[9U] |= buffer[5U] == 0x08U ? 0x08U : 0x00U;
buffer[9U] |= data[5U] == 0x01U ? 0x04U : 0x00U;
buffer[9U] |= data[5U] == 0x08U ? 0x08U : 0x00U;
}
::memcpy(buffer + 10U, data, 33U);

2
NXDNParrot/NXDNParrot.cpp
View File

@ -85,7 +85,7 @@ void CNXDNParrot::run()
parrot.write(buffer, len);
watchdogTimer.start();
if ((buffer[9U] & 0x04U) == 0x04U) {
if ((buffer[9U] & 0x08U) == 0x08U) {
::fprintf(stdout, "Received end of transmission\n");
turnaroundTimer.start();
watchdogTimer.stop();

6
NXDNReflector/NXDNReflector.cpp
View File

@ -244,7 +244,7 @@ void CNXDNReflector::run()
unsigned short srcId = (buffer[5U] << 8) | buffer[6U];
unsigned short dstId = (buffer[7U] << 8) | buffer[8U];
bool grp = (buffer[9U] & 0x01U) == 0x01U;
bool grp = (buffer[9U] & 0x01U) == 0x01U;
std::string callsign = lookup->find(srcId);
LogMessage("Transmission from %s at %s to %s%u", callsign.c_str(), current->m_callsign.c_str(), grp ? "TG " : "", dstId);
@ -263,7 +263,7 @@ void CNXDNReflector::run()
nxCoreNetwork->write(buffer, len);
}
if ((buffer[9U] & 0x04U) == 0x04U) {
if ((buffer[9U] & 0x08U) == 0x08U) {
LogMessage("Received end of transmission");
watchdogTimer.stop();
current = NULL;
@ -282,7 +282,7 @@ void CNXDNReflector::run()
if (current == NULL) {
if (!nxCore) {
if ((buffer[0U] == 0x81U || buffer[0U] == 0x83U) && buffer[5U] == 0x01U) {
bool grp = (buffer[7U] & 0x20U) == 0x20U;
bool grp = (buffer[7U] & 0x20U) == 0x20U;
unsigned short srcId = (buffer[8U] << 8) | buffer[9U];
unsigned short dstId = (buffer[10U] << 8) | buffer[11U];