Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

log username with "haven't heard from" messages

Browse source 
remove rebind on silent domain checkin
This commit is contained in:
Roxanne Skelly 2019-06-14 10:45:18 -07:00
parent 3d2b1dbf2b
commit 5b6911efa4
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
domain-server/src/DomainServer.cpp
View file

@ -1735,7 +1735,12 @@ void DomainServer::nodePingMonitor() {
nodeList->eachNode([now](const SharedNodePointer& node) {
quint64 lastHeard = now - node->getLastHeardMicrostamp();
if (lastHeard > 2 * USECS_PER_SECOND) {
qCDebug(domain_server) << "Haven't heard from " << node->getPublicSocket() << " in " << lastHeard / USECS_PER_MSEC << " msec";
QString username;
DomainServerNodeData* nodeData = static_cast<DomainServerNodeData*>(node->getLinkedData());
if(nodeData) {
username = nodeData->getUsername();
}
qCDebug(domain_server) << "Haven't heard from " << node->getPublicSocket() << username << " in " << lastHeard / USECS_PER_MSEC << " msec";
}
});
}

5
libraries/networking/src/NodeList.cpp
View file

@ -450,13 +450,8 @@ void NodeList::sendDomainServerCheckIn() {
// Send duplicate check-ins in the exponentially increasing sequence 1, 1, 2, 4, ...
static const int MAX_CHECKINS_TOGETHER = 20;
static const int REBIND_CHECKIN_COUNT = 2;
int outstandingCheckins = _domainHandler.getCheckInPacketsSinceLastReply();
if (outstandingCheckins > REBIND_CHECKIN_COUNT) {
_nodeSocket.rebind();
}
int checkinCount = outstandingCheckins > 1 ? std::pow(2, outstandingCheckins - 2) : 1;
checkinCount = std::min(checkinCount, MAX_CHECKINS_TOGETHER);
for (int i = 1; i < checkinCount; ++i) {

4
libraries/networking/src/udt/Socket.cpp
View file

@ -76,10 +76,6 @@ void Socket::rebind() {
void Socket::rebind(quint16 localPort) {
_udpSocket.close();
#ifdef WIN32
WSAData ws;
WSAStartup(MAKEWORD(2, 2), &ws);
#endif
bind(QHostAddress::AnyIPv4, localPort);
}