Upgrade the UDP Forwarder plugin

wifisensing · Mar 16, 2022 · 6492b8a · 6492b8a
1 parent 655a7c0
commit 6492b8a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,7 +28,7 @@ find_package(fmt REQUIRED)
 # make plug-ins
 add_subdirectory(plugin-demo)
 add_subdirectory(plugin-echoprobe)
-#add_subdirectory(plugin-forwarder)
+add_subdirectory(plugin-forwarder)
 
 # include CPack settings
 include(CPack-Settings.txt)
diff --git a/plugin-forwarder/CMakeLists.txt b/plugin-forwarder/CMakeLists.txt
@@ -1,3 +1,3 @@
-ADD_LIBRARY(PDK-Forwarder SHARED UDPBasedPacketForwarder.cpp)
-TARGET_LINK_LIBRARIES(PDK-Forwarder Utilities ${Boost_LIBRARIES})
-install(TARGETS PDK-Forwarder DESTINATION ${INSTALL_PLUGIN_DIR})
+ADD_LIBRARY(PDK-UDPForwarder SHARED UDPBasedPacketForwarder.cpp)
+TARGET_LINK_LIBRARIES(PDK-UDPForwarder Utilities ${Boost_LIBRARIES})
+install(TARGETS PDK-UDPForwarder DESTINATION ${INSTALL_PLUGIN_DIR})
diff --git a/plugin-forwarder/UDPBasedPacketForwarder.cpp b/plugin-forwarder/UDPBasedPacketForwarder.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "UDPBasedPacketForwarder.h"
+#include "boost/algorithm/string.hpp"
 
 std::string UDPBasedPacketForwarder::getPluginName() {
     return "Forwarder";
@@ -17,8 +18,7 @@ std::shared_ptr<boost::program_options::options_description> UDPBasedPacketForwa
     static std::once_flag onceFlag;
     std::call_once(onceFlag, [&] {
         options->add_options()
-                ("forward-to-ip", po::value<std::string>(), "Destination IP for PlugIn UDPBasedPacketForwarder")
-                ("forward-to-port", po::value<uint16_t>(), "Destination Port for PlugIn UDPBasedPacketForwarder");
+                ("forward-to", po::value<std::string>(), "Destination address and port, e.g., 192.168.10.1:50000");
     });
     return options;
 }
@@ -33,12 +33,16 @@ void UDPBasedPacketForwarder::parseAndExecuteCommands(const std::string &command
     po::store(po::command_line_parser(po::split_unix(commandString)).options(*pluginOptionsDescription().get()).allow_unregistered().run(), vm);
     po::notify(vm);
 
-    if (vm.count("forward-to-ip")) {
-        destinationIP = vm["forward-to-ip"].as<std::string>();
-    }
+    if (vm.count("forward-to")) {
+        auto input = destinationIP = vm["forward-to"].as<std::string>();
+        std::vector<std::string> segments;
+        boost::split(segments, input, boost::is_any_of(":"), boost::token_compress_on);
+        boost::trim(segments[0]);
+        boost::trim(segments[1]);
+        destinationIP = segments[0];
+        destinationPort = boost::lexical_cast<uint16_t>(segments[1]);
 
-    if (vm.count("forward-to-port")) {
-        destinationPort = vm["forward-to-port"].as<uint16_t>();
+        LoggingService_info_print("UDP Forwarder destination: {}/{}\n", destinationIP, destinationPort);
     }
 }
 

diff --git a/plugin-forwarder/UDPBasedPacketForwarder.h b/plugin-forwarder/UDPBasedPacketForwarder.h
@@ -6,7 +6,7 @@
 #define PICOSCENES_RXSBROADCASTPLUGIN_H
 
 #include <PicoScenes/AbstractPicoScenesPlugin.hxx>
-#include <PicoScenes/UDPService.h>
+#include <PicoScenes/UDPService.hxx>
 
 
 class UDPBasedPacketForwarder : public AbstractPicoScenesPlugin {
@@ -23,11 +23,15 @@ class UDPBasedPacketForwarder : public AbstractPicoScenesPlugin {
 
     void rxHandle(const ModularPicoScenesRxFrame &rxframe) override;
 
+    static boost::shared_ptr<UDPBasedPacketForwarder> create() {
+        return boost::make_shared<UDPBasedPacketForwarder>();
+    }
+
 private:
     std::string destinationIP = "127.0.0.1";
     uint16_t destinationPort = 50000;
 };
 
-PICOSCENES_PLUGIN_INIT(UDPBasedPacketForwarder)
+BOOST_DLL_ALIAS(UDPBasedPacketForwarder::create, initPicoScenesPlugin)
 
 #endif //PICOSCENES_RXSBROADCASTPLUGIN_H