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

Continue implementing client.

Browse Source
This commit is contained in:
Peter Johnson
2015-07-18 01:29:24 -07:00
parent c4a7f6ec9b
commit 9b7e265762
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Dispatcher.cpp
View File

@@ -200,7 +200,7 @@ void Dispatcher::ClientThreadMain(const char* server_name, unsigned int port) {
continue;
}
if (proto_rev == 0x0300) {
if (proto_rev >= 0x0300) {
// should be server hello; if not, disconnect, but keep trying to connect
if (!msg->Is(Message::kServerHello)) continue;
conn.remote_id = msg->str();
@@ -208,6 +208,8 @@ void Dispatcher::ClientThreadMain(const char* server_name, unsigned int port) {
msg = conn.net->incoming().pop();
}
// receive initial assignments
std::vector<std::shared_ptr<Message>> incoming;
while (true) {
if (!msg) {
// disconnected, retry
@@ -216,8 +218,26 @@ void Dispatcher::ClientThreadMain(const char* server_name, unsigned int port) {
continue;
}
if (msg->Is(Message::kServerHelloDone)) break;
if (!msg->Is(Message::kEntryAssign)) {
// unexpected message
DEBUG("received message other than entry assignment during initial handshake");
proto_rev = 0x0300;
continue;
}
incoming.push_back(msg);
// get the next message (blocks)
msg = conn.net->incoming().pop();
}
// generate outgoing assignments
NetworkConnection::Outgoing outgoing;
if (proto_rev >= 0x0300)
outgoing.push_back(Message::ClientHelloDone());
if (!outgoing.empty())
conn.net->outgoing().push(std::move(outgoing));
// add to connections list (the dispatcher thread will handle from here)
AddConnection(std::move(conn));