From 14cd04435905630b41d51d66b02d9b000ec9bfcf Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 6 Oct 2014 14:41:16 -0700 Subject: [PATCH] handle custom local UDP port for domain-server from webpage --- domain-server/resources/describe-settings.json | 8 ++++++++ domain-server/resources/web/js/settings.js | 5 +++++ domain-server/src/DomainServerSettingsManager.cpp | 3 +++ 3 files changed, 16 insertions(+) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 2fbe33a4e1..cadbc4d2c8 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -33,6 +33,14 @@ "label": "None: use the network information I have entered for this domain at data.highfidelity.io" } ] + }, + { + "name": "port", + "label": "Local UDP Port", + "help": "This is the local port your domain-server binds to for UDP connections.
Depending on your router, this may need to be changed to run multiple full automatic networking domain-servers in the same network.", + "default": "40102", + "type": "int", + "advanced": true } ] }, diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js index 48b3b15e8f..5c3dfdd6dd 100644 --- a/domain-server/resources/web/js/settings.js +++ b/domain-server/resources/web/js/settings.js @@ -46,6 +46,11 @@ var viewHelpers = { form_group += "" } else { + + if (input_type == 'integer') { + input_type = "text" + } + form_group += "" diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 28b1151f2d..7c92f1cc51 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -254,11 +254,14 @@ void DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ QString settingType = groupObject[SETTING_DESCRIPTION_TYPE_KEY].toString(); const QString INPUT_DOUBLE_TYPE = "double"; + const QString INPUT_INTEGER_TYPE = "int"; // make sure the resulting json value has the right type if (settingType == INPUT_DOUBLE_TYPE) { settingsVariant[key] = rootValue.toString().toDouble(); + } else if (settingType == INPUT_INTEGER_TYPE) { + settingsVariant[key] = rootValue.toString().toInt(); } else { settingsVariant[key] = rootValue.toString(); }