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

70
P25Network.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2014,2016,2019 by Jonathan Naylor G4KLX
* Copyright (C) 2009-2014,2016,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
@@ -89,14 +89,15 @@ const unsigned int BUFFER_LENGTH = 100U;
CP25Network::CP25Network(const std::string& gatewayAddress, unsigned int gatewayPort, unsigned int localPort, bool debug) :
m_socket(localPort),
m_address(),
m_addrlen(),
m_addr(),
m_addrLen(0U),
m_debug(debug),
m_enabled(false),
m_buffer(1000U, "P25 Network"),
m_audio()
{
CUDPSocket::lookup(gatewayAddress, gatewayPort, m_address, m_addrlen);
if (CUDPSocket::lookup(gatewayAddress, gatewayPort, m_addr, m_addrLen) != 0)
m_addrLen = 0U;
}
CP25Network::~CP25Network()
@@ -105,12 +106,14 @@ CP25Network::~CP25Network()
bool CP25Network::open()
{
if (m_addrLen == 0U) {
LogError("Unable to resolve the address of the P25 Gateway");
return false;
}
LogMessage("Opening P25 network connection");
if (CUDPSocket::isNone(m_address))
return false;
return m_socket.open(m_address.ss_family);
return m_socket.open(m_addr);
}
bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control, const CP25LowSpeedData& lsd, bool end)
@@ -126,7 +129,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU1 Sent", buffer, 22U);
bool ret = m_socket.write(buffer, 22U, m_address, m_addrlen);
bool ret = m_socket.write(buffer, 22U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -137,7 +140,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU1 Sent", buffer, 14U);
ret = m_socket.write(buffer, 14U, m_address, m_addrlen);
ret = m_socket.write(buffer, 14U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -150,7 +153,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU1 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -165,7 +168,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU1 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -180,7 +183,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU1 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -191,7 +194,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU1 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -202,7 +205,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU1 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -213,7 +216,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU1 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -226,7 +229,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU1 Sent", buffer, 16U);
ret = m_socket.write(buffer, 16U, m_address, m_addrlen);
ret = m_socket.write(buffer, 16U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -234,7 +237,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network END Sent", REC80, 17U);
ret = m_socket.write(REC80, 17U, m_address, m_addrlen);
ret = m_socket.write(REC80, 17U, m_addr, m_addrLen);
if (!ret)
return false;
}
@@ -255,7 +258,7 @@ bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU2 Sent", buffer, 22U);
bool ret = m_socket.write(buffer, 22U, m_address, m_addrlen);
bool ret = m_socket.write(buffer, 22U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -266,7 +269,7 @@ bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU2 Sent", buffer, 14U);
ret = m_socket.write(buffer, 14U, m_address, m_addrlen);
ret = m_socket.write(buffer, 14U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -283,7 +286,7 @@ bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU2 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -297,7 +300,7 @@ bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU2 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -311,7 +314,7 @@ bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU2 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -326,7 +329,7 @@ bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU2 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -337,7 +340,7 @@ bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU2 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -348,7 +351,7 @@ bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU2 Sent", buffer, 17U);
ret = m_socket.write(buffer, 17U, m_address, m_addrlen);
ret = m_socket.write(buffer, 17U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -361,7 +364,7 @@ bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network LDU2 Sent", buffer, 16U);
ret = m_socket.write(buffer, 16U, m_address, m_addrlen);
ret = m_socket.write(buffer, 16U, m_addr, m_addrLen);
if (!ret)
return false;
@@ -369,7 +372,7 @@ bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control,
if (m_debug)
CUtils::dump(1U, "P25 Network END Sent", REC80, 17U);
ret = m_socket.write(REC80, 17U, m_address, m_addrlen);
ret = m_socket.write(REC80, 17U, m_addr, m_addrLen);
if (!ret)
return false;
}
@@ -382,11 +385,16 @@ void CP25Network::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("P25, packet received from an invalid source");
return;
}
if (!m_enabled)
return;