From cd5ea20cca2b01f7bbe7345f83079c6df1c1d0c2 Mon Sep 17 00:00:00 2001 From: Maki Date: Tue, 19 Nov 2019 12:35:06 +0000 Subject: [PATCH] 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 + #include #include #include @@ -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;