Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignores KeepAlive messages during initial handshakes (#128)

Browse Source 
Shouldn't happen normally, but could happen if handshakes take a longer
then normal period of time.
Closes #126
This commit is contained in:
Thad House
2016-10-19 22:47:33 -07:00
committed by Peter Johnson
parent b775b01e0a
commit 780e9580b7
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Dispatcher.cpp
View File

@@ -403,6 +403,11 @@ bool DispatcherBase::ClientHandshake(
DEBUG4("received init str=" << msg->str() << " id=" << msg->id()
<< " seq_num=" << msg->seq_num_uid());
if (msg->Is(Message::kServerHelloDone)) break;
// shouldn't receive a keep alive, but handle gracefully
if (msg->Is(Message::kKeepAlive)) {
msg = get_msg();
continue;
}
if (!msg->Is(Message::kEntryAssign)) {
// unexpected message
DEBUG("client: received message (" << msg->type() << ") other than entry assignment during initial handshake");
@@ -491,6 +496,11 @@ bool DispatcherBase::ServerHandshake(
return false;
}
if (msg->Is(Message::kClientHelloDone)) break;
// shouldn't receive a keep alive, but handle gracefully
if (msg->Is(Message::kKeepAlive)) {
msg = get_msg();
continue;
}
if (!msg->Is(Message::kEntryAssign)) {
// unexpected message
DEBUG("server: received message ("