MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2026-02-04 22:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ipv6' into SimpleDMR

Browse Source
This commit is contained in:
Jonathan Naylor
2020-09-03 11:43:42 +01:00
parent 132fb62d56 34db212360
commit 3de54f6dd8
24 changed files with 299 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
DMRNetwork.cpp
View File

@@ -35,6 +35,7 @@ const unsigned int HOMEBREW_DATA_PACKET_LENGTH = 55U;
CDMRNetwork::CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, bool duplex, const char* version, bool debug, bool slot1, bool slot2, HW_TYPE hwType) :
m_addressStr(address),
m_address(),
m_addrlen(),
m_port(port),
m_id(NULL),
m_duplex(duplex),
@@ -61,7 +62,7 @@ m_pingTimer(1000U, 10U)
assert(port > 0U);
assert(id > 1000U);
m_address = CUDPSocket::lookup(address);
CUDPSocket::lookup(m_addressStr, m_port, m_address, m_addrlen);
m_buffer = new unsigned char[BUFFER_LENGTH];
m_id = new uint8_t[4U];
@@ -101,8 +102,10 @@ bool CDMRNetwork::open()
{
LogMessage("DMR, Opening DMR Network");
bool ret = m_socket.open();
if (CUDPSocket::isnone(m_address))
CUDPSocket::lookup(m_addressStr, m_port, m_address, m_addrlen);
bool ret = m_socket.open();
if (ret)
m_pingTimer.start();
@@ -293,14 +296,14 @@ void CDMRNetwork::clock(unsigned int ms)
m_pingTimer.start();
}
in_addr address;
unsigned int port;
int length = m_socket.read(m_buffer, BUFFER_LENGTH, address, port);
sockaddr_storage address;
unsigned int addrlen;
int length = m_socket.read(m_buffer, BUFFER_LENGTH, address, addrlen);
if (length <= 0)
return;
if (m_address.s_addr != address.s_addr || m_port != port) {
LogMessage("DMR, packet received from an invalid source, %08X != %08X and/or %u != %u", m_address.s_addr, address.s_addr, m_port, port);
if (!CUDPSocket::match(m_address, address)) {
LogMessage("DMR, packet received from an invalid source");
return;
}
@@ -424,7 +427,7 @@ bool CDMRNetwork::write(const unsigned char* data, unsigned int length)
if (m_debug)
CUtils::dump(1U, "Network Transmitted", data, length);
bool ret = m_socket.write(data, length, m_address, m_port);
bool ret = m_socket.write(data, length, m_address, m_addrlen);
if (!ret) {
LogError("DMR, socket error when writing to the DMR Gateway");
return false;