From 7af69b54501f5989de5bab6d606d69021a9bdf56 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Tue, 4 Sep 2018 13:53:25 -0700
Subject: [PATCH] Check that a requested listened port is used in NodeList
---
libraries/networking/src/LimitedNodeList.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index b6b2369703..db6ed15792 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -56,13 +56,20 @@ LimitedNodeList::LimitedNodeList(int socketListenPort, int dtlsListenPort) :
qRegisterMetaType<ConnectionStep>("ConnectionStep");
auto port = (socketListenPort != INVALID_PORT) ? socketListenPort : LIMITED_NODELIST_LOCAL_PORT.get();
_nodeSocket.bind(QHostAddress::AnyIPv4, port);
- qCDebug(networking) << "NodeList socket is listening on" << _nodeSocket.localPort();
+ quint16 assignedPort = _nodeSocket.localPort();
+ if (socketListenPort != INVALID_PORT && socketListenPort != 0 && socketListenPort != assignedPort) {
+ qCCritical(networking) << "NodeList is unable to assign requested port of" << socketListenPort;
+ }
+ qCDebug(networking) << "NodeList socket is listening on" << assignedPort;
if (dtlsListenPort != INVALID_PORT) {
// only create the DTLS socket during constructor if a custom port is passed
_dtlsSocket = new QUdpSocket(this);
_dtlsSocket->bind(QHostAddress::AnyIPv4, dtlsListenPort);
+ if (dtlsListenPort != 0 && _dtlsSocket->localPort() != dtlsListenPort) {
+ qCDebug(networking) << "NodeList is unable to assign requested DTLS port of" << dtlsListenPort;
+ }
qCDebug(networking) << "NodeList DTLS socket is listening on" << _dtlsSocket->localPort();
}