[nrf noup] Fix Enhanced Commissioning Window

The admin ECM command would ignore the input passcode. Also, the JNI layer would incorrectly use the method which generates the passcode randomly despite of having a text box for inputing the passcode.
nrfconnect · Dec 2, 2021 · 1547488 · 1547488
1 parent af75642
commit 1547488
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp
@@ -176,8 +176,10 @@ void PairingCommand::OnOpenCommissioningWindowResponse(void * context, NodeId re
 
 CHIP_ERROR PairingCommand::OpenCommissioningWindow()
 {
-    return mController.OpenCommissioningWindowWithCallback(mNodeId, mTimeout, mIteration, mDiscriminator,
-                                                           mCommissioningWindowOption, &mOnOpenCommissioningWindowCallback);
+    SetupPayload payload;
+    payload.discriminator = mDiscriminator;
+    return mController.OpenCommissioningWindowWithCallback(mNodeId, mTimeout, mIteration, payload, mCommissioningWindowOption,
+                                                           &mOnOpenCommissioningWindowCallback);
 }
 
 void PairingCommand::OnStatusUpdate(DevicePairingDelegate::Status status)

diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -467,7 +467,7 @@ CHIP_ERROR DeviceController::ComputePASEVerifier(uint32_t iterations, uint32_t s
 }
 
 CHIP_ERROR DeviceController::OpenCommissioningWindowWithCallback(NodeId deviceId, uint16_t timeout, uint16_t iteration,
-                                                                 uint16_t discriminator, uint8_t option,
+                                                                 SetupPayload & payload, uint8_t option,
                                                                  Callback::Callback<OnOpenCommissioningWindow> * callback)
 {
     ChipLogProgress(Controller, "OpenCommissioningWindow for device ID %" PRIu64, deviceId);
@@ -478,12 +478,9 @@ CHIP_ERROR DeviceController::OpenCommissioningWindowWithCallback(NodeId deviceId
 
     std::string QRCode;
     std::string manualPairingCode;
-    SetupPayload payload;
     CommissioningWindowOption commissioningWindowOption;
     ByteSpan salt(reinterpret_cast<const uint8_t *>(kSpake2pKeyExchangeSalt), strlen(kSpake2pKeyExchangeSalt));
 
-    payload.discriminator = discriminator;
-
     switch (option)
     {
     case 0:

diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
@@ -298,7 +298,8 @@ class DLL_EXPORT DeviceController : public Messaging::ExchangeMgrDelegate,
     CHIP_ERROR OpenCommissioningWindow(NodeId deviceId, uint16_t timeout, uint16_t iteration, uint16_t discriminator,
                                        uint8_t option, SetupPayload & payload)
     {
-        return OpenCommissioningWindowWithCallback(deviceId, timeout, iteration, discriminator, option, nullptr);
+        payload.discriminator = discriminator;
+        return OpenCommissioningWindowWithCallback(deviceId, timeout, iteration, payload, option, nullptr);
     }
 
     /**
@@ -318,7 +319,7 @@ class DLL_EXPORT DeviceController : public Messaging::ExchangeMgrDelegate,
      *
      * @return CHIP_ERROR         CHIP_NO_ERROR on success, or corresponding error
      */
-    CHIP_ERROR OpenCommissioningWindowWithCallback(NodeId deviceId, uint16_t timeout, uint16_t iteration, uint16_t discriminator,
+    CHIP_ERROR OpenCommissioningWindowWithCallback(NodeId deviceId, uint16_t timeout, uint16_t iteration, SetupPayload & payload,
                                                    uint8_t option, Callback::Callback<OnOpenCommissioningWindow> * callback);
 
 #if CHIP_DEVICE_CONFIG_ENABLE_DNSSD

diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -424,7 +424,7 @@ JNI_METHOD(jboolean, openPairingWindowWithPIN)
     }
 
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
-    err = wrapper->Controller()->OpenCommissioningWindow(chipDevice->GetDeviceId(), duration, 1000, discriminator, 1, setupPayload);
+    err = wrapper->Controller()->OpenCommissioningWindow(chipDevice->GetDeviceId(), duration, 1000, discriminator, 2, setupPayload);
 
     if (err != CHIP_NO_ERROR)
     {