commit b62e3dfe5505fdb8c2ab96156b62e3bfb878b7a6
author Jagpal Singh Gill <paligill@gmail.com> Wed Oct 22 18:10:40 2025 -0700
committer Jagpal Singh Gill <paligill@gmail.com> Thu Oct 23 00:54:48 2025 -0700
tree 7d4e61b454a35582e6fbb646d9c75d840e5ef9f3
parent 7f9d41ddfad8c74d51fa1cf4a591b7f085254396

rtu: getConfig shall return unique_ptr

Update the getConfig in PortFactory and related classes to return a
unique_ptr instead of a variable on stack to preserve polymorphic
behavior of the return port config. Without this change the values from
USBPort are dropped when casting from USBPort to PortFactoryConfig.

Change-Id: Ia250771a7fd7aedb133598446aab1e120aaf36b5
Signed-off-by: Jagpal Singh Gill <paligill@gmail.com>

rtu/port/usb_port.cpp

diff --git a/rtu/port/usb_port.cpp b/rtu/port/usb_port.cpp
index 57a7a8c..77f226a 100644
--- a/rtu/port/usb_port.cpp
+++ b/rtu/port/usb_port.cpp
@@ -29,14 +29,18 @@
     std::string address = "unknown";
     uint16_t port = 0;
     uint16_t interface = 0;
+
+    virtual ~USBPortConfig() = default;
 };
 
 } // namespace config
 
-static auto getDevicePath(const config::Config& inConfig) -> std::string
+static auto getDevicePath(const config::PortFactoryConfig& inConfig)
+    -> std::string
 {
     namespace fs = std::filesystem;
     auto config = static_cast<const config::USBPortConfig&>(inConfig);
+
     std::regex pattern(
         std::format("platform-{}\\.usb-usb.*{}-port{}", config.address,
                     config.interface, config.port));
@@ -59,7 +63,7 @@
 }
 
 USBPort::USBPort(sdbusplus::async::context& ctx,
-                 config::PortFactoryConfig& config) :
+                 const config::PortFactoryConfig& config) :
     BasePort(ctx, config, getDevicePath(config))
 {
     info("USB port {NAME} created successfully", "NAME", config.name);
@@ -67,9 +71,13 @@
 
 auto USBPort::getConfig(sdbusplus::async::context& ctx,
                         const sdbusplus::message::object_path& objectPath)
-    -> sdbusplus::async::task<std::optional<config::PortFactoryConfig>>
+    -> sdbusplus::async::task<std::unique_ptr<config::PortFactoryConfig>>
 {
-    config::USBPortConfig config = {};
+    auto config = std::make_unique<config::USBPortConfig>();
+    if (!config)
+    {
+        co_return std::nullptr_t();
+    }
 
     auto properties =
         co_await USBPortConfigIntf(ctx)
@@ -77,22 +85,24 @@
             .path(objectPath.str)
             .properties();
 
-    auto res = updateBaseConfig(config, properties);
+    auto res = updateBaseConfig(*config, properties);
     if (!res)
     {
-        co_return std::nullopt;
+        co_return std::nullptr_t();
     }
 
-    config.address = properties.device_address;
-    config.port = properties.port;
-    config.interface = properties.device_interface;
+    config->address = properties.device_address;
+    config->port = properties.port;
+    config->interface = properties.device_interface;
+    config->portType = config::PortType::usb;
 
     debug(
         "USB port config: {NAME} {PORT_TYPE} {PORT_MODE} {ADDRESS} {PORT} {INTERFACE} {BAUD_RATE} {RTS_DELAY}",
-        "NAME", config.name, "PORT_TYPE", config.portType, "PORT_MODE",
-        config.portMode, "ADDRESS", config.address, "PORT", config.port,
-        "INTERFACE", config.interface, "BAUD_RATE", config.baudRate,
-        "RTS_DELAY", config.rtsDelay);
+        "NAME", config->name, "PORT_TYPE", config->portType, "PORT_MODE",
+        config->portMode, "ADDRESS", config->address, "PORT", config->port,
+        "INTERFACE", config->interface, "BAUD_RATE", config->baudRate,
+        "RTS_DELAY", config->rtsDelay);
+
     co_return config;
 }