UDP button receiver port to Config

diff --git a/config.cc b/config.cc
index fe8a32f0ada8ef5bc0942f946487c59a403abd74..0b46e14e78f9060dbd24a207c075c5547e43f261 100644 (file)
--- a/config.cc
+++ b/config.cc
@@ -49,6 +49,8 @@ void Config::applyDefaults()
   insertBool("input", "mod_udp_enabled", true);
   insertBool("input", "mod_lirc_enabled", false);
 
+  insertInt("input_udp", "port", 2000);
+
   insertInt("server-discovery", "prefer-ipv", 6);
 
   // Not in config.json.sample - VDR login always sets this

diff --git a/config.json.sample b/config.json.sample
index 3b97e7ffc4bb49135aa8ba9431b523f911c18d09..235127bd868897596d00d40695acf74810b79127 100644 (file)
--- a/config.json.sample
+++ b/config.json.sample
@@ -48,6 +48,11 @@
     "mod_lirc_enabled": true
   },
 
+  "input_udp":
+  {
+    "port": 2000
+  }
+
   "input_lirc":
   {
     // input_lirc has no defaults

diff --git a/inputudp.cc b/inputudp.cc
index 35ea47db36b6a97c8bac019e1b64ec1eb2b05f04..b8765122c749d67d8ced9cb2e0298f2b0cc6a30c 100644 (file)
--- a/inputudp.cc
+++ b/inputudp.cc
@@ -23,6 +23,7 @@
 #endif
 
 #include "log.h"
+#include "config.h"
 
 #include "inputudp.h"
 
@@ -35,9 +36,12 @@ bool InputUDP::init()
   if (initted) return false;
   initted = true;
   log = LogNT::getInstance();
-  log->debug(TAG, "Starting InputUDP command server");
+  int port = 2000;
+  Config::getInstance()->getInt("input_udp", "port", port);
 
-  if (!udp4.init(2000))
+  log->debug(TAG, "Starting InputUDP command server on port {}", port);
+
+  if (!udp4.init(static_cast<USHORT>(port)))
   {
     log->debug(TAG, "UDP4 init error");
     initted = false;