Revert "Adding request-commissioning CHIPTool command (#7729)" (#8095)

This reverts commit 355a991.

examples/chip-tool/BUILD.gn

@@ -32,7 +32,6 @@ executable("chip-tool") {
     "commands/discover/DiscoverCommand.cpp",
     "commands/discover/DiscoverCommissionersCommand.cpp",
     "commands/pairing/PairingCommand.cpp",
-    "commands/pairing/RequestCommissioningCommand.cpp",
     "commands/payload/AdditionalDataParseCommand.cpp",
     "commands/payload/SetupPayloadParseCommand.cpp",
     "commands/reporting/ReportingCommand.cpp",

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

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "PairingCommand.h"
-#include "RequestCommissioningCommand.h"
+
 class Unpair : public PairingCommand
 {
 public:
@@ -67,10 +67,8 @@ void registerCommandsPairing(Commands & commands)
     const char * clusterName = "Pairing";
 
     commands_list clusterCommands = {
-        make_unique<Unpair>(),        make_unique<PairBypass>(),
-        make_unique<PairBleWiFi>(),   make_unique<PairBleThread>(),
-        make_unique<PairSoftAP>(),    make_unique<Ethernet>(),
-        make_unique<PairOnNetwork>(), make_unique<RequestCommissioningCommand>(),
+        make_unique<Unpair>(),     make_unique<PairBypass>(), make_unique<PairBleWiFi>(),   make_unique<PairBleThread>(),
+        make_unique<PairSoftAP>(), make_unique<Ethernet>(),   make_unique<PairOnNetwork>(),
     };
 
     commands.Register(clusterName, clusterCommands);

src/app/server/Mdns.cpp

@@ -23,10 +23,8 @@
 #include <mdns/Advertiser.h>
 #include <mdns/ServiceNaming.h>
 #include <messaging/ReliableMessageProtocolConfig.h>
-#if CONFIG_DEVICE_LAYER
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/ConfigurationManager.h>
-#endif
 #include <protocols/secure_channel/PASESession.h>
 #include <setup_payload/AdditionalDataPayloadGenerator.h>
 #include <support/Span.h>
@@ -73,13 +71,11 @@ chip::ByteSpan FillMAC(uint8_t (&mac)[8])
         return chip::ByteSpan(mac, 8);
     }
 #endif
-#if CONFIG_DEVICE_LAYER
     if (DeviceLayer::ConfigurationMgr().GetPrimaryWiFiMACAddress(mac) == CHIP_NO_ERROR)
     {
         ChipLogDetail(Discovery, "Using wifi MAC for hostname");
         return chip::ByteSpan(mac, 6);
     }
-#endif
     ChipLogError(Discovery, "Wifi mac not known. Using a default.");
     uint8_t temp[6] = { 0xEE, 0xAA, 0xBA, 0xDA, 0xBA, 0xD0 };
     memcpy(mac, temp, 6);
@@ -97,14 +93,13 @@ CHIP_ERROR GetCommissionableInstanceName(char * buffer, size_t bufferLen)
 /// Set MDNS operational advertisement
 CHIP_ERROR AdvertiseOperational()
 {
-    uint64_t fabricId = 5544332211; // default value
+    uint64_t fabricId;
 
-#if CONFIG_DEVICE_LAYER
     if (DeviceLayer::ConfigurationMgr().GetFabricId(fabricId) != CHIP_NO_ERROR)
     {
         ChipLogError(Discovery, "Fabric ID not known. Using a default");
+        fabricId = 5544332211;
     }
-#endif
 
     uint8_t mac[8];
 
@@ -144,16 +139,6 @@ CHIP_ERROR Advertise(bool commissionableNode)
     advertiseParameters.SetCommissionAdvertiseMode(commissionableNode ? chip::Mdns::CommssionAdvertiseMode::kCommissionableNode
                                                                       : chip::Mdns::CommssionAdvertiseMode::kCommissioner);
 
-    uint8_t mac[8];
-    advertiseParameters.SetMac(FillMAC(mac));
-
-#if CHIP_ENABLE_ROTATING_DEVICE_ID
-    char rotatingDeviceIdHexBuffer[RotatingDeviceId::kHexMaxLength];
-    ReturnErrorOnFailure(GenerateRotatingDeviceId(rotatingDeviceIdHexBuffer, ArraySize(rotatingDeviceIdHexBuffer)));
-    advertiseParameters.SetRotatingId(chip::Optional<const char *>::Value(rotatingDeviceIdHexBuffer));
-#endif
-
-#if CONFIG_DEVICE_LAYER
     // TODO: device can re-enter commissioning mode after being fully provisioned
     // (additionalPairing == true)
     bool notYetCommissioned = !DeviceLayer::ConfigurationMgr().IsFullyProvisioned();
@@ -162,6 +147,9 @@ CHIP_ERROR Advertise(bool commissionableNode)
 
     char pairingInst[chip::Mdns::kKeyPairingInstructionMaxLength + 1];
 
+    uint8_t mac[8];
+    advertiseParameters.SetMac(FillMAC(mac));
+
     uint16_t value;
     if (DeviceLayer::ConfigurationMgr().GetVendorId(value) != CHIP_NO_ERROR)
     {
@@ -201,6 +189,12 @@ CHIP_ERROR Advertise(bool commissionableNode)
         advertiseParameters.SetDeviceName(chip::Optional<const char *>::Value(deviceName));
     }
 
+#if CHIP_ENABLE_ROTATING_DEVICE_ID
+    char rotatingDeviceIdHexBuffer[RotatingDeviceId::kHexMaxLength];
+    ReturnErrorOnFailure(GenerateRotatingDeviceId(rotatingDeviceIdHexBuffer, ArraySize(rotatingDeviceIdHexBuffer)));
+    advertiseParameters.SetRotatingId(chip::Optional<const char *>::Value(rotatingDeviceIdHexBuffer));
+#endif
+
     if (notYetCommissioned)
     {
         if (DeviceLayer::ConfigurationMgr().GetInitialPairingHint(value) != CHIP_NO_ERROR)
@@ -241,7 +235,7 @@ CHIP_ERROR Advertise(bool commissionableNode)
             advertiseParameters.SetPairingInstr(chip::Optional<const char *>::Value(pairingInst));
         }
     }
-#endif
+
     auto & mdnsAdvertiser = chip::Mdns::ServiceAdvertiser::Instance();
 
     ChipLogProgress(Discovery, "Advertise commission parameter vendorID=%u productID=%u discriminator=%04u/%02u",
@@ -254,9 +248,8 @@ CHIP_ERROR Advertise(bool commissionableNode)
 void StartServer()
 {
     ChipLogProgress(Discovery, "Start dns-sd server");
-    CHIP_ERROR err = CHIP_NO_ERROR;
-#if CONFIG_DEVICE_LAYER
-    err = chip::Mdns::ServiceAdvertiser::Instance().Start(&chip::DeviceLayer::InetLayer, chip::Mdns::kMdnsPort);
+    CHIP_ERROR err = chip::Mdns::ServiceAdvertiser::Instance().Start(&chip::DeviceLayer::InetLayer, chip::Mdns::kMdnsPort);
+
     // TODO: advertise this only when really operational once we support both
     // operational and commisioning advertising is supported.
     if (DeviceLayer::ConfigurationMgr().IsFullyProvisioned())
@@ -275,7 +268,7 @@ void StartServer()
         err = app::Mdns::AdvertiseCommissionableNode();
 #endif
     }
-#endif
+
 #if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY
     err = app::Mdns::AdvertiseCommisioner();
 #endif
@@ -294,16 +287,12 @@ CHIP_ERROR GenerateRotatingDeviceId(char rotatingDeviceIdHexBuffer[], size_t rot
     uint16_t lifetimeCounter               = 0;
     size_t rotatingDeviceIdValueOutputSize = 0;
 
-#if CONFIG_DEVICE_LAYER
     ReturnErrorOnFailure(
         chip::DeviceLayer::ConfigurationMgr().GetSerialNumber(serialNumber, sizeof(serialNumber), serialNumberSize));
     ReturnErrorOnFailure(chip::DeviceLayer::ConfigurationMgr().GetLifetimeCounter(lifetimeCounter));
     return AdditionalDataPayloadGenerator().generateRotatingDeviceId(lifetimeCounter, serialNumber, serialNumberSize,
                                                                      rotatingDeviceIdHexBuffer, rotatingDeviceIdHexBufferSize,
                                                                      rotatingDeviceIdValueOutputSize);
-#else
-    error = CHIP_ERROR_NOT_IMPLEMENTED;
-#endif
 }
 #endif
 

src/controller/BUILD.gn

@@ -18,9 +18,6 @@ static_library("controller") {
   output_name = "libChipController"
 
   sources = [
-    "${chip_root}/src/app/server/Mdns.cpp",
-    "${chip_root}/src/app/server/Mdns.h",
-    "${chip_root}/src/app/server/Server.h",
     "AbstractMdnsDiscoveryController.cpp",
     "CHIPCluster.cpp",
     "CHIPCluster.h",

src/controller/CHIPCommissionableNodeController.cpp

@@ -19,11 +19,6 @@
 // module header, comes first
 #include <controller/CHIPCommissionableNodeController.h>
 
-#include <app/server/Mdns.h>
-#if CONFIG_DEVICE_LAYER
-#include <platform/CHIPDeviceLayer.h>
-#endif
-#include <mdns/Advertiser.h>
 #include <support/CodeUtils.h>
 
 namespace chip {
@@ -40,22 +35,5 @@ const Mdns::DiscoveredNodeData * CommissionableNodeController::GetDiscoveredComm
     return GetDiscoveredNode(idx);
 }
 
-CHIP_ERROR CommissionableNodeController::AdvertiseCommissionableNode()
-{
-#if CONFIG_DEVICE_LAYER
-    ReturnErrorOnFailure(chip::Mdns::ServiceAdvertiser::Instance().Start(&chip::DeviceLayer::InetLayer, chip::Mdns::kMdnsPort));
-    return app::Mdns::AdvertiseCommissionableNode();
-#else
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-#endif
-}
-
-CHIP_ERROR CommissionableNodeController::SendUserDirectedCommissioningRequest(chip::Inet::IPAddress commissioner, uint16_t port)
-{
-    // TODO: integrate with Server:SendUserDirectedCommissioningRequest()
-    ChipLogError(Controller, "Unsupported operation CommissionableNodeController::SendUserDirectedCommissioningRequest");
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
 } // namespace Controller
 } // namespace chip

src/controller/CHIPCommissionableNodeController.h

@@ -20,6 +20,7 @@
 
 #include <controller/AbstractMdnsDiscoveryController.h>
 #include <mdns/Resolver.h>
+#include <platform/CHIPDeviceConfig.h>
 #include <support/logging/CHIPLogging.h>
 
 namespace chip {
@@ -53,10 +54,6 @@ class DLL_EXPORT CommissionableNodeController : public AbstractMdnsDiscoveryCont
         ChipLogError(Controller, "Unsupported operation CommissionableNodeController::OnNodeIdResolutionFailed");
     }
 
-    CHIP_ERROR AdvertiseCommissionableNode();
-
-    CHIP_ERROR SendUserDirectedCommissioningRequest(chip::Inet::IPAddress commissioner, uint16_t port);
-
 protected:
     Mdns::DiscoveredNodeData * GetDiscoveredNodes() override { return mDiscoveredCommissioners; }