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

Lots of small changes.

Browse source
This commit is contained in:
Jonathan Naylor 2018-02-22 19:11:21 +00:00
parent 4edd2ebdd1
commit 9719b1d269
9 changed files with 163 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

58
YSFGateway/YSFNetwork.cpp
View file

@ -34,7 +34,8 @@ m_address(),
m_port(0U),
m_poll(NULL),
m_unlink(NULL),
m_buffer(1000U, "YSF Network Buffer")
m_buffer(1000U, "YSF Network Buffer"),
m_pollTimer(1000U, 5U)
{
m_poll = new unsigned char[14U];
::memcpy(m_poll + 0U, "YSFP", 4U);
@ -58,7 +59,8 @@ m_address(),
m_port(0U),
m_poll(NULL),
m_unlink(NULL),
m_buffer(1000U, "YSF Network Buffer")
m_buffer(1000U, "YSF Network Buffer"),
m_pollTimer(1000U, 5U)
{
m_poll = new unsigned char[14U];
::memcpy(m_poll + 0U, "YSFP", 4U);
@ -97,42 +99,47 @@ void CYSFNetwork::clearDestination()
{
m_address.s_addr = INADDR_NONE;
m_port = 0U;
m_pollTimer.stop();
}
bool CYSFNetwork::write(const unsigned char* data)
void CYSFNetwork::write(const unsigned char* data)
{
assert(data != NULL);
if (m_port == 0U)
return true;
return;
if (m_debug)
CUtils::dump(1U, "YSF Network Data Sent", data, 155U);
return m_socket.write(data, 155U, m_address, m_port);
m_socket.write(data, 155U, m_address, m_port);
}
bool CYSFNetwork::writePoll()
{
if (m_port == 0U)
return true;
return m_socket.write(m_poll, 14U, m_address, m_port);
}
bool CYSFNetwork::writeUnlink()
{
if (m_port == 0U)
return true;
return m_socket.write(m_unlink, 14U, m_address, m_port);
}
void CYSFNetwork::clock(unsigned int ms)
void CYSFNetwork::writePoll(unsigned int count)
{
if (m_port == 0U)
return;
m_pollTimer.start();
for (unsigned int i = 0U; i < count; i++)
m_socket.write(m_poll, 14U, m_address, m_port);
}
void CYSFNetwork::writeUnlink(unsigned int count)
{
m_pollTimer.stop();
if (m_port == 0U)
return;
for (unsigned int i = 0U; i < count; i++)
m_socket.write(m_unlink, 14U, m_address, m_port);
}
void CYSFNetwork::clock(unsigned int ms)
{
unsigned char buffer[BUFFER_LENGTH];
in_addr address;
@ -141,6 +148,13 @@ void CYSFNetwork::clock(unsigned int ms)
if (length <= 0)
return;
if (m_port == 0U)
return;
m_pollTimer.clock(ms);
if (m_pollTimer.isRunning() && m_pollTimer.hasExpired())
writePoll();
if (address.s_addr != m_address.s_addr || port != m_port)
return;