ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2026-06-03 06:34:38 -04:00
Code Issues Projects Releases Wiki Activity

Convert to IPv6

Browse Source
This commit is contained in:
Jonathan Naylor
2020-09-03 15:12:03 +01:00
parent 93cd9d1863
commit 62d05606d3
30 changed files with 572 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NXDNReflector/IcomNetwork.cpp
+9 -11
View File
@@ -30,12 +30,13 @@ const unsigned int ICOM_PORT = 41300U;
CIcomNetwork::CIcomNetwork(const std::string& address, bool debug) :
m_socket(ICOM_PORT),
m_address(),
m_addr(),
m_addrLen(),
m_debug(debug)
{
assert(!address.empty());
m_address = CUDPSocket::lookup(address);
CUDPSocket::lookup(address, ICOM_PORT, m_addr, m_addrLen);
}
CIcomNetwork::~CIcomNetwork()
@@ -46,9 +47,6 @@ bool CIcomNetwork::open()
{
LogMessage("Opening Icom network connection");
if (m_address.s_addr == INADDR_NONE)
return false;
return m_socket.open();
}
@@ -83,22 +81,22 @@ bool CIcomNetwork::write(const unsigned char* data, unsigned int len)
if (m_debug)
CUtils::dump(1U, "Icom Network Data Sent", buffer, 102U);
return m_socket.write(buffer, 102U, m_address, ICOM_PORT);
return m_socket.write(buffer, 102U, m_addr, m_addrLen);
}
unsigned int CIcomNetwork::read(unsigned char* data)
{
unsigned char buffer[BUFFER_LENGTH];
in_addr address;
unsigned int port;
int length = m_socket.read(buffer, BUFFER_LENGTH, address, port);
sockaddr_storage addr;
unsigned int addrLen;
int length = m_socket.read(buffer, BUFFER_LENGTH, addr, addrLen);
if (length <= 0)
return 0U;
// Check if the data is for us
if (m_address.s_addr != address.s_addr || port != ICOM_PORT) {
LogMessage("Icom packet received from an invalid source, %08X != %08X and/or %u != %u", m_address.s_addr, address.s_addr, ICOM_PORT, port);
if (!CUDPSocket::match(m_addr, addr)) {
LogMessage("Icom packet received from an invalid source");
return 0U;
}