ShaYmez/xlxd
1
0
Fork 0
mirror of https://github.com/ShaYmez/xlxd.git synced 2026-07-25 11:34:11 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Merge pull request #120 from nonoo/master"

Browse Source 
This reverts commit 2c902aad20, reversing
changes made to b3360b66e2.
This commit is contained in:
LX3JL
2019-03-16 15:57:24 +01:00
parent 3e8d910cb0
commit 640f7c5c9c
9 changed files with 47 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cdextraprotocol.cpp
+3 -8
View File
@@ -69,7 +69,7 @@ void CDextraProtocol::Task(void)
int ProtRev;
CDvHeaderPacket *Header;
CDvFramePacket *Frame;
CDvLastFramePacket *LastFrame = NULL;
CDvLastFramePacket *LastFrame;
// any incoming packet ?
if ( m_Socket.Receive(&Buffer, &Ip, 20) != -1 )
@@ -101,9 +101,9 @@ void CDextraProtocol::Task(void)
else if ( (LastFrame = IsValidDvLastFramePacket(Buffer)) != NULL )
{
//std::cout << "DExtra DV last frame" << std::endl;
// handle it
OnDvFramePacketIn(LastFrame, &Ip);
OnDvLastFramePacketIn(LastFrame, &Ip);
}
else if ( IsValidConnectPacket(Buffer, &Callsign, &ToLinkModule, &ProtRev) )
{
@@ -193,11 +193,6 @@ void CDextraProtocol::Task(void)
// handle queue from reflector
HandleQueue();
if ( LastFrame != NULL )
{
CloseStreamForDvLastFramePacket(LastFrame, &Ip);
}
// keep client alive
if ( m_LastKeepaliveTime.DurationSinceNow() > DEXTRA_KEEPALIVE_PERIOD )
{