From cd5ea20cca2b01f7bbe7345f83079c6df1c1d0c2 Mon Sep 17 00:00:00 2001
From: Maki <mxmcube@gmail.com>
Date: Tue, 19 Nov 2019 12:35:06 +0000
Subject: [PATCH 1/2] Added environment variables to change domain server ports

---
 libraries/networking/src/DomainHandler.h | 37 +++++++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index fb18866001..a71be7be21 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -12,6 +12,8 @@
 #ifndef hifi_DomainHandler_h
 #define hifi_DomainHandler_h
 
+#include <QProcessEnvironment>
+
 #include <QtCore/QJsonObject>
 #include <QtCore/QObject>
 #include <QtCore/QTimer>
@@ -30,10 +32,37 @@
 #include "ReceivedMessage.h"
 #include "NetworkingConstants.h"
 
-const unsigned short DEFAULT_DOMAIN_SERVER_PORT = 40102;
-const unsigned short DEFAULT_DOMAIN_SERVER_DTLS_PORT = 40103;
-const quint16 DOMAIN_SERVER_HTTP_PORT = 40100;
-const quint16 DOMAIN_SERVER_HTTPS_PORT = 40101;
+const unsigned short DEFAULT_DOMAIN_SERVER_PORT = 
+    QProcessEnvironment::systemEnvironment()
+    .contains("HIFI_DOMAIN_SERVER_PORT")
+        ? QProcessEnvironment::systemEnvironment()
+            .value("HIFI_DOMAIN_SERVER_PORT")
+            .toShort()
+        : 40102;
+
+const unsigned short DEFAULT_DOMAIN_SERVER_DTLS_PORT = 
+    QProcessEnvironment::systemEnvironment()
+    .contains("HIFI_DOMAIN_SERVER_DTLS_PORT")
+        ? QProcessEnvironment::systemEnvironment()
+            .value("HIFI_DOMAIN_SERVER_DTLS_PORT")
+            .toShort()
+        : 40103;
+
+const quint16 DOMAIN_SERVER_HTTP_PORT = 
+    QProcessEnvironment::systemEnvironment()
+    .contains("HIFI_DOMAIN_SERVER_HTTP_PORT")
+        ? QProcessEnvironment::systemEnvironment()
+            .value("HIFI_DOMAIN_SERVER_HTTP_PORT")
+            .toShort()
+        : 40100;
+
+const quint16 DOMAIN_SERVER_HTTPS_PORT = 
+    QProcessEnvironment::systemEnvironment()
+    .contains("HIFI_DOMAIN_SERVER_HTTPS_PORT")
+        ? QProcessEnvironment::systemEnvironment()
+            .value("HIFI_DOMAIN_SERVER_HTTPS_PORT")
+            .toShort()
+        : 40101;
 
 const int MAX_SILENT_DOMAIN_SERVER_CHECK_INS = 5;
 

From 96a09a894a820a46cef370b3eefd5d7949b45719 Mon Sep 17 00:00:00 2001
From: Maki <mxmcube@gmail.com>
Date: Wed, 20 Nov 2019 09:13:08 +0000
Subject: [PATCH 2/2] Fixed type conversions for environmental domain ports

---
 libraries/networking/src/DomainHandler.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index a71be7be21..505bbb94b5 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -37,7 +37,7 @@ const unsigned short DEFAULT_DOMAIN_SERVER_PORT =
     .contains("HIFI_DOMAIN_SERVER_PORT")
         ? QProcessEnvironment::systemEnvironment()
             .value("HIFI_DOMAIN_SERVER_PORT")
-            .toShort()
+            .toUShort()
         : 40102;
 
 const unsigned short DEFAULT_DOMAIN_SERVER_DTLS_PORT = 
@@ -45,7 +45,7 @@ const unsigned short DEFAULT_DOMAIN_SERVER_DTLS_PORT =
     .contains("HIFI_DOMAIN_SERVER_DTLS_PORT")
         ? QProcessEnvironment::systemEnvironment()
             .value("HIFI_DOMAIN_SERVER_DTLS_PORT")
-            .toShort()
+            .toUShort()
         : 40103;
 
 const quint16 DOMAIN_SERVER_HTTP_PORT = 
@@ -53,7 +53,7 @@ const quint16 DOMAIN_SERVER_HTTP_PORT =
     .contains("HIFI_DOMAIN_SERVER_HTTP_PORT")
         ? QProcessEnvironment::systemEnvironment()
             .value("HIFI_DOMAIN_SERVER_HTTP_PORT")
-            .toShort()
+            .toUInt()
         : 40100;
 
 const quint16 DOMAIN_SERVER_HTTPS_PORT = 
@@ -61,7 +61,7 @@ const quint16 DOMAIN_SERVER_HTTPS_PORT =
     .contains("HIFI_DOMAIN_SERVER_HTTPS_PORT")
         ? QProcessEnvironment::systemEnvironment()
             .value("HIFI_DOMAIN_SERVER_HTTPS_PORT")
-            .toShort()
+            .toUInt()
         : 40101;
 
 const int MAX_SILENT_DOMAIN_SERVER_CHECK_INS = 5;