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

Merge remote-tracking branch 'upstream/master' into ipv6

Browse Source 
simply merged upstream code.

following files are conflicted, all fixed
GPSD.h, MobileGPS.cpp, NXDNNetwork.cpp, NXDNNetwork.h, UDPSocket.h

NXDNIcomNetwork and NXDNKenwoodNetwork is still original code,
not support IPv6-UDPSocket yet.
This commit is contained in:
SASANO Takayoshi
2020-07-03 04:14:33 +09:00
parent 816f8ea0a1 5dcdfd8159
commit 74adbd4895
33 changed files with 1969 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DMRNetwork.cpp
View File

@@ -67,7 +67,8 @@ m_height(0),
m_location(),
m_description(),
m_url(),
m_beacon(false)
m_beacon(false),
m_random()
{
assert(!address.empty());
assert(port > 0U);
@@ -86,11 +87,13 @@ m_beacon(false)
m_id[2U] = id >> 8;
m_id[3U] = id >> 0;
CStopWatch stopWatch;
::srand(stopWatch.start());
std::random_device rd;
std::mt19937 mt(rd());
m_random = mt;
m_streamId[0U] = ::rand() + 1U;
m_streamId[1U] = ::rand() + 1U;
std::uniform_int_distribution<uint32_t> dist(0x00000001, 0xfffffffe);
m_streamId[0U] = dist(m_random);
m_streamId[1U] = dist(m_random);
}
CDMRNetwork::~CDMRNetwork()
@@ -247,6 +250,7 @@ bool CDMRNetwork::write(const CDMRData& data)
unsigned int slotIndex = slotNo - 1U;
std::uniform_int_distribution<uint32_t> dist(0x00000001, 0xfffffffe);
unsigned char dataType = data.getDataType();
if (dataType == DT_VOICE_SYNC) {
buffer[15U] |= 0x10U;
@@ -254,10 +258,10 @@ bool CDMRNetwork::write(const CDMRData& data)
buffer[15U] |= data.getN();
} else {
if (dataType == DT_VOICE_LC_HEADER)
m_streamId[slotIndex] = ::rand() + 1U;
m_streamId[slotIndex] = dist(m_random);
if (dataType == DT_CSBK || dataType == DT_DATA_HEADER)
m_streamId[slotIndex] = ::rand() + 1U;
m_streamId[slotIndex] = dist(m_random);
buffer[15U] |= (0x20U | dataType);
}