dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Merge pull request #135 from juribeparada/master

Browse source 
Fix poll handling
This commit is contained in:
Jonathan Naylor 2019-02-01 08:56:26 +00:00 committed by GitHub
commit 89d9480569
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
YSFGateway/YSFGateway.cpp
View file

@ -292,9 +292,10 @@ int CYSFGateway::run()
}
if (m_ysfNetwork != NULL && m_linkType == LINK_YSF && !m_exclude) {
m_ysfNetwork->write(buffer);
if (::memcmp(buffer + 0U, "YSFD", 4U) == 0)
if (::memcmp(buffer + 0U, "YSFD", 4U) == 0) {
m_ysfNetwork->write(buffer);
m_inactivityTimer.start();
}
}
if (m_fcsNetwork != NULL && m_linkType == LINK_FCS && !m_exclude) {

10
YSFGateway/YSFNetwork.cpp
View file

@ -148,9 +148,13 @@ void CYSFNetwork::writeUnlink(unsigned int count)
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);
if (length <= 0)
return;
@ -158,10 +162,6 @@ void CYSFNetwork::clock(unsigned int ms)
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;