project-chip · andy31415 · Sep 24, 2021 · Sep 24, 2021
diff --git a/docs/guides/ip_commissioning.md b/docs/guides/ip_commissioning.md
@@ -40,7 +40,7 @@ device into commissioning mode.
 ### linux builds with an ethernet connection
 
 ```bash
-gn gen out/debug
+gn gen out/debug --args='chip_ip_commissioning=true'
 ninja -C out/debug
 ```
 
@@ -59,7 +59,7 @@ The controller builds with IP commissioning support by default, but you can turn
 it on or off using
 
 ```
-scripts/build_python.sh
+scripts/build_python.sh --clusters_for_ip_commissioning <true/false>
 ```
 
 There are two ways to connect via IP: **Discover then connect ip**

diff --git a/examples/platform/linux/BUILD.gn b/examples/platform/linux/BUILD.gn
@@ -39,6 +39,10 @@ source_set("app-main") {
   if (chip_enable_pw_rpc) {
     defines += [ "PW_RPC_ENABLED" ]
   }
+  if (chip_ip_commissioning) {
+    # BLE and on-network. Code defaults to BLE if this is not set.
+    defines += [ "CONFIG_RENDEZVOUS_MODE=6" ]
+  }
   if (chip_build_libshell) {
     defines += [ "ENABLE_CHIP_SHELL" ]
   }

diff --git a/scripts/build/builders/android.py b/scripts/build/builders/android.py
@@ -101,6 +101,7 @@ def generate(self):
             gn_args['target_cpu'] = self.board.TargetCpuName()
             gn_args['android_ndk_root'] = os.environ['ANDROID_NDK_HOME']
             gn_args['android_sdk_root'] = os.environ['ANDROID_HOME']
+            gn_args['chip_use_clusters_for_ip_commissioning'] = 'true'
 
             args = '--args=%s' % (' '.join([
                 '%s="%s"' % (key, shlex.quote(value))

diff --git a/scripts/build/expected_all_platform_commands.txt b/scripts/build/expected_all_platform_commands.txt
@@ -123,7 +123,7 @@ west build --cmake-only -d {out}/nrf-nrf5340-pump_controller -b nrf5340dk_nrf534
 python3 build/chip/java/tests/generate_jars_for_test.py
 
 # Generating android-arm-chip_tool
-gn gen --check --fail-on-unused-args {out}/android-arm-chip_tool '--args=target_os="android" target_cpu="arm" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME"'
+gn gen --check --fail-on-unused-args {out}/android-arm-chip_tool '--args=target_os="android" target_cpu="arm" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning="true"'
 
 # Accepting NDK licenses
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -132,7 +132,7 @@ bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 python3 build/chip/java/tests/generate_jars_for_test.py
 
 # Generating android-arm64-chip_tool
-gn gen --check --fail-on-unused-args {out}/android-arm64-chip_tool '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME"'
+gn gen --check --fail-on-unused-args {out}/android-arm64-chip_tool '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning="true"'
 
 # Accepting NDK licenses
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -141,7 +141,7 @@ bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 python3 build/chip/java/tests/generate_jars_for_test.py
 
 # Generating android-x64-chip_tool
-gn gen --check --fail-on-unused-args {out}/android-x64-chip_tool '--args=target_os="android" target_cpu="x64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME"'
+gn gen --check --fail-on-unused-args {out}/android-x64-chip_tool '--args=target_os="android" target_cpu="x64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning="true"'
 
 # Accepting NDK licenses
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -150,7 +150,7 @@ bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 python3 build/chip/java/tests/generate_jars_for_test.py
 
 # Generating android-x86-chip_tool
-gn gen --check --fail-on-unused-args {out}/android-x86-chip_tool '--args=target_os="android" target_cpu="x86" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME"'
+gn gen --check --fail-on-unused-args {out}/android-x86-chip_tool '--args=target_os="android" target_cpu="x86" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning="true"'
 
 # Accepting NDK licenses
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'

diff --git a/scripts/build_python.sh b/scripts/build_python.sh
@@ -54,6 +54,8 @@ Input Options:
                                                             By default it is false.
   -m, --chip_mdns           ChipMDNSValue                   Specify ChipMDNSValue as platform or minimal.
                                                             By default it is minimal.
+  -c, --clusters_for_ip_commissioning  true/false           Specify whether to use clusters for IP commissioning.
+                                                            By default it is true.
   -p, --enable_pybindings   EnableValue                     Specify whether to enable pybindings as python controller.
 "
 }
@@ -74,6 +76,10 @@ while (($#)); do
             chip_mdns=$2
             shift
             ;;
+        --clusters_for_ip_commissioning | -c)
+            clusters=$2
+            shift
+            ;;
         --enable_pybindings | -p)
             enable_pybindings=$2
             shift
@@ -96,7 +102,7 @@ source "$CHIP_ROOT/scripts/activate.sh"
 # Generates ninja files
 [[ -n "$chip_mdns" ]] && chip_mdns_arg="chip_mdns=\"$chip_mdns\"" || chip_mdns_arg=""
 
-gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings chip_project_config_include_dirs=[\"//config/python\"] $chip_mdns_arg"
+gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings chip_use_clusters_for_ip_commissioning=$clusters chip_project_config_include_dirs=[\"//config/python\"] $chip_mdns_arg"
 
 # Compiles python files
 # Check pybindings was requested

diff --git a/scripts/examples/android_app_ide.sh b/scripts/examples/android_app_ide.sh
@@ -38,4 +38,4 @@ fi
 source scripts/activate.sh
 # Build CMake for Android Studio
 echo "build ide"
-gn gen --check --fail-on-unused-args out/"android_$TARGET_CPU" --args="target_os=\"android\" target_cpu=\"$TARGET_CPU\" android_ndk_root=\"$ANDROID_NDK_HOME\" android_sdk_root=\"$ANDROID_HOME\"" --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
+gn gen --check --fail-on-unused-args out/"android_$TARGET_CPU" --args="target_os=\"android\" target_cpu=\"$TARGET_CPU\" android_ndk_root=\"$ANDROID_NDK_HOME\" android_sdk_root=\"$ANDROID_HOME\" chip_use_clusters_for_ip_commissioning=\"true\"" --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
@@ -103,6 +103,14 @@ static_library("app") {
     "reporting/Engine.h",
   ]
 
+  if (chip_ip_commissioning) {
+    defines = [
+      "CONFIG_USE_CLUSTERS_FOR_IP_COMMISSIONING=1",
+      "CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY=1",
+      "CHIP_DEVICE_CONFIG_ENABLE_JUST_IN_TIME_PROVISIONING=1",
+    ]
+  }
+
   public_deps = [
     ":app_buildconfig",
     "${chip_root}/src/lib/support",

diff --git a/src/app/common_flags.gni b/src/app/common_flags.gni
@@ -15,4 +15,5 @@
 declare_args() {
   # Temporary flag for interaction model and echo protocols, set it to true to enable
   chip_app_use_echo = false
+  chip_ip_commissioning = false
 }
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -1180,7 +1180,12 @@ void DeviceCommissioner::OnSessionEstablished()
 
     // TODO: Add code to receive OpCSR from the device, and process the signing request
     // For IP rendezvous, this is sent as part of the state machine.
+#if CONFIG_USE_CLUSTERS_FOR_IP_COMMISSIONING
     bool sendOperationalCertsImmediately = !mIsIPRendezvous;
+#else
+    bool sendOperationalCertsImmediately = true;
+#endif
+
     if (sendOperationalCertsImmediately)
     {
         err = SendOperationalCertificateSigningRequestCommand(device);
@@ -1463,11 +1468,13 @@ CHIP_ERROR DeviceCommissioner::OnOperationalCredentialsProvisioningCompletion(De
     ChipLogProgress(Controller, "Operational credentials provisioned on device %p", device);
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
+#if CONFIG_USE_CLUSTERS_FOR_IP_COMMISSIONING
     if (mIsIPRendezvous)
     {
         AdvanceCommissioningStage(CHIP_NO_ERROR);
     }
     else
+#endif
     {
         mPairingSession.ToSerializable(device->GetPairing());
         mSystemLayer->CancelTimer(OnSessionEstablishmentTimeoutCallback, this);
@@ -1740,10 +1747,9 @@ void DeviceCommissioner::OnDeviceConnectedFn(void * context, Device * device)
     if (commissioner->mDeviceBeingPaired < kNumMaxActiveDevices)
     {
         Device * deviceBeingPaired = &commissioner->mActiveDevices[commissioner->mDeviceBeingPaired];
-        if (device == deviceBeingPaired && commissioner->mIsIPRendezvous)
+        if (device == deviceBeingPaired && commissioner->mCommissioningStage == CommissioningStage::kFindOperational)
         {
             commissioner->AdvanceCommissioningStage(CHIP_NO_ERROR);
-            return;
         }
     }
 
@@ -1954,7 +1960,7 @@ void DeviceCommissioner::AdvanceCommissioningStage(CHIP_ERROR err)
         PersistDeviceList();
         if (mPairingDelegate != nullptr)
         {
-            mPairingDelegate->OnCommissioningComplete(device->GetDeviceId(), CHIP_NO_ERROR);
+            mPairingDelegate->OnStatusUpdate(DevicePairingDelegate::SecurePairingSuccess);
         }
         RendezvousCleanup(CHIP_NO_ERROR);
         break;

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -93,6 +93,7 @@ if (chip_device_platform != "none") {
       "CHIP_ENABLE_OPENTHREAD=${chip_enable_openthread}",
       "CHIP_WITH_GIO=${chip_with_gio}",
       "OPENTHREAD_CONFIG_ENABLE_TOBLE=false",
+      "CONFIG_USE_CLUSTERS_FOR_IP_COMMISSIONING=${chip_use_clusters_for_ip_commissioning}",
       "CHIP_DEVICE_CONFIG_ENABLE_MDNS=${chip_device_config_enable_mdns}",
       "CHIP_BYPASS_RENDEZVOUS=${chip_bypass_rendezvous}",
       "CHIP_STACK_LOCK_TRACKING_ENABLED=${chip_stack_lock_tracking_log}",
@@ -208,6 +209,7 @@ if (chip_device_platform != "none") {
       chip_device_config_enable_mdns = chip_mdns != "none"
       defines += [
         "CHIP_DEVICE_CONFIG_ENABLE_MDNS=${chip_device_config_enable_mdns}",
+        "CONFIG_USE_CLUSTERS_FOR_IP_COMMISSIONING=${chip_use_clusters_for_ip_commissioning}",
         "EXTERNAL_KEYVALUESTOREMANAGERIMPL_HEADER=\"controller/java/AndroidKeyValueStoreManagerImpl.h\"",
       ]
     }

diff --git a/src/platform/device.gni b/src/platform/device.gni
@@ -71,6 +71,9 @@ declare_args() {
   } else {
     chip_mdns = "none"
   }
+
+  # Enables full cluster-based commissioning for already-on-network devices.
+  chip_use_clusters_for_ip_commissioning = false
 }
 
 _chip_device_layer = "none"