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

Fix bugs in NXDN networking.

Browse Source
This commit is contained in:
Jonathan Naylor
2018-02-13 19:07:30 +00:00
parent f6b90793db
commit 134646265e
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NXDNControl.cpp
View File

@@ -210,6 +210,8 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
return false; return false;
} }
m_rfLayer3 = layer3;
data[0U] = type == NXDN_MESSAGE_TYPE_TX_REL ? TAG_EOT : TAG_DATA; data[0U] = type == NXDN_MESSAGE_TYPE_TX_REL ? TAG_EOT : TAG_DATA;
data[1U] = 0x00U; data[1U] = 0x00U;
@@ -258,8 +260,6 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
#if defined(DUMP_NXDN) #if defined(DUMP_NXDN)
openFile(); openFile();
#endif #endif
m_rfLayer3 = layer3;
unsigned short srcId = m_rfLayer3.getSourceUnitId(); unsigned short srcId = m_rfLayer3.getSourceUnitId();
unsigned short dstId = m_rfLayer3.getDestinationGroupId(); unsigned short dstId = m_rfLayer3.getDestinationGroupId();
bool grp = m_rfLayer3.getIsGroup(); bool grp = m_rfLayer3.getIsGroup();

4
NXDNNetwork.cpp
View File

@@ -72,14 +72,14 @@ bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp
buffer[4U] = 'D'; buffer[4U] = 'D';
buffer[5U] = (src >> 8) & 0xFFU; buffer[5U] = (src >> 8) & 0xFFU;
buffer[6U] = (src >> 8) & 0xFFU; buffer[6U] = (src >> 0) & 0xFFU;
buffer[7U] = grp ? 0x01U : 0x00U; buffer[7U] = grp ? 0x01U : 0x00U;
buffer[7U] |= dat ? 0x02U : 0x00U; buffer[7U] |= dat ? 0x02U : 0x00U;
buffer[7U] |= end ? 0x04U : 0x00U; buffer[7U] |= end ? 0x04U : 0x00U;
buffer[8U] = (dst >> 8) & 0xFFU; buffer[8U] = (dst >> 8) & 0xFFU;
buffer[9U] = (dst >> 8) & 0xFFU; buffer[9U] = (dst >> 0) & 0xFFU;
buffer[10U] = cnt; buffer[10U] = cnt;

2
UDPSocket.cpp
View File

@@ -32,8 +32,6 @@ m_address(address),
m_port(port), m_port(port),
m_fd(-1) m_fd(-1)
{ {
assert(!address.empty());
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
WSAData data; WSAData data;
int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);