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

31
DGIdGateway/YSFNetwork.cpp
View file

@ -27,11 +27,11 @@
const unsigned int BUFFER_LENGTH = 200U;
CYSFNetwork::CYSFNetwork(const std::string& localAddress, unsigned int localPort, const std::string& name, const in_addr& address, unsigned int port, const std::string& callsign, bool debug) :
CYSFNetwork::CYSFNetwork(const std::string& localAddress, unsigned int localPort, const std::string& name, const sockaddr_storage& addr, unsigned int addrLen, const std::string& callsign, bool debug) :
m_socket(localAddress, localPort),
m_debug(debug),
m_address(address),
m_port(port),
m_addr(addr),
m_addrLen(addrLen),
m_poll(NULL),
m_unlink(NULL),
m_buffer(1000U, "YSF Network Buffer"),
@ -54,11 +54,11 @@ m_linked(true)
}
}
CYSFNetwork::CYSFNetwork(unsigned int localPort, const std::string& name, const in_addr& address, unsigned int port, const std::string& callsign, bool debug) :
CYSFNetwork::CYSFNetwork(unsigned int localPort, const std::string& name, const sockaddr_storage& addr, unsigned int addrLen, const std::string& callsign, bool debug) :
m_socket(localPort),
m_debug(debug),
m_address(address),
m_port(port),
m_addr(addr),
m_addrLen(addrLen),
m_poll(NULL),
m_unlink(NULL),
m_buffer(1000U, "YSF Network Buffer"),
@ -108,7 +108,7 @@ void CYSFNetwork::write(unsigned int dgid, const unsigned char* data)
if (m_debug)
CUtils::dump(1U, "YSF Network Data Sent", data, 155U);
m_socket.write(data, 155U, m_address, m_port);
m_socket.write(data, 155U, m_addr, m_addrLen);
}
void CYSFNetwork::link()
@ -120,36 +120,35 @@ void CYSFNetwork::writePoll()
{
m_pollTimer.start();
m_socket.write(m_poll, 14U, m_address, m_port);
m_socket.write(m_poll, 14U, m_addr, m_addrLen);
}
void CYSFNetwork::unlink()
{
m_pollTimer.stop();
m_socket.write(m_unlink, 14U, m_address, m_port);
m_socket.write(m_unlink, 14U, m_addr, m_addrLen);
m_linked = false;
}
void CYSFNetwork::clock(unsigned int ms)
{
unsigned char buffer[BUFFER_LENGTH];
in_addr address;
unsigned int port;
m_pollTimer.clock(ms);
if (m_pollTimer.isRunning() && m_pollTimer.hasExpired())
writePoll();
int length = m_socket.read(buffer, BUFFER_LENGTH, address, port);
unsigned char buffer[BUFFER_LENGTH];
sockaddr_storage addr;
unsigned int addrLen;
int length = m_socket.read(buffer, BUFFER_LENGTH, addr, addrLen);
if (length <= 0)
return;
if (m_port == 0U)
if (m_addrLen == 0U)
return;
if (address.s_addr != m_address.s_addr || port != m_port)
if (!CUDPSocket::match(addr, m_addr))
return;
if (::memcmp(buffer, "YSFP", 4U) == 0 && !m_linked) {