Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 03:40:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup debug logs for DS/node ping punch

Browse source
This commit is contained in:
Stephen Birarda 2015-05-28 16:53:13 -07:00
parent 265e0f3da6
commit 29d3ca85d9
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1331,10 +1331,6 @@ void DomainServer::pingPunchForConnectingPeer(const SharedNetworkPeer& peer) {
} else { } else {
auto nodeList = DependencyManager::get<LimitedNodeList>(); auto nodeList = DependencyManager::get<LimitedNodeList>();
// send ping packets to this peer's interfaces
qDebug() << "Sending ping packets to establish connectivity with ICE peer with ID"
<< peer->getUUID();
// send the ping packet to the local and public sockets for this node // send the ping packet to the local and public sockets for this node
QByteArray localPingPacket = nodeList->constructPingPacket(PingType::Local, false); QByteArray localPingPacket = nodeList->constructPingPacket(PingType::Local, false);
nodeList->writeUnverifiedDatagram(localPingPacket, peer->getLocalSocket()); nodeList->writeUnverifiedDatagram(localPingPacket, peer->getLocalSocket());
@ -1377,6 +1373,10 @@ void DomainServer::processICEPeerInformation(const QByteArray& packet) {
// immediately ping the new peer, and start a timer to continue pinging it until we connect to it // immediately ping the new peer, and start a timer to continue pinging it until we connect to it
newPeer->startPingTimer(); newPeer->startPingTimer();
qDebug() << "Sending ping packets to establish connectivity with ICE peer with ID"
<< newPeer->getUUID();
pingPunchForConnectingPeer(newPeer); pingPunchForConnectingPeer(newPeer);
} else { } else {
delete receivedPeer; delete receivedPeer;

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

@ -499,17 +499,18 @@ void NodeList::pingPunchForDomainServer() {
// check if we've hit the number of pings we'll send to the DS before we consider it a fail // check if we've hit the number of pings we'll send to the DS before we consider it a fail
const int NUM_DOMAIN_SERVER_PINGS_BEFORE_RESET = 2000 / UDP_PUNCH_PING_INTERVAL_MS; const int NUM_DOMAIN_SERVER_PINGS_BEFORE_RESET = 2000 / UDP_PUNCH_PING_INTERVAL_MS;
if (_domainHandler.getICEPeer().getConnectionAttempts() > 0 if (_domainHandler.getICEPeer().getConnectionAttempts() == 0) {
&& _domainHandler.getICEPeer().getConnectionAttempts() % NUM_DOMAIN_SERVER_PINGS_BEFORE_RESET == 0) { qCDebug(networking) << "Sending ping packets to establish connectivity with domain-server with ID"
// if we have then nullify the domain handler's network peer and send a fresh ICE heartbeat << uuidStringWithoutCurlyBraces(_domainHandler.getICEDomainID());
} else {
if (_domainHandler.getICEPeer().getConnectionAttempts() % NUM_DOMAIN_SERVER_PINGS_BEFORE_RESET == 0) {
// if we have then nullify the domain handler's network peer and send a fresh ICE heartbeat
_domainHandler.getICEPeer().softReset(); _domainHandler.getICEPeer().softReset();
handleICEConnectionToDomainServer(); handleICEConnectionToDomainServer();
}
} }
qCDebug(networking) << "Sending ping packets to establish connectivity with domain-server with ID"
<< uuidStringWithoutCurlyBraces(_domainHandler.getICEDomainID());
flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SendPingsToDS); flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SendPingsToDS);
// send the ping packet to the local and public sockets for this node // send the ping packet to the local and public sockets for this node