From 9085a0896a308f0e197b4a1fd8f05881ade83061 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 13 Jun 2017 15:46:14 -0700 Subject: [PATCH] manually activate sockets for downstream servers --- assignment-client/src/audio/AudioMixerClientData.cpp | 2 +- assignment-client/src/avatars/AvatarMixer.cpp | 4 ++-- libraries/networking/src/ThreadedAssignment.cpp | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 848dc969d8..e976e4176d 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -169,7 +169,7 @@ void AudioMixerClientData::optionallyReplicatePacket(ReceivedMessage& message, c packet->write(message.getMessage()); } - nodeList->sendUnreliablePacket(*packet, downstreamNode->getPublicSocket()); + nodeList->sendUnreliablePacket(*packet, *downstreamNode); } }); } diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 5aaf633ed9..57c48ee6d4 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -146,7 +146,7 @@ void AvatarMixer::optionallyReplicatePacket(ReceivedMessage& message, const Node packet->write(message.getMessage()); } - nodeList->sendUnreliablePacket(*packet, node->getPublicSocket()); + nodeList->sendUnreliablePacket(*packet, *node); }); } } @@ -402,7 +402,7 @@ void AvatarMixer::nodeKilled(SharedNodePointer killedNode) { replicatedKillPacket->writePrimitive(KillAvatarReason::AvatarDisconnected); } - nodeList->sendUnreliablePacket(*replicatedKillPacket, node->getPublicSocket()); + nodeList->sendUnreliablePacket(*replicatedKillPacket, *node); } }); diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp index 24573e0ffc..3e679f643a 100644 --- a/libraries/networking/src/ThreadedAssignment.cpp +++ b/libraries/networking/src/ThreadedAssignment.cpp @@ -163,6 +163,10 @@ void ThreadedAssignment::parseDownstreamServers(const QJsonObject& settingsObjec // manually add the downstream node to our node list auto node = nodeList->addOrUpdateNode(QUuid::createUuid(), NodeType::downstreamType(nodeType), downstreamServerAddr, downstreamServerAddr); + + // manually activate the public socket for the downstream node + node->activatePublicSocket(); + callback(*node); } }