MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-21 21:45:39 +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:16:10 +01:00
parent 0b972e8616 94289e062d
commit 5e3e9f10b9
11 changed files with 143 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
DMRNetwork.cpp
View File

@@ -33,7 +33,7 @@ const unsigned int HOMEBREW_DATA_PACKET_LENGTH = 55U;
CDMRNetwork::CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, const std::string& name, bool location, bool debug) :
m_address(),
m_port(port),
m_addrlen(),
m_id(NULL),
m_password(password),
m_name(name),
@@ -56,7 +56,7 @@ m_beacon(false)
assert(id > 1000U);
assert(!password.empty());
m_address = CUDPSocket::lookup(address);
CUDPSocket::lookup(address, port, m_address, m_addrlen);
m_buffer = new unsigned char[BUFFER_LENGTH];
m_salt = new unsigned char[sizeof(uint32_t)];
@@ -305,7 +305,7 @@ void CDMRNetwork::clock(unsigned int ms)
if (m_status == WAITING_CONNECT) {
m_retryTimer.clock(ms);
if (m_retryTimer.isRunning() && m_retryTimer.hasExpired()) {
bool ret = m_socket.open();
bool ret = m_socket.open(m_address.ss_family);
if (ret) {
ret = writeLogin();
if (!ret)
@@ -321,9 +321,9 @@ void CDMRNetwork::clock(unsigned int ms)
return;
}
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) {
LogError("%s, Socket has failed, retrying connection to the master", m_name.c_str());
close();
@@ -331,7 +331,10 @@ void CDMRNetwork::clock(unsigned int ms)
return;
}
if (length > 0 && m_address.s_addr == address.s_addr && m_port == port) {
if (m_debug && length > 0)
CUtils::dump(1U, "Network Received", m_buffer, length);
if (length > 0 && CUDPSocket::match(m_address, address)) {
if (::memcmp(m_buffer, "DMRD", 4U) == 0) {
if (m_debug)
CUtils::dump(1U, "Network Received", m_buffer, length);
@@ -523,7 +526,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("%s, Socket has failed when writing data to the master, retrying connection", m_name.c_str());
m_socket.close();