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

Fully asigns the ConnectionInfo struct (#113)

Browse Source 
For some reason, it was putting garbage in for the things that shouldn't
have been, which doesn't make much sense.
This commit is contained in:
Thad House
2016-09-16 21:56:57 -07:00
committed by Peter Johnson
parent 7e9754acff
commit 9a3100b221
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Storage.cpp
View File

@@ -348,7 +348,15 @@ void Storage::ProcessIncoming(std::shared_ptr<Message> msg,
}
ConnectionInfo conn_info;
auto c = conn_weak.lock();
if (c) conn_info = c->info();
if (c) {
conn_info = c->info();
} else {
conn_info.remote_id = "Unknown";
conn_info.remote_ip = "Unknown";
conn_info.remote_port = 0;
conn_info.last_update = 0;
conn_info.protocol_version = 0;
}
m_rpc_server.ProcessRpc(entry->name, msg, entry->rpc_callback,
conn->uid(), conn_info,
[=](std::shared_ptr<Message> msg) {
@@ -1399,6 +1407,9 @@ unsigned int Storage::CallRpc(StringRef name, StringRef params) {
ConnectionInfo conn_info;
conn_info.remote_id = "Server";
conn_info.remote_ip = "localhost";
conn_info.remote_port = 0;
conn_info.last_update = 0;
conn_info.protocol_version = 0x3000;
m_rpc_server.ProcessRpc(
name, msg, rpc_callback, 0xffffU, conn_info,
[this](std::shared_ptr<Message> msg) {