[chip-tool] fix Thread operational dataset (#6627)

* [chip-tool] fix Thread operational dataset

* Restyled by whitespace

* Restyled by clang-format

* resolve comments

Co-authored-by: Restyled.io <[email protected]>

Author: 2 people

examples/chip-tool/commands/clusters/Commands.h

@@ -25,6 +25,8 @@
 #include "gen/CHIPClientCallbacks.h"
 #include "gen/CHIPClusters.h"
 #include <lib/core/CHIPSafeCasts.h>
+#include <lib/support/CHIPArgParser.hpp>
+#include <lib/support/ThreadOperationalDataset.h>
 
 static void OnDefaultSuccessResponse(void * context)
 {
@@ -9829,7 +9831,7 @@ class NetworkCommissioningAddThreadNetwork : public ModelCommand
 public:
     NetworkCommissioningAddThreadNetwork() : ModelCommand("add-thread-network")
     {
-        AddArgument("operationalDataset", &mOperationalDataset);
+        AddArgument("operationalDataset", &mThreadOpDatasetArg);
         AddArgument("breadcrumb", 0, UINT64_MAX, &mBreadcrumb);
         AddArgument("timeoutMs", 0, UINT32_MAX, &mTimeoutMs);
         ModelCommand::AddArguments();
@@ -9842,13 +9844,18 @@ class NetworkCommissioningAddThreadNetwork : public ModelCommand
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
     {
+        uint8_t opDataset[chip::Thread::kSizeOperationalDataset];
+        uint32_t opDatasetLen;
+
         ChipLogProgress(chipTool, "Sending cluster (0x0031) command (0x06) on endpoint %" PRIu16, endpointId);
 
+        chip::ArgParser::ParseHexString(mThreadOpDatasetArg, static_cast<uint32_t>(strlen(mThreadOpDatasetArg)), opDataset,
+                                        static_cast<uint32_t>(sizeof(opDataset)), opDatasetLen);
+
         chip::Controller::NetworkCommissioningCluster cluster;
         cluster.Associate(device, endpointId);
         return cluster.AddThreadNetwork(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),
-                                        chip::ByteSpan(chip::Uint8::from_char(mOperationalDataset), strlen(mOperationalDataset)),
-                                        mBreadcrumb, mTimeoutMs);
+                                        chip::ByteSpan(opDataset, opDatasetLen), mBreadcrumb, mTimeoutMs);
     }
 
 private:
@@ -9857,7 +9864,7 @@ class NetworkCommissioningAddThreadNetwork : public ModelCommand
             OnNetworkCommissioningClusterAddThreadNetworkResponse, this);
     chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
         new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    char * mOperationalDataset;
+    char * mThreadOpDatasetArg;
     uint64_t mBreadcrumb;
     uint32_t mTimeoutMs;
 };
@@ -10110,7 +10117,7 @@ class NetworkCommissioningUpdateThreadNetwork : public ModelCommand
 public:
     NetworkCommissioningUpdateThreadNetwork() : ModelCommand("update-thread-network")
     {
-        AddArgument("operationalDataset", &mOperationalDataset);
+        AddArgument("operationalDataset", &mThreadOpDatasetArg);
         AddArgument("breadcrumb", 0, UINT64_MAX, &mBreadcrumb);
         AddArgument("timeoutMs", 0, UINT32_MAX, &mTimeoutMs);
         ModelCommand::AddArguments();
@@ -10123,13 +10130,17 @@ class NetworkCommissioningUpdateThreadNetwork : public ModelCommand
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
     {
+        uint8_t opDataset[chip::Thread::kSizeOperationalDataset];
+        uint32_t opDatasetLen;
+
         ChipLogProgress(chipTool, "Sending cluster (0x0031) command (0x08) on endpoint %" PRIu16, endpointId);
 
         chip::Controller::NetworkCommissioningCluster cluster;
         cluster.Associate(device, endpointId);
+        chip::ArgParser::ParseHexString(mThreadOpDatasetArg, static_cast<uint32_t>(strlen(mThreadOpDatasetArg)), opDataset,
+                                        static_cast<uint32_t>(sizeof(opDataset)), opDatasetLen);
         return cluster.UpdateThreadNetwork(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),
-                                           chip::ByteSpan(chip::Uint8::from_char(mOperationalDataset), strlen(mOperationalDataset)),
-                                           mBreadcrumb, mTimeoutMs);
+                                           chip::ByteSpan(opDataset, opDatasetLen), mBreadcrumb, mTimeoutMs);
     }
 
 private:
@@ -10138,7 +10149,7 @@ class NetworkCommissioningUpdateThreadNetwork : public ModelCommand
             OnNetworkCommissioningClusterUpdateThreadNetworkResponse, this);
     chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
         new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    char * mOperationalDataset;
+    char * mThreadOpDatasetArg;
     uint64_t mBreadcrumb;
     uint32_t mTimeoutMs;
 };

examples/chip-tool/commands/pairing/PairingCommand.cpp

@@ -19,13 +19,13 @@
 #include "PairingCommand.h"
 #include "gen/enums.h"
 #include <lib/core/CHIPSafeCasts.h>
+#include <lib/support/CHIPArgParser.hpp>
 
 using namespace ::chip;
 
-constexpr uint16_t kWaitDurationInSeconds     = 120;
-constexpr uint64_t kBreadcrumb                = 0;
-constexpr uint32_t kTimeoutMs                 = 6000;
-constexpr uint8_t kTemporaryThreadNetworkId[] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
+constexpr uint16_t kWaitDurationInSeconds = 120;
+constexpr uint64_t kBreadcrumb            = 0;
+constexpr uint32_t kTimeoutMs             = 6000;
 
 CHIP_ERROR PairingCommand::Run(PersistentStorage & storage, NodeId localId, NodeId remoteId)
 {
@@ -206,11 +206,22 @@ CHIP_ERROR PairingCommand::AddNetwork(PairingNetworkType networkType)
 
 CHIP_ERROR PairingCommand::AddThreadNetwork()
 {
+    CHIP_ERROR error;
+    uint8_t opDataset[chip::Thread::kSizeOperationalDataset];
+    uint32_t opDatasetLen;
+
     Callback::Cancelable * successCallback = mOnAddThreadNetworkCallback->Cancel();
     Callback::Cancelable * failureCallback = mOnFailureCallback->Cancel();
-    ByteSpan operationalDataset            = ByteSpan(Uint8::from_char(mOperationalDataset), strlen(mOperationalDataset));
 
-    return mCluster.AddThreadNetwork(successCallback, failureCallback, operationalDataset, kBreadcrumb, kTimeoutMs);
+    chip::ArgParser::ParseHexString(mThreadOpDatasetArg, static_cast<uint32_t>(strlen(mThreadOpDatasetArg)), opDataset,
+                                    static_cast<uint32_t>(sizeof(opDataset)), opDatasetLen);
+    error = mThreadOpDataset.Init(ByteSpan(opDataset, opDatasetLen));
+    if (error != CHIP_NO_ERROR)
+    {
+        return error;
+    }
+
+    return mCluster.AddThreadNetwork(successCallback, failureCallback, mThreadOpDataset.AsByteSpan(), kBreadcrumb, kTimeoutMs);
 }
 
 CHIP_ERROR PairingCommand::AddWiFiNetwork()
@@ -235,7 +246,10 @@ CHIP_ERROR PairingCommand::EnableNetwork()
     }
     else
     {
-        networkId = ByteSpan(kTemporaryThreadNetworkId, sizeof(kTemporaryThreadNetworkId));
+        uint8_t extendedPanId[chip::Thread::kSizeExtendedPanId];
+
+        mThreadOpDataset.GetExtendedPanId(extendedPanId);
+        networkId = ByteSpan(extendedPanId, sizeof(extendedPanId));
     }
 
     return mCluster.EnableNetwork(successCallback, failureCallback, networkId, kBreadcrumb, kTimeoutMs);

examples/chip-tool/commands/pairing/PairingCommand.h

@@ -22,6 +22,7 @@
 #include "../common/Command.h"
 #include "gen/CHIPClientCallbacks.h"
 #include "gen/CHIPClusters.h"
+#include <lib/support/ThreadOperationalDataset.h>
 
 #include <controller/ExampleOperationalCredentialsIssuer.h>
 
@@ -61,7 +62,7 @@ class PairingCommand : public Command,
             AddArgument("password", &mPassword);
             break;
         case PairingNetworkType::Thread:
-            AddArgument("operationalDataset", &mOperationalDataset);
+            AddArgument("operationalDataset", &mThreadOpDatasetArg);
             break;
         }
 
@@ -135,7 +136,8 @@ class PairingCommand : public Command,
     uint64_t mFabricId;
     uint16_t mDiscriminator;
     uint32_t mSetupPINCode;
-    char * mOperationalDataset;
+    char * mThreadOpDatasetArg;
+    chip::Thread::OperationalDataset mThreadOpDataset;
     char * mSSID;
     char * mPassword;