oe7drt/YSFClients
1
0
Fork 0
mirror of https://github.com/oe7drt/YSFClients.git synced 2026-04-07 23:34:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move DG-ID Gateway to Ipv6

Browse source
This commit is contained in:
Jonathan Naylor 2020-09-03 17:10:25 +01:00
parent 3c84e47ea8
commit 4d986cbbd9
15 changed files with 254 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

21
DGIdGateway/IMRSNetwork.cpp
View file

@ -26,8 +26,6 @@
#include <cassert>
#include <cstring>
const unsigned int IMRS_PORT = 21110U;
CIMRSNetwork::CIMRSNetwork() :
m_socket(IMRS_PORT),
@ -134,7 +132,7 @@ void CIMRSNetwork::write(unsigned int dgId, const unsigned char* data)
if (ptr->m_debug)
CUtils::dump(1U, "IMRS Network Data Sent", buffer, 165U);
m_socket.write(buffer, 165U, (*it)->m_address, IMRS_PORT);
m_socket.write(buffer, 165U, (*it)->m_addr, (*it)->m_addrLen);
}
}
@ -150,20 +148,19 @@ void CIMRSNetwork::clock(unsigned int ms)
{
unsigned char buffer[500U];
in_addr address;
unsigned int port;
int length = m_socket.read(buffer, 500U, address, port);
sockaddr_storage addr;
unsigned int addrLen;
int length = m_socket.read(buffer, 500U, addr, addrLen);
if (length <= 0)
return;
LogDebug("IMRS Network Data Reecived from port %u", port);
CUtils::dump(1U, "IMRS Network Data Received", buffer, length);
return;
if (port != IMRS_PORT)
return;
// if (port != IMRS_PORT)
// return;
IMRSDGId* ptr = find(address);
IMRSDGId* ptr = find(addr);
if (ptr == NULL)
return;
@ -201,11 +198,11 @@ void CIMRSNetwork::close()
m_socket.close();
}
IMRSDGId* CIMRSNetwork::find(in_addr address) const
IMRSDGId* CIMRSNetwork::find(const sockaddr_storage& addr) const
{
for (std::vector<IMRSDGId*>::const_iterator it1 = m_dgIds.begin(); it1 != m_dgIds.end(); ++it1) {
for (std::vector<IMRSDest*>::const_iterator it2 = (*it1)->m_destinations.begin(); it2 != (*it1)->m_destinations.end(); ++it2) {
if (address.s_addr == (*it2)->m_address.s_addr)
if (CUDPSocket::match(addr, (*it2)->m_addr))
return *it1;
}
}