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

Clean ups for IPv6.

Browse Source
This commit is contained in:
Jonathan Naylor
2020-09-06 12:54:08 +01:00
parent e45f0edec4
commit 7d3e899104
17 changed files with 323 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
POCSAGNetwork.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018,2019 by Jonathan Naylor G4KLX
* Copyright (C) 2018,2019,2020 by Jonathan Naylor G4KLX
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,13 +30,14 @@ const unsigned int BUFFER_LENGTH = 200U;
CPOCSAGNetwork::CPOCSAGNetwork(const std::string& myAddress, unsigned int myPort, const std::string& gatewayAddress, unsigned int gatewayPort, bool debug) :
m_socket(myAddress, myPort),
m_address(),
m_addrlen(),
m_addr(),
m_addrLen(0U),
m_debug(debug),
m_enabled(false),
m_buffer(1000U, "POCSAG Network")
{
CUDPSocket::lookup(gatewayAddress, gatewayPort, m_address, m_addrlen);
if (CUDPSocket::lookup(gatewayAddress, gatewayPort, m_addr, m_addrLen) != 0)
m_addrLen = 0U;
}
CPOCSAGNetwork::~CPOCSAGNetwork()
@@ -45,10 +46,12 @@ CPOCSAGNetwork::~CPOCSAGNetwork()
bool CPOCSAGNetwork::open()
{
LogMessage("Opening POCSAG network connection");
if (CUDPSocket::isNone(m_address))
if (m_addrLen == 0U) {
LogError("Unable to resolve the address of the DAPNET Gateway");
return false;
}
LogMessage("Opening POCSAG network connection");
return m_socket.open();
}
@@ -58,11 +61,19 @@ void CPOCSAGNetwork::clock(unsigned int ms)
unsigned char buffer[BUFFER_LENGTH];
sockaddr_storage address;
unsigned int addrlen;
int length = m_socket.read(buffer, BUFFER_LENGTH, address, addrlen);
if (length <= 0 || !CUDPSocket::match(m_address, address))
unsigned int addrLen;
int length = m_socket.read(buffer, BUFFER_LENGTH, address, addrLen);
if (length <= 0)
return;
if (!CUDPSocket::match(m_addr, address)) {
LogMessage("POCSAG, packet received from an invalid source");
return;
}
if (m_debug)
CUtils::dump(1U, "POCSAG Network Data Received", buffer, length);
// Invalid packet type?
if (::memcmp(buffer, "POCSAG", 6U) != 0)
return;
@@ -70,9 +81,6 @@ void CPOCSAGNetwork::clock(unsigned int ms)
if (!m_enabled)
return;
if (m_debug)
CUtils::dump(1U, "POCSAG Network Data Received", buffer, length);
unsigned char len = length - 6U;
m_buffer.addData(&len, 1U);
m_buffer.addData(buffer + 6U, length - 6U);
@@ -112,7 +120,7 @@ void CPOCSAGNetwork::enable(bool enabled)
unsigned char c = enabled ? 0x00U : 0xFFU;
m_socket.write(&c, 1U, m_address, m_addrlen);
m_socket.write(&c, 1U, m_addr, m_addrLen);
m_enabled = enabled;
}