Modify methods to allow for backwards compatibility between clients and servers

Author: nand-nor

src/dbus/client/thread_api_dbus.cpp

@@ -884,8 +884,17 @@ void ThreadApiDBus::sHandleDBusPendingCall(DBusPendingCall *aPending, void *aThr
 
 ClientError ThreadApiDBus::AttachAllNodesTo(const std::vector<uint8_t> &aDataset, uint32_t aDelayMs)
 {
-    auto args = std::tie(aDataset, aDelayMs);
-    return CallDBusMethodSync(OTBR_DBUS_ATTACH_ALL_NODES_TO_METHOD, args);
+    // Omit delay_timer_ms when using default (0) for backward compatibility with older servers
+    if (aDelayMs == 0)
+    {
+        auto args = std::tie(aDataset);
+        return CallDBusMethodSync(OTBR_DBUS_ATTACH_ALL_NODES_TO_METHOD, args);
+    }
+    else
+    {
+        auto args = std::tie(aDataset, aDelayMs);
+        return CallDBusMethodSync(OTBR_DBUS_ATTACH_ALL_NODES_TO_METHOD, args);
+    }
 }
 
 ClientError ThreadApiDBus::SetBorderAgentEnabled(bool aEnabled)

src/dbus/client/thread_api_dbus.hpp

@@ -174,6 +174,8 @@ class ThreadApiDBus
      *                       automatically.
      * @param[in] aDelayMs   The delay timer in milliseconds to embed in the pending dataset.
      *                       Use 0 (default) for 300 seconds (5 minutes). Maximum is 72 hours.
+     *                       When 0, the delay_timer_ms argument is omitted from the DBus call for
+     *                       backward compatibility with older servers.
      *
      * @retval ERROR_NONE              Successfully requested the Thread network migration.
      * @retval ERROR_DBUS              D-Bus encode/decode error.

src/dbus/server/dbus_thread_object_rcp.cpp

@@ -466,9 +466,16 @@ void DBusThreadObjectRcp::AttachAllNodesToHandler(DBusRequest &aRequest)
     uint32_t             delayTimerMs = 0;
     otError              error        = OT_ERROR_NONE;
 
-    auto args = std::tie(dataset, delayTimerMs);
-
-    VerifyOrExit(DBusMessageToTuple(*aRequest.GetMessage(), args) == OTBR_ERROR_NONE, error = OT_ERROR_INVALID_ARGS);
+    // Try parsing with both arguments first (new API)
+    auto argsWithDelay = std::tie(dataset, delayTimerMs);
+    if (DBusMessageToTuple(*aRequest.GetMessage(), argsWithDelay) != OTBR_ERROR_NONE)
+    {
+        // Fall back to parsing only dataset argument (old API, for backward compatibility)
+        auto argsDatasetOnly = std::tie(dataset);
+        VerifyOrExit(DBusMessageToTuple(*aRequest.GetMessage(), argsDatasetOnly) == OTBR_ERROR_NONE,
+                     error = OT_ERROR_INVALID_ARGS);
+        delayTimerMs = 0; // Use default
+    }
 
     mHost.GetThreadHelper()->AttachAllNodesTo(dataset, delayTimerMs,
                                               [aRequest](otError error, int64_t aAttachDelayMs) mutable {

src/dbus/server/introspect.xml

@@ -67,7 +67,7 @@
     <!-- AttachAllNodesTo: Request to attach all nodes to the specified Thread network.
       @dataset: The Operational Dataset that contains parameter values of the Thread network
                 to attach to. It must be a full dataset.
-      @delay_timer_ms: The delay timer value in milliseconds to embed in the pending dataset.
+      @delay_timer_ms: (Optional) The delay timer value in milliseconds to embed in the pending dataset.
                        If 0, the default of 300 seconds (300000 ms) is used. Maximum is 72 hours
                        (259200000 ms).
       @delay_ms: The delay between the method returns and the dataset takes effect, in

tests/dbus/test-client

@@ -336,7 +336,6 @@ EOF
         --type=method_call --print-reply /io/openthread/BorderRouter/wpan0 \
         io.openthread.BorderRouter.AttachAllNodesTo \
         "array:byte:${dataset}" \
-        uint32:0 \
         | grep "int64 300000"
 
     ot_ctl dataset pending | grep "Active Timestamp: 2"
@@ -352,7 +351,6 @@ EOF
         --type=method_call --print-reply /io/openthread/BorderRouter/wpan0 \
         io.openthread.BorderRouter.AttachAllNodesTo \
         "array:byte:${dataset}" \
-        uint32:0 \
         | grep "int64 0"
     ot_ctl state | grep "leader"
 
@@ -378,7 +376,6 @@ EOF
         --type=method_call --reply-timeout=40000 --print-reply /io/openthread/BorderRouter/wpan0 \
         io.openthread.BorderRouter.AttachAllNodesTo \
         "array:byte:${dataset}" \
-        uint32:0 \
         | grep "int64 300000"
 
     ot_ctl state | grep "leader"