Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:01:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

re-set the ice heartbeat packet if keypair changes

Browse source
This commit is contained in:
Stephen Birarda 2016-02-23 15:42:28 -08:00
parent 96ed19100b
commit 3a800350c9
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -498,6 +498,9 @@ void DomainServer::setupICEHeartbeatForFullNetworking() {
accountManager.generateNewDomainKeypair(limitedNodeList->getSessionUUID()); accountManager.generateNewDomainKeypair(limitedNodeList->getSessionUUID());
} }
// hookup to the signal from account manager that tells us when keypair is available
connect(&accountManager, &AccountManager::newKeypair, this, &DomainServer::handleKeypairChange);
if (!_iceHeartbeatTimer) { if (!_iceHeartbeatTimer) {
// setup a timer to heartbeat with the ice-server every so often // setup a timer to heartbeat with the ice-server every so often
_iceHeartbeatTimer = new QTimer { this }; _iceHeartbeatTimer = new QTimer { this };
@ -1064,9 +1067,6 @@ void DomainServer::sendHeartbeatToIceServer() {
qWarning() << "Cannot send an ice-server heartbeat without a private key for signature."; qWarning() << "Cannot send an ice-server heartbeat without a private key for signature.";
qWarning() << "Waiting for keypair generation to complete before sending ICE heartbeat."; qWarning() << "Waiting for keypair generation to complete before sending ICE heartbeat.";
// hookup this slot to the signal from account manager that tells us when keypair is available
connect(&accountManager, &AccountManager::newKeypair, this, &DomainServer::sendHeartbeatToIceServer);
if (!limitedNodeList->getSessionUUID().isNull()) { if (!limitedNodeList->getSessionUUID().isNull()) {
accountManager.generateNewDomainKeypair(limitedNodeList->getSessionUUID()); accountManager.generateNewDomainKeypair(limitedNodeList->getSessionUUID());
} else { } else {
@ -1078,15 +1078,17 @@ void DomainServer::sendHeartbeatToIceServer() {
// NOTE: I'd love to specify the correct size for the packet here, but it's a little trickey with // NOTE: I'd love to specify the correct size for the packet here, but it's a little trickey with
// QDataStream and the possibility of IPv6 address for the sockets. // QDataStream and the possibility of IPv6 address for the sockets.
static auto heartbeatPacket = NLPacket::create(PacketType::ICEServerHeartbeat); if (!_iceServerHeartbeatPacket) {
_iceServerHeartbeatPacket = NLPacket::create(PacketType::ICEServerHeartbeat);
}
bool shouldRecreatePacket = false; bool shouldRecreatePacket = false;
if (heartbeatPacket->getPayloadSize() > 0) { if (_iceServerHeartbeatPacket->getPayloadSize() > 0) {
// if either of our sockets have changed we need to re-sign the heartbeat // if either of our sockets have changed we need to re-sign the heartbeat
// first read the sockets out from the current packet // first read the sockets out from the current packet
heartbeatPacket->seek(0); _iceServerHeartbeatPacket->seek(0);
QDataStream heartbeatStream(heartbeatPacket.get()); QDataStream heartbeatStream(_iceServerHeartbeatPacket.get());
QUuid senderUUID; QUuid senderUUID;
HifiSockAddr publicSocket, localSocket; HifiSockAddr publicSocket, localSocket;
@ -1105,15 +1107,15 @@ void DomainServer::sendHeartbeatToIceServer() {
// either we don't have a heartbeat packet yet or sockets have changed and we need to make a new one // either we don't have a heartbeat packet yet or sockets have changed and we need to make a new one
// reset the position in the packet before writing // reset the position in the packet before writing
heartbeatPacket->reset(); _iceServerHeartbeatPacket->reset();
// write our plaintext data to the packet // write our plaintext data to the packet
QDataStream heartbeatDataStream(heartbeatPacket.get()); QDataStream heartbeatDataStream(_iceServerHeartbeatPacket.get());
heartbeatDataStream << limitedNodeList->getSessionUUID() heartbeatDataStream << limitedNodeList->getSessionUUID()
<< limitedNodeList->getPublicSockAddr() << limitedNodeList->getLocalSockAddr(); << limitedNodeList->getPublicSockAddr() << limitedNodeList->getLocalSockAddr();
// setup a QByteArray that points to the plaintext data // setup a QByteArray that points to the plaintext data
auto plaintext = QByteArray::fromRawData(heartbeatPacket->getPayload(), heartbeatPacket->getPayloadSize()); auto plaintext = QByteArray::fromRawData(_iceServerHeartbeatPacket->getPayload(), _iceServerHeartbeatPacket->getPayloadSize());
// generate a signature for the plaintext data in the packet // generate a signature for the plaintext data in the packet
auto signature = accountManager.getAccountInfo().signPlaintext(plaintext); auto signature = accountManager.getAccountInfo().signPlaintext(plaintext);
@ -1123,7 +1125,7 @@ void DomainServer::sendHeartbeatToIceServer() {
} }
// send the heartbeat packet to the ice server now // send the heartbeat packet to the ice server now
limitedNodeList->sendUnreliablePacket(*heartbeatPacket, _iceServerSocket); limitedNodeList->sendUnreliablePacket(*_iceServerHeartbeatPacket, _iceServerSocket);
} }
} }
@ -2024,3 +2026,14 @@ void DomainServer::processICEServerHeartbeatDenialPacket(QSharedPointer<Received
numHeartbeatDenials = 0; numHeartbeatDenials = 0;
} }
} }
void DomainServer::handleKeypairChange() {
if (_iceServerHeartbeatPacket) {
// reset the payload size of the ice-server heartbeat packet - this causes the packet to be re-generated
// the next time we go to send an ice-server heartbeat
_iceServerHeartbeatPacket->setPayloadSize(0);
// send a heartbeat to the ice server immediately
sendHeartbeatToIceServer();
}
}

3
domain-server/src/DomainServer.h
View file

@ -80,6 +80,8 @@ private slots:
void queuedQuit(QString quitMessage, int exitCode); void queuedQuit(QString quitMessage, int exitCode);
void handleKeypairChange();
private: private:
void setupNodeListAndAssignments(const QUuid& sessionUUID = QUuid::createUuid()); void setupNodeListAndAssignments(const QUuid& sessionUUID = QUuid::createUuid());
bool optionallySetupOAuth(); bool optionallySetupOAuth();
@ -152,6 +154,7 @@ private:
DomainServerSettingsManager _settingsManager; DomainServerSettingsManager _settingsManager;
HifiSockAddr _iceServerSocket; HifiSockAddr _iceServerSocket;
std::unique_ptr<NLPacket> _iceServerHeartbeatPacket;
QTimer* _iceHeartbeatTimer { nullptr }; // this looks like it dangles when created but it's parented to the DomainServer QTimer* _iceHeartbeatTimer { nullptr }; // this looks like it dangles when created but it's parented to the DomainServer