* [UDPForward] Fix bug

wifisensing · Mar 17, 2022 · e08cd7e · e08cd7e
1 parent 049fd2a
commit e08cd7e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 # Changelog of PicoScenes Plugin Development Kit (PDK)
 
+## Mar. 17, 2022
+    * [UDPForward] Fix bug
+
 ## Mar. 16, 2022
     * [UDPForward] Bring back this plugin, simplified to only --forward-to option, like "--forward-to 127.0.0.1:50000"
 

diff --git a/plugin-forwarder/UDPForwarderPlugin.cxx b/plugin-forwarder/UDPForwarderPlugin.cxx
@@ -29,7 +29,7 @@ std::shared_ptr<boost::program_options::options_description> UDPForwarderPlugin:
 }
 
 std::string UDPForwarderPlugin::pluginStatus() {
-    return "Destination IP/Port: " + destinationIP + ":" + std::to_string(destinationPort);
+    return "Destination IP/Port: " + destinationIP.value_or("null") + ":" + std::to_string(destinationPort.value_or(0u));
 }
 
 void UDPForwarderPlugin::parseAndExecuteCommands(const std::string &commandString) {
@@ -38,19 +38,21 @@ void UDPForwarderPlugin::parseAndExecuteCommands(const std::string &commandStrin
     po::notify(vm);
 
     if (vm.count("forward-to")) {
-        auto input = destinationIP = vm["forward-to"].as<std::string>();
+        auto input = 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]);
 
-        LoggingService_info_print("UDP Forwarder destination: {}/{}\n", destinationIP, destinationPort);
+        LoggingService_info_print("UDP Forwarder destination: {}/{}\n", *destinationIP, *destinationPort);
     }
 }
 
 void UDPForwarderPlugin::rxHandle(const ModularPicoScenesRxFrame &rxframe) {
-    auto frameBuffer = rxframe.toBuffer();
-    UDPService::getInstance("Forwarder" + destinationIP + std::to_string(destinationPort))->sendData(frameBuffer.data(), frameBuffer.size(), destinationIP, destinationPort);
+    if (destinationIP && destinationPort) {
+        auto frameBuffer = rxframe.toBuffer();
+        UDPService::getInstance("Forwarder" + *destinationIP + std::to_string(*destinationPort))->sendData(frameBuffer.data(), frameBuffer.size(), *destinationIP, *destinationPort);
+    }
 }
diff --git a/plugin-forwarder/UDPForwarderPlugin.hxx b/plugin-forwarder/UDPForwarderPlugin.hxx
@@ -32,8 +32,8 @@ public:
     }
 
 private:
-    std::string destinationIP{};
-    uint16_t destinationPort{0};
+    std::optional<std::string> destinationIP;
+    std::optional<uint16_t> destinationPort;
     std::shared_ptr<po::options_description> options;
 };