Add an option to configure the interface used by UDPOutput (#359)

Author: VeithMetro

MessageControl/CMakeLists.txt

@@ -33,6 +33,7 @@ set(PLUGIN_MESSAGECONTROL_MAX_EXPORTCONNECTIONS 5 CACHE STRING "Maximum allowed
 set(PLUGIN_MESSAGECONTROL_REMOTE "false" CACHE STRING "Remote binding details enabled")
 set(PLUGIN_MESSAGECONTROL_PORT "0" CACHE STRING "PORT address")
 set(PLUGIN_MESSAGECONTROL_BINDING "0.0.0.0" CACHE STRING "Binding IP Address")
+set(PLUGIN_MESSAGECONTROL_INTERFACE "eth0" CACHE STRING "Interface to bind to")
 
 add_subdirectory(BuffersFlush)
 

MessageControl/MessageControl.conf.in

@@ -20,4 +20,5 @@ if boolean("@PLUGIN_MESSAGECONTROL_REMOTE@"):
   remote = JSON()
   remote.add("port", "@PLUGIN_MESSAGECONTROL_PORT@")
   remote.add("binding", "@PLUGIN_MESSAGECONTROL_BINDING@")
+  remote.add("interface", "@PLUGIN_MESSAGECONTROL_INTERFACE@")
   configuration.add("remote", remote)

MessageControl/MessageControl.cpp

@@ -43,18 +43,22 @@ namespace Thunder {
         : Core::JSON::Container()
         , Port(2200)
         , Binding("0.0.0.0")
+        , Interface("eth0")
     {
         Add(_T("port"), &Port);
         Add(_T("binding"), &Binding);
+        Add(_T("interface"), &Interface);
     }
 
     MessageControl::Config::NetworkNode::NetworkNode(const NetworkNode& copy)
         : Core::JSON::Container()
         , Port(copy.Port)
         , Binding(copy.Binding)
+        , Interface(copy.Interface)
     {
         Add(_T("port"), &Port);
         Add(_T("binding"), &Binding);
+        Add(_T("interface"), &Interface);
     }
 
     MessageControl::MessageControl()
@@ -115,8 +119,8 @@ namespace Thunder {
             _config.FileName = service->VolatilePath() + _config.FileName.Value();
             Announce(new Publishers::FileOutput(abbreviate, _config.FileName.Value()));
         }
-        if ((_config.Remote.IsSet() == true) && (_config.Remote.Binding.Value().empty() == false) && (_config.Remote.Port.Value() != 0)) {
-            Announce(new Publishers::UDPOutput(abbreviate, Core::NodeId(_config.Remote.NodeId()), _service));
+        if ((_config.Remote.IsSet() == true) && (_config.Remote.Binding.Value().empty() == false) && (_config.Remote.Port.Value() != 0)  && (_config.Remote.Interface.Value().empty() == false)) {
+            Announce(new Publishers::UDPOutput(abbreviate, Core::NodeId(_config.Remote.NodeId()), _service, _config.Remote.Interface.Value()));
         }
 
         _webSocketExporter.Initialize(service, _config.MaxExportConnections.Value());

MessageControl/MessageControl.h

@@ -90,6 +90,7 @@ namespace Plugin {
             public:
                 Core::JSON::DecUInt16 Port;
                 Core::JSON::String Binding;
+                Core::JSON::String Interface;
             };
 
         public:

MessageControl/MessageControlPlugin.json

@@ -42,9 +42,13 @@
             "bindig" : {
               "type": "string",
               "description": "Binding address"
+            },
+            "interface" : {
+              "type": "string",
+              "description": "Interface"
             }
           },
-          "required": [ "port", "binding" ]
+          "required": [ "port", "binding", "interface" ]
         }
       },
       "required": [

MessageControl/MessageOutput.cpp

@@ -180,11 +180,12 @@ namespace Publishers {
         Trigger();
     }
 
-    UDPOutput::UDPOutput(const Core::Messaging::MessageInfo::abbreviate abbreviate, const Core::NodeId& nodeId, PluginHost::IShell* service)
+    UDPOutput::UDPOutput(const Core::Messaging::MessageInfo::abbreviate abbreviate, const Core::NodeId& nodeId, PluginHost::IShell* service, const string& interface)
         : _convertor(abbreviate)
         , _output(nodeId)
         , _notification(*this)
         , _subSystem(service->SubSystems())
+        , _interface(interface)
     {
         ASSERT(_subSystem != nullptr);
 
@@ -198,7 +199,12 @@ namespace Publishers {
     {
         if (_subSystem->IsActive(PluginHost::ISubSystem::NETWORK)) {
             if (_output.IsOpen() == false) {
-                _output.Open(0);
+                if (_interface.empty() == false) {
+                    _output.Open(0, _interface);
+                }
+                else {
+                    _output.Open(0);
+                }
             }
             ASSERT(_output.IsOpen() == true);
         }

MessageControl/MessageOutput.h

@@ -401,7 +401,7 @@ namespace Publishers {
         UDPOutput(const UDPOutput&) = delete;
         UDPOutput& operator=(const UDPOutput&) = delete;
 
-        explicit UDPOutput(const Core::Messaging::MessageInfo::abbreviate abbreviate, const Core::NodeId& nodeId, PluginHost::IShell* service);
+        explicit UDPOutput(const Core::Messaging::MessageInfo::abbreviate abbreviate, const Core::NodeId& nodeId, PluginHost::IShell* service, const string& interface);
 
         ~UDPOutput() override
         {
@@ -420,6 +420,7 @@ namespace Publishers {
         Channel _output;
         Core::SinkType<Notification> _notification;
         PluginHost::ISubSystem* _subSystem;
+        string _interface;
     };
 
     class WebSocketOutput : public IPublish {