epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify GUID printing

Browse Source
This commit is contained in:
Michael Davidsaver
2021-01-20 09:12:52 -08:00
parent 94f0065a4d
commit bd7ba0db62
8 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client.cpp
+5 -8
View File
@@ -458,10 +458,8 @@ void Context::Pvt::onBeacon(const UDPManager::Beacon& msg)
beaconSenders.emplace(msg.src, BTrack{msg.guid, now});
}
log_debug_printf(io, "%s New server %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x %s\n",
msg.src.tostring().c_str(),
guid[0], guid[1], guid[2], guid[3], guid[4], guid[5], guid[6], guid[7], guid[8], guid[9], guid[10], guid[11],
msg.server.tostring().c_str());
log_debug_printf(io, "%s\n",
std::string(SB()<<msg.src<<" New server "<<guid<<' '<<msg.server).c_str());
poke(false);
}
@@ -527,7 +525,7 @@ bool Context::Pvt::onSearch()
}
if(cmd==CMD_SEARCH_RESPONSE) {
std::array<uint8_t, 12> guid;
ServerGUID guid;
SockAddr serv;
uint16_t port = 0;
uint8_t found = 0u;
@@ -787,9 +785,8 @@ void Context::Pvt::tickBeaconClean()
if(age < -15.0 || age > 2.1*180.0) {
auto& guid = cur->second.guid;
log_debug_printf(io, "Lost server %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x %s\n",
guid[0], guid[1], guid[2], guid[3], guid[4], guid[5], guid[6], guid[7], guid[8], guid[9], guid[10], guid[11],
cur->first.tostring().c_str());
log_debug_printf(io, "%s\n",
std::string(SB()<<" Lost server "<<guid<<' '<<cur->first).c_str());
beaconSenders.erase(cur);
}