Remove leftover rendezvous bypass bits.

We no longer really support this non-spec-compliant mode of operation; remove the bits of it still scattered around the tree.
project-chip · Mar 24, 2022 · bad440c · bad440c
1 parent 1f3467e
commit bad440c
Show file tree

Hide file tree

Showing 43 changed files with 7 additions and 199 deletions.
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -90,8 +90,7 @@ jobs:
             - name: Build example Standalone All Clusters Server
               timeout-minutes: 5
               run: |
-                  scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/all_clusters_debug \
-                    chip_bypass_rendezvous=true
+                  scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/all_clusters_debug
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     linux debug all-clusters-app \
                     out/all_clusters_debug/chip-all-clusters-app \

diff --git a/config/ameba/args.gni b/config/ameba/args.gni
@@ -29,7 +29,6 @@ chip_build_tests = false
 chip_inet_config_enable_tcp_endpoint = true
 chip_inet_config_enable_udp_endpoint = true
 
-chip_bypass_rendezvous = false
 chip_config_network_layer_ble = true
 
 custom_toolchain = "//third_party/connectedhomeip/config/ameba/toolchain:ameba"

diff --git a/config/mbed/CMakeLists.txt b/config/mbed/CMakeLists.txt
@@ -275,7 +275,6 @@ chip_gn_arg_bool  ("chip_build_tests"                     CONFIG_CHIP_BUILD_TEST
 chip_gn_arg_bool  ("chip_monolithic_tests"                CONFIG_CHIP_BUILD_TESTS)
 chip_gn_arg_bool  ("chip_build_libshell"                  CONFIG_CHIP_LIB_SHELL)
 chip_gn_arg_bool  ("chip_with_platform_mbedtls"           CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS)
-chip_gn_arg_bool  ("chip_bypass_rendezvous"               CONFIG_CHIP_BYPASS_RENDEZVOUS)
 chip_gn_arg_bool  ("chip_build_pw_rpc_lib"                CONFIG_CHIP_PW_RPC)
 chip_gn_arg_bool  ("chip_enable_data_model"               CONFIG_CHIP_DATA_MODEL)
 if (CONFIG_CHIP_PW_RPC)

diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md
@@ -65,7 +65,6 @@ There are two commissioning modes supported by Ameba platform:
 
 1. In "connectedhomeip/config/ameba/args.gni"
 
-    - set `chip_bypass_rendezvous = false`
     - Set `chip_config_network_layer_ble = true`
 
 2. In "connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h"
@@ -82,7 +81,6 @@ There are two commissioning modes supported by Ameba platform:
 
 1. In "connectedhomeip/config/ameba/args.gni"
 
-    - set `chip_bypass_rendezvous = false`
     - Set `chip_config_network_layer_ble = false`
 
 2. In "connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h"

diff --git a/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp b/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp
@@ -74,12 +74,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
         ConnectivityMgr().SetBLEAdvertisingEnabled(false);
         ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
     }
-    else
-    {
-        // If rendezvous is bypassed, enable SoftAP so that the device can still
-        // be communicated with via its SoftAP as needed.
-        ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
-    }
 
     // Register a function to receive events from the CHIP device layer.  Note that calls to
     // this function will happen on the CHIP event loop thread, not the app_main thread.

diff --git a/examples/all-clusters-app/esp32/main/Kconfig.projbuild b/examples/all-clusters-app/esp32/main/Kconfig.projbuild
@@ -51,8 +51,6 @@ menu "Demo"
       help
           Specifies the Rendezvous mode of the peripheral.
 
-      config RENDEZVOUS_MODE_BYPASS
-          bool "Bypass"
       config RENDEZVOUS_MODE_SOFTAP
           bool "Soft-AP"
       config RENDEZVOUS_MODE_BLE
@@ -87,7 +85,6 @@ menu "Demo"
     config RENDEZVOUS_MODE
        int
        range 0 8
-       default 0 if RENDEZVOUS_MODE_BYPASS
        default 1 if RENDEZVOUS_MODE_SOFTAP
        default 2 if RENDEZVOUS_MODE_BLE
        default 4 if RENDEZVOUS_MODE_ON_NETWORK

diff --git a/examples/all-clusters-app/mbed/config.in b/examples/all-clusters-app/mbed/config.in
@@ -1,7 +1,6 @@
 CONFIG_CHIP_BUILD_TESTS=n
 CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS=y
 CONFIG_CHIP_PROJECT_CONFIG=main/include/CHIPProjectConfig.h
-CONFIG_CHIP_BYPASS_RENDEZVOUS=n
 CONFIG_MBED_BSD_SOCKET_TRACE=n
 CONFIG_CHIP_OTA_REQUESTOR=y
 CONFIG_CHIP_DATA_MODEL=y
diff --git a/examples/bridge-app/esp32/main/CHIPDeviceManager.cpp b/examples/bridge-app/esp32/main/CHIPDeviceManager.cpp
@@ -69,12 +69,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
         ConnectivityMgr().SetBLEAdvertisingEnabled(false);
         ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
     }
-    else
-    {
-        // If rendezvous is bypassed, enable SoftAP so that the device can still
-        // be communicated with via its SoftAP as needed.
-        ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
-    }
 
     // Register a function to receive events from the CHIP device layer.  Note that calls to
     // this function will happen on the CHIP event loop thread, not the app_main thread.

diff --git a/examples/bridge-app/esp32/main/Kconfig.projbuild b/examples/bridge-app/esp32/main/Kconfig.projbuild
@@ -6,8 +6,6 @@ menu "Demo"
       help
           Specifies the Rendezvous mode of the peripheral.
 
-      config RENDEZVOUS_MODE_BYPASS
-          bool "Bypass"
       config RENDEZVOUS_MODE_WIFI
           bool "Wi-Fi"
       config RENDEZVOUS_MODE_BLE
@@ -21,7 +19,6 @@ menu "Demo"
     config RENDEZVOUS_MODE
        int
        range 0 8
-       default 0 if RENDEZVOUS_MODE_BYPASS
        default 1 if RENDEZVOUS_MODE_WIFI
        default 2 if RENDEZVOUS_MODE_BLE
        default 4 if RENDEZVOUS_MODE_THREAD

diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md
@@ -63,7 +63,6 @@ There are two commissioning modes supported by Ameba platform:
 
 1. In "connectedhomeip/config/ameba/args.gni"
 
-    - set `chip_bypass_rendezvous = false`
     - Set `chip_config_network_layer_ble = true`
 
 2. In "connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h"
@@ -79,7 +78,6 @@ There are two commissioning modes supported by Ameba platform:
 
 1. In "connectedhomeip/config/ameba/args.gni"
 
-    - set `chip_bypass_rendezvous = false`
     - Set `chip_config_network_layer_ble = false`
 
 2. In "connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h"

diff --git a/examples/lighting-app/cyw30739/src/main.cpp b/examples/lighting-app/cyw30739/src/main.cpp
@@ -156,15 +156,7 @@ void EventHandler(const ChipDeviceEvent * event, intptr_t arg)
     }
 }
 
-void HandleThreadStateChangeEvent(const ChipDeviceEvent * event)
-{
-#if CHIP_BYPASS_RENDEZVOUS
-    if (event->ThreadStateChange.NetDataChanged && !ConnectivityMgr().IsThreadProvisioned())
-    {
-        ThreadStackMgr().JoinerStart();
-    }
-#endif /* CHIP_BYPASS_RENDEZVOUS */
-}
+void HandleThreadStateChangeEvent(const ChipDeviceEvent * event) {}
 
 void LightManagerCallback(LightingManager::Actor_t actor, LightingManager::Action_t action, uint8_t level)
 {

diff --git a/examples/lighting-app/esp32/main/CHIPDeviceManager.cpp b/examples/lighting-app/esp32/main/CHIPDeviceManager.cpp
@@ -69,12 +69,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
         ConnectivityMgr().SetBLEAdvertisingEnabled(false);
         ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
     }
-    else
-    {
-        // If rendezvous is bypassed, enable SoftAP so that the device can still
-        // be communicated with via its SoftAP as needed.
-        ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
-    }
 
     // Register a function to receive events from the CHIP device layer.  Note that calls to
     // this function will happen on the CHIP event loop thread, not the app_main thread.

diff --git a/examples/lighting-app/esp32/main/Kconfig.projbuild b/examples/lighting-app/esp32/main/Kconfig.projbuild
@@ -85,8 +85,6 @@ menu "Demo"
       help
           Specifies the Rendezvous mode of the peripheral.
 
-      config RENDEZVOUS_MODE_BYPASS
-          bool "Bypass"
       config RENDEZVOUS_MODE_WIFI
           bool "Wi-Fi"
       config RENDEZVOUS_MODE_BLE
@@ -100,7 +98,6 @@ menu "Demo"
     config RENDEZVOUS_MODE
        int
        range 0 8
-       default 0 if RENDEZVOUS_MODE_BYPASS
        default 1 if RENDEZVOUS_MODE_WIFI
        default 2 if RENDEZVOUS_MODE_BLE
        default 4 if RENDEZVOUS_MODE_THREAD

diff --git a/examples/lighting-app/mbed/config.in b/examples/lighting-app/mbed/config.in
@@ -1,7 +1,6 @@
 CONFIG_CHIP_BUILD_TESTS=n
 CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS=y
 CONFIG_CHIP_PROJECT_CONFIG=main/include/CHIPProjectConfig.h
-CONFIG_CHIP_BYPASS_RENDEZVOUS=n
 CONFIG_MBED_BSD_SOCKET_TRACE=n
 CONFIG_CHIP_PW_RPC=y
 CONFIG_CHIP_OTA_REQUESTOR=y

diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp
@@ -401,11 +401,6 @@ void AppTask::StartThreadHandler(AppEvent * aEvent)
     if (aEvent->ButtonEvent.PinNo != THREAD_START_BUTTON)
         return;
 
-    if (chip::Server::GetInstance().AddTestCommissioning() != CHIP_NO_ERROR)
-    {
-        LOG_ERR("Failed to add test pairing");
-    }
-
     if (!chip::DeviceLayer::ConnectivityMgr().IsThreadProvisioned())
     {
         StartDefaultThreadNetwork();

diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp
@@ -105,13 +105,6 @@ CHIP_ERROR AppTask::Init()
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 
-    ret = chip::Server::GetInstance().AddTestCommissioning();
-    if (ret != CHIP_NO_ERROR)
-    {
-        LOG_ERR("Failed to add test pairing");
-        return ret;
-    }
-
     return CHIP_NO_ERROR;
 }
 

diff --git a/examples/lock-app/cc13x2x7_26x2x7/args.gni b/examples/lock-app/cc13x2x7_26x2x7/args.gni
@@ -34,7 +34,6 @@ chip_enable_ota_requestor = true
 
 # BLE options
 chip_config_network_layer_ble = true
-chip_bypass_rendezvous = false
 
 # Disable lock tracking, since our FreeRTOS configuration does not set
 # INCLUDE_xSemaphoreGetMutexHolder

diff --git a/examples/lock-app/cyw30739/src/main.cpp b/examples/lock-app/cyw30739/src/main.cpp
@@ -170,15 +170,7 @@ void EventHandler(const ChipDeviceEvent * event, intptr_t arg)
     }
 }
 
-void HandleThreadStateChangeEvent(const ChipDeviceEvent * event)
-{
-#if CHIP_BYPASS_RENDEZVOUS
-    if (event->ThreadStateChange.NetDataChanged && !ConnectivityMgr().IsThreadProvisioned())
-    {
-        ThreadStackMgr().JoinerStart();
-    }
-#endif /* CHIP_BYPASS_RENDEZVOUS */
-}
+void HandleThreadStateChangeEvent(const ChipDeviceEvent * event) {}
 
 void ActionInitiated(BoltLockManager::Action_t aAction, int32_t aActor)
 {

diff --git a/examples/lock-app/esp32/main/CHIPDeviceManager.cpp b/examples/lock-app/esp32/main/CHIPDeviceManager.cpp
@@ -69,12 +69,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
         ConnectivityMgr().SetBLEAdvertisingEnabled(false);
         ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
     }
-    else
-    {
-        // If rendezvous is bypassed, enable SoftAP so that the device can still
-        // be communicated with via its SoftAP as needed.
-        ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
-    }
 
     // Register a function to receive events from the CHIP device layer.  Note that calls to
     // this function will happen on the CHIP event loop thread, not the app_main thread.

diff --git a/examples/lock-app/esp32/main/Kconfig.projbuild b/examples/lock-app/esp32/main/Kconfig.projbuild
@@ -26,8 +26,6 @@ menu "Demo"
       help
           Specifies the Rendezvous mode of the peripheral.
 
-      config RENDEZVOUS_MODE_BYPASS
-          bool "Bypass"
       config RENDEZVOUS_MODE_WIFI
           bool "Wi-Fi"
       config RENDEZVOUS_MODE_BLE
@@ -55,7 +53,6 @@ menu "Demo"
     config RENDEZVOUS_MODE
        int
        range 0 8
-       default 0 if RENDEZVOUS_MODE_BYPASS
        default 1 if RENDEZVOUS_MODE_WIFI
        default 2 if RENDEZVOUS_MODE_BLE
        default 4 if RENDEZVOUS_MODE_THREAD

diff --git a/examples/lock-app/mbed/config.in b/examples/lock-app/mbed/config.in
@@ -1,7 +1,6 @@
 CONFIG_CHIP_BUILD_TESTS=n
 CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS=y
 CONFIG_CHIP_PROJECT_CONFIG=main/include/CHIPProjectConfig.h
-CONFIG_CHIP_BYPASS_RENDEZVOUS=n
 CONFIG_MBED_BSD_SOCKET_TRACE=n
 CONFIG_CHIP_PW_RPC=y
 CONFIG_CHIP_OTA_REQUESTOR=n

diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp
@@ -377,11 +377,6 @@ void AppTask::StartThreadHandler(AppEvent * aEvent)
     if (aEvent->ButtonEvent.PinNo != THREAD_START_BUTTON)
         return;
 
-    if (chip::Server::GetInstance().AddTestCommissioning() != CHIP_NO_ERROR)
-    {
-        LOG_ERR("Failed to add test pairing");
-    }
-
     if (!ConnectivityMgr().IsThreadProvisioned())
     {
         StartDefaultThreadNetwork();

diff --git a/examples/ota-provider-app/esp32/main/CHIPDeviceManager.cpp b/examples/ota-provider-app/esp32/main/CHIPDeviceManager.cpp
@@ -69,12 +69,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
         ConnectivityMgr().SetBLEAdvertisingEnabled(false);
         ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
     }
-    else
-    {
-        // If rendezvous is bypassed, enable SoftAP so that the device can still
-        // be communicated with via its SoftAP as needed.
-        ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
-    }
 
     // Register a function to receive events from the CHIP device layer.  Note that calls to
     // this function will happen on the CHIP event loop thread, not the app_main thread.

diff --git a/examples/ota-provider-app/esp32/main/Kconfig.projbuild b/examples/ota-provider-app/esp32/main/Kconfig.projbuild
@@ -26,8 +26,6 @@ menu "Demo"
       help
           Specifies the Rendezvous mode of the peripheral.
 
-      config RENDEZVOUS_MODE_BYPASS
-          bool "Bypass"
       config RENDEZVOUS_MODE_WIFI
           bool "Wi-Fi"
       config RENDEZVOUS_MODE_BLE
@@ -41,7 +39,6 @@ menu "Demo"
     config RENDEZVOUS_MODE
        int
        range 0 8
-       default 0 if RENDEZVOUS_MODE_BYPASS
        default 1 if RENDEZVOUS_MODE_WIFI
        default 2 if RENDEZVOUS_MODE_BLE
        default 4 if RENDEZVOUS_MODE_THREAD

diff --git a/examples/ota-requestor-app/esp32/main/CHIPDeviceManager.cpp b/examples/ota-requestor-app/esp32/main/CHIPDeviceManager.cpp
@@ -69,12 +69,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
         ConnectivityMgr().SetBLEAdvertisingEnabled(false);
         ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
     }
-    else
-    {
-        // If rendezvous is bypassed, enable SoftAP so that the device can still
-        // be communicated with via its SoftAP as needed.
-        ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
-    }
 
     // Register a function to receive events from the CHIP device layer.  Note that calls to
     // this function will happen on the CHIP event loop thread, not the app_main thread.

diff --git a/examples/ota-requestor-app/esp32/main/Kconfig.projbuild b/examples/ota-requestor-app/esp32/main/Kconfig.projbuild
@@ -26,8 +26,6 @@ menu "Demo"
       help
           Specifies the Rendezvous mode of the peripheral.
 
-      config RENDEZVOUS_MODE_BYPASS
-          bool "Bypass"
       config RENDEZVOUS_MODE_WIFI
           bool "Wi-Fi"
       config RENDEZVOUS_MODE_BLE
@@ -41,7 +39,6 @@ menu "Demo"
     config RENDEZVOUS_MODE
        int
        range 0 8
-       default 0 if RENDEZVOUS_MODE_BYPASS
        default 1 if RENDEZVOUS_MODE_WIFI
        default 2 if RENDEZVOUS_MODE_BLE
        default 4 if RENDEZVOUS_MODE_THREAD

diff --git a/examples/ota-requestor-app/mbed/config.in b/examples/ota-requestor-app/mbed/config.in
@@ -1,7 +1,6 @@
 CONFIG_CHIP_BUILD_TESTS=n
 CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS=y
 CONFIG_CHIP_PROJECT_CONFIG=main/include/CHIPProjectConfig.h
-CONFIG_CHIP_BYPASS_RENDEZVOUS=n
 CONFIG_MBED_BSD_SOCKET_TRACE=n
 CONFIG_CHIP_OTA_REQUESTOR=y
 CONFIG_CHIP_DATA_MODEL=y
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/args.gni b/examples/persistent-storage/cc13x2x7_26x2x7/args.gni
@@ -26,4 +26,3 @@ ti_simplelink_board = "LP_CC2652R7"
 
 # BLE options
 chip_config_network_layer_ble = true
-chip_bypass_rendezvous = false
diff --git a/examples/pigweed-app/mbed/config.in b/examples/pigweed-app/mbed/config.in
@@ -1,7 +1,6 @@
 CONFIG_CHIP_BUILD_TESTS=n
 CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS=y
 CONFIG_CHIP_PROJECT_CONFIG=main/include/CHIPProjectConfig.h
-CONFIG_CHIP_BYPASS_RENDEZVOUS=n
 CONFIG_MBED_BSD_SOCKET_TRACE=n
 CONFIG_CHIP_PW_RPC=y
 CONFIG_CHIP_OTA_REQUESTOR=n

diff --git a/examples/pump-app/cc13x2x7_26x2x7/args.gni b/examples/pump-app/cc13x2x7_26x2x7/args.gni
@@ -34,7 +34,6 @@ chip_enable_ota_requestor = true
 
 # BLE options
 chip_config_network_layer_ble = true
-chip_bypass_rendezvous = false
 
 # Disable lock tracking, since our FreeRTOS configuration does not set
 # INCLUDE_xSemaphoreGetMutexHolder

diff --git a/examples/pump-app/nrfconnect/main/AppTask.cpp b/examples/pump-app/nrfconnect/main/AppTask.cpp
@@ -372,11 +372,6 @@ void AppTask::StartThreadHandler(AppEvent * aEvent)
     if (aEvent->ButtonEvent.PinNo != THREAD_START_BUTTON)
         return;
 
-    if (chip::Server::GetInstance().AddTestCommissioning() != CHIP_NO_ERROR)
-    {
-        LOG_ERR("Failed to add test pairing");
-    }
-
     if (!ConnectivityMgr().IsThreadProvisioned())
     {
         StartDefaultThreadNetwork();

diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni b/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni
@@ -34,7 +34,6 @@ chip_enable_ota_requestor = true
 
 # BLE options
 chip_config_network_layer_ble = true
-chip_bypass_rendezvous = false
 
 # Disable lock tracking, since our FreeRTOS configuration does not set
 # INCLUDE_xSemaphoreGetMutexHolder
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,4 +26,3 @@ ti_simplelink_board = "LP_CC2652R7"

		# BLE options
		chip_config_network_layer_ble = true
		chip_bypass_rendezvous = false