Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into AX25

Browse source
This commit is contained in:
Jonathan Naylor 2020-07-01 13:17:22 +01:00
parent e339de8fee 8edfc62049
commit e106df3cdf
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
NXDNKenwoodNetwork.cpp
View file

@ -56,7 +56,8 @@ m_rtcpTimer(1000U, 0U, 200U),
m_hangTimer(1000U, 5U),
m_hangType(0U),
m_hangSrc(0U),
m_hangDst(0U)
m_hangDst(0U),
m_random()
{
assert(localPort > 0U);
assert(!gwyAddress.empty());
@ -65,6 +66,10 @@ m_hangDst(0U)
m_sacch = new unsigned char[10U];
m_address = CUDPSocket::lookup(gwyAddress);
std::random_device rd;
std::mt19937 mt(rd());
m_random = mt;
}
CNXDNKenwoodNetwork::~CNXDNKenwoodNetwork()
@ -87,7 +92,8 @@ bool CNXDNKenwoodNetwork::open()
return false;
}
m_ssrc = m_rtpSocket.getLocalAddress();
std::uniform_int_distribution<unsigned int> dist(0x00000001, 0xfffffffe);
m_ssrc = dist(m_random);
return true;
}

2
NXDNKenwoodNetwork.h
View file

@ -25,6 +25,7 @@
#include <cstdint>
#include <string>
#include <random>
class CNXDNKenwoodNetwork : public INXDNNetwork {
public:
@ -69,6 +70,7 @@ private:
unsigned char m_hangType;
unsigned short m_hangSrc;
unsigned short m_hangDst;
std::mt19937 m_random;
bool processIcomVoiceHeader(const unsigned char* data);
bool processIcomVoiceData(const unsigned char* data);