From 3793427259459eeebf9a68aae236456be08c40c4 Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Thu, 29 Aug 2024 01:25:52 -0700 Subject: [PATCH] Update CommissionerControlCluster xml definition to align with spec (#35272) * Update CommissionerControlCluster xml defination to align with spec * Clean up commissioner-control-server --- .../fabric-bridge-app.matter | 2 - .../linux/CommissionerControl.cpp | 3 +- .../linux/include/CommissionerControl.h | 3 +- .../commissioner-control-server.cpp | 20 ++++----- .../commissioner-control-server.h | 42 +------------------ .../chip/commissioner-control-cluster.xml | 5 +-- .../data_model/controller-clusters.matter | 2 - .../chip/devicecontroller/ChipClusters.java | 14 ++----- .../devicecontroller/ClusterIDMapping.java | 2 +- .../devicecontroller/ClusterInfoMapping.java | 12 ------ .../clusters/CommissionerControlCluster.kt | 8 ---- .../python/chip/clusters/CHIPClusters.py | 2 - .../python/chip/clusters/Objects.py | 4 -- .../zap-generated/MTRCommandPayloadsObjc.h | 4 -- .../zap-generated/MTRCommandPayloadsObjc.mm | 20 +-------- .../zap-generated/cluster-objects.cpp | 10 ----- .../zap-generated/cluster-objects.h | 6 --- .../zap-generated/cluster/Commands.h | 2 - .../zap-generated/cluster/Commands.h | 20 --------- 19 files changed, 17 insertions(+), 164 deletions(-) diff --git a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter index 3fb7436adbfe5a..22f5ae6ccda3be 100644 --- a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter +++ b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter @@ -1730,8 +1730,6 @@ provisional cluster CommissionerControl = 1873 { request struct CommissionNodeRequest { int64u requestId = 0; int16u responseTimeoutSeconds = 1; - optional octet_string ipAddress = 2; - optional int16u port = 3; } response struct ReverseOpenCommissioningWindow = 2 { diff --git a/examples/fabric-bridge-app/linux/CommissionerControl.cpp b/examples/fabric-bridge-app/linux/CommissionerControl.cpp index 0466ab8b711b69..1e67dc0f30c1b4 100644 --- a/examples/fabric-bridge-app/linux/CommissionerControl.cpp +++ b/examples/fabric-bridge-app/linux/CommissionerControl.cpp @@ -166,8 +166,7 @@ CHIP_ERROR CommissionerControlDelegate::GetCommissioningWindowParams(Commissioni return CHIP_NO_ERROR; } -CHIP_ERROR CommissionerControlDelegate::HandleCommissionNode(const CommissioningWindowParams & params, - const Optional & ipAddress, const Optional & port) +CHIP_ERROR CommissionerControlDelegate::HandleCommissionNode(const CommissioningWindowParams & params) { CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/examples/fabric-bridge-app/linux/include/CommissionerControl.h b/examples/fabric-bridge-app/linux/include/CommissionerControl.h index 486668ffa212f7..6e1d9c69d54bf9 100644 --- a/examples/fabric-bridge-app/linux/include/CommissionerControl.h +++ b/examples/fabric-bridge-app/linux/include/CommissionerControl.h @@ -32,8 +32,7 @@ class CommissionerControlDelegate : public Delegate CHIP_ERROR HandleCommissioningApprovalRequest(const CommissioningApprovalRequest & request) override; CHIP_ERROR ValidateCommissionNodeCommand(NodeId clientNodeId, uint64_t requestId) override; CHIP_ERROR GetCommissioningWindowParams(CommissioningWindowParams & outParams) override; - CHIP_ERROR HandleCommissionNode(const CommissioningWindowParams & params, const Optional & ipAddress, - const Optional & port) override; + CHIP_ERROR HandleCommissionNode(const CommissioningWindowParams & params) override; ~CommissionerControlDelegate() = default; diff --git a/src/app/clusters/commissioner-control-server/commissioner-control-server.cpp b/src/app/clusters/commissioner-control-server/commissioner-control-server.cpp index 4df397326894ed..80d65b2c4d16fc 100644 --- a/src/app/clusters/commissioner-control-server/commissioner-control-server.cpp +++ b/src/app/clusters/commissioner-control-server/commissioner-control-server.cpp @@ -64,14 +64,14 @@ void AddReverseOpenCommissioningWindowResponse(CommandHandler * commandObj, cons void RunDeferredCommissionNode(intptr_t commandArg) { - auto * info = reinterpret_cast(commandArg); + auto * params = reinterpret_cast(commandArg); Clusters::CommissionerControl::Delegate * delegate = Clusters::CommissionerControl::CommissionerControlServer::Instance().GetDelegate(); if (delegate != nullptr) { - CHIP_ERROR err = delegate->HandleCommissionNode(info->params, info->ipAddress.GetIPAddress(), info->port); + CHIP_ERROR err = delegate->HandleCommissionNode(*params); if (err != CHIP_NO_ERROR) { ChipLogError(Zcl, "HandleCommissionNode error: %" CHIP_ERROR_FORMAT, err.Format()); @@ -82,7 +82,7 @@ void RunDeferredCommissionNode(intptr_t commandArg) ChipLogError(Zcl, "No delegate available for HandleCommissionNode"); } - delete info; + delete params; } } // namespace @@ -234,31 +234,27 @@ bool emberAfCommissionerControlClusterCommissionNodeCallback( auto requestId = commandData.requestId; - auto commissionNodeInfo = std::make_unique(); + auto commissioningWindowParams = std::make_unique(); Clusters::CommissionerControl::Delegate * delegate = Clusters::CommissionerControl::CommissionerControlServer::Instance().GetDelegate(); VerifyOrExit(delegate != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - // Set IP address and port in the CommissionNodeInfo struct - commissionNodeInfo->port = commandData.port; - err = commissionNodeInfo->ipAddress.SetIPAddress(commandData.ipAddress); - SuccessOrExit(err); - // Validate the commission node command. err = delegate->ValidateCommissionNodeCommand(sourceNodeId, requestId); SuccessOrExit(err); // Populate the parameters for the commissioning window - err = delegate->GetCommissioningWindowParams(commissionNodeInfo->params); + err = delegate->GetCommissioningWindowParams(*commissioningWindowParams); SuccessOrExit(err); // Add the response for the commissioning window. - AddReverseOpenCommissioningWindowResponse(commandObj, commandPath, commissionNodeInfo->params); + AddReverseOpenCommissioningWindowResponse(commandObj, commandPath, *commissioningWindowParams); // Schedule the deferred reverse commission node task - DeviceLayer::PlatformMgr().ScheduleWork(RunDeferredCommissionNode, reinterpret_cast(commissionNodeInfo.release())); + DeviceLayer::PlatformMgr().ScheduleWork(RunDeferredCommissionNode, + reinterpret_cast(commissioningWindowParams.release())); exit: if (err != CHIP_NO_ERROR) diff --git a/src/app/clusters/commissioner-control-server/commissioner-control-server.h b/src/app/clusters/commissioner-control-server/commissioner-control-server.h index 60a4e81a93c3af..e63769de1d0a3e 100644 --- a/src/app/clusters/commissioner-control-server/commissioner-control-server.h +++ b/src/app/clusters/commissioner-control-server/commissioner-control-server.h @@ -46,43 +46,6 @@ struct CommissioningWindowParams ByteSpan salt; }; -class ProtectedIPAddress -{ -public: - const Optional GetIPAddress() { return ipAddress; } - - CHIP_ERROR SetIPAddress(const Optional & address) - { - if (!address.HasValue()) - { - ipAddress.ClearValue(); - return CHIP_NO_ERROR; - } - - const ByteSpan & addressSpan = address.Value(); - size_t addressLength = addressSpan.size(); - if (addressLength != 4 && addressLength != 16) - { - return CHIP_ERROR_INVALID_ARGUMENT; - } - - memcpy(ipAddressBuffer, addressSpan.data(), addressLength); - ipAddress.SetValue(ByteSpan(ipAddressBuffer, addressLength)); - return CHIP_NO_ERROR; - } - -private: - Optional ipAddress; - uint8_t ipAddressBuffer[kIpAddressBufferSize]; -}; - -struct CommissionNodeInfo -{ - CommissioningWindowParams params; - ProtectedIPAddress ipAddress; - Optional port; -}; - class Delegate { public: @@ -130,12 +93,9 @@ class Delegate * Commission a node specified by the previously approved request. * * @param params The parameters for the commissioning window. - * @param ipAddress Optional IP address for the commissioning window. - * @param port Optional port for the commissioning window. * @return CHIP_ERROR indicating the success or failure of the operation. */ - virtual CHIP_ERROR HandleCommissionNode(const CommissioningWindowParams & params, const Optional & ipAddress, - const Optional & port) = 0; + virtual CHIP_ERROR HandleCommissionNode(const CommissioningWindowParams & params) = 0; virtual ~Delegate() = default; }; diff --git a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml index 7228b8f47a20ab..af9a734d6e7176 100644 --- a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml @@ -49,10 +49,7 @@ limitations under the License. This command is sent by a client to request that the server begins commissioning a previously approved request. - - - - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index e21a82213b661a..9b73af37ddb32e 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -9450,8 +9450,6 @@ provisional cluster CommissionerControl = 1873 { request struct CommissionNodeRequest { int64u requestId = 0; int16u responseTimeoutSeconds = 1; - optional octet_string ipAddress = 2; - optional int16u port = 3; } response struct ReverseOpenCommissioningWindow = 2 { diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index 8dd9332beb6885..fd792a14bb2e4f 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -61087,11 +61087,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void commissionNode(ReverseOpenCommissioningWindowCallback callback, Long requestId, Integer responseTimeoutSeconds, Optional ipAddress, Optional port) { - commissionNode(callback, requestId, responseTimeoutSeconds, ipAddress, port, 0); + public void commissionNode(ReverseOpenCommissioningWindowCallback callback, Long requestId, Integer responseTimeoutSeconds) { + commissionNode(callback, requestId, responseTimeoutSeconds, 0); } - public void commissionNode(ReverseOpenCommissioningWindowCallback callback, Long requestId, Integer responseTimeoutSeconds, Optional ipAddress, Optional port, int timedInvokeTimeoutMs) { + public void commissionNode(ReverseOpenCommissioningWindowCallback callback, Long requestId, Integer responseTimeoutSeconds, int timedInvokeTimeoutMs) { final long commandId = 1L; ArrayList elements = new ArrayList<>(); @@ -61103,14 +61103,6 @@ public void commissionNode(ReverseOpenCommissioningWindowCallback callback, Long BaseTLVType responseTimeoutSecondstlvValue = new UIntType(responseTimeoutSeconds); elements.add(new StructElement(responseTimeoutSecondsFieldID, responseTimeoutSecondstlvValue)); - final long ipAddressFieldID = 2L; - BaseTLVType ipAddresstlvValue = ipAddress.map((nonOptionalipAddress) -> new ByteArrayType(nonOptionalipAddress)).orElse(new EmptyType()); - elements.add(new StructElement(ipAddressFieldID, ipAddresstlvValue)); - - final long portFieldID = 3L; - BaseTLVType porttlvValue = port.map((nonOptionalport) -> new UIntType(nonOptionalport)).orElse(new EmptyType()); - elements.add(new StructElement(portFieldID, porttlvValue)); - StructType commandArgs = new StructType(elements); invoke(new InvokeCallbackImpl(callback) { @Override diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index 829cf623e75ba0..b48f4029b62237 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -17424,7 +17424,7 @@ public static RequestCommissioningApprovalCommandField value(int id) throws NoSu } throw new NoSuchFieldError(); } - }public enum CommissionNodeCommandField {RequestId(0),ResponseTimeoutSeconds(1),IpAddress(2),Port(3),; + }public enum CommissionNodeCommandField {RequestId(0),ResponseTimeoutSeconds(1),; private final int id; CommissionNodeCommandField(int id) { this.id = id; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java index fe948f9429f516..55659d8463581d 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java @@ -29046,12 +29046,6 @@ public Map> getCommandMap() { CommandParameterInfo commissionerControlcommissionNoderesponseTimeoutSecondsCommandParameterInfo = new CommandParameterInfo("responseTimeoutSeconds", Integer.class, Integer.class); commissionerControlcommissionNodeCommandParams.put("responseTimeoutSeconds",commissionerControlcommissionNoderesponseTimeoutSecondsCommandParameterInfo); - - CommandParameterInfo commissionerControlcommissionNodeipAddressCommandParameterInfo = new CommandParameterInfo("ipAddress", Optional.class, byte[].class); - commissionerControlcommissionNodeCommandParams.put("ipAddress",commissionerControlcommissionNodeipAddressCommandParameterInfo); - - CommandParameterInfo commissionerControlcommissionNodeportCommandParameterInfo = new CommandParameterInfo("port", Optional.class, Integer.class); - commissionerControlcommissionNodeCommandParams.put("port",commissionerControlcommissionNodeportCommandParameterInfo); InteractionInfo commissionerControlcommissionNodeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.CommissionerControlCluster) cluster) @@ -29062,12 +29056,6 @@ public Map> getCommandMap() { , (Integer) commandArguments.get("responseTimeoutSeconds") - , (Optional) - commandArguments.get("ipAddress") - - , (Optional) - commandArguments.get("port") - ); }, () -> new DelegatedCommissionerControlClusterReverseOpenCommissioningWindowCallback(), diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt index 2daf2b464e948f..3e9d07f3f04354 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt @@ -130,8 +130,6 @@ class CommissionerControlCluster( suspend fun commissionNode( requestId: ULong, responseTimeoutSeconds: UShort, - ipAddress: ByteArray?, - port: UShort?, timedInvokeTimeout: Duration? = null, ): ReverseOpenCommissioningWindow { val commandId: UInt = 1u @@ -144,12 +142,6 @@ class CommissionerControlCluster( val TAG_RESPONSE_TIMEOUT_SECONDS_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_RESPONSE_TIMEOUT_SECONDS_REQ), responseTimeoutSeconds) - - val TAG_IP_ADDRESS_REQ: Int = 2 - ipAddress?.let { tlvWriter.put(ContextSpecificTag(TAG_IP_ADDRESS_REQ), ipAddress) } - - val TAG_PORT_REQ: Int = 3 - port?.let { tlvWriter.put(ContextSpecificTag(TAG_PORT_REQ), port) } tlvWriter.endStructure() val request: InvokeRequest = diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 925ce90cfcf3a8..356d3b43569ea2 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -13389,8 +13389,6 @@ class ChipClusters: "args": { "requestId": "int", "responseTimeoutSeconds": "int", - "ipAddress": "bytes", - "port": "int", }, }, }, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 82f257f764052c..8c9cbe7db50b87 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -47477,14 +47477,10 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="requestId", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="responseTimeoutSeconds", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="ipAddress", Tag=2, Type=typing.Optional[bytes]), - ClusterObjectFieldDescriptor(Label="port", Tag=3, Type=typing.Optional[uint]), ]) requestId: 'uint' = 0 responseTimeoutSeconds: 'uint' = 0 - ipAddress: 'typing.Optional[bytes]' = None - port: 'typing.Optional[uint]' = None @dataclass class ReverseOpenCommissioningWindow(ClusterCommand): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 95b3675d94e0ae..044b0116ff4778 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -10933,10 +10933,6 @@ MTR_PROVISIONALLY_AVAILABLE @property (nonatomic, copy) NSNumber * _Nonnull requestId MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull responseTimeoutSeconds MTR_PROVISIONALLY_AVAILABLE; - -@property (nonatomic, copy) NSData * _Nullable ipAddress MTR_PROVISIONALLY_AVAILABLE; - -@property (nonatomic, copy) NSNumber * _Nullable port MTR_PROVISIONALLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 00dc34a9a37ee6..d24ce54fc84028 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -31583,10 +31583,6 @@ - (instancetype)init _requestId = @(0); _responseTimeoutSeconds = @(0); - - _ipAddress = nil; - - _port = nil; _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -31599,8 +31595,6 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; other.requestId = self.requestId; other.responseTimeoutSeconds = self.responseTimeoutSeconds; - other.ipAddress = self.ipAddress; - other.port = self.port; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -31609,7 +31603,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: requestId:%@; responseTimeoutSeconds:%@; ipAddress:%@; port:%@; >", NSStringFromClass([self class]), _requestId, _responseTimeoutSeconds, [_ipAddress base64EncodedStringWithOptions:0], _port]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: requestId:%@; responseTimeoutSeconds:%@; >", NSStringFromClass([self class]), _requestId, _responseTimeoutSeconds]; return descriptionString; } @@ -31627,18 +31621,6 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader { encodableStruct.responseTimeoutSeconds = self.responseTimeoutSeconds.unsignedShortValue; } - { - if (self.ipAddress != nil) { - auto & definedValue_0 = encodableStruct.ipAddress.Emplace(); - definedValue_0 = AsByteSpan(self.ipAddress); - } - } - { - if (self.port != nil) { - auto & definedValue_0 = encodableStruct.port.Emplace(); - definedValue_0 = self.port.unsignedShortValue; - } - } auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); if (buffer.IsNull()) { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index c3947539864e2c..4be7782087f3d6 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -28973,8 +28973,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; encoder.Encode(to_underlying(Fields::kRequestId), requestId); encoder.Encode(to_underlying(Fields::kResponseTimeoutSeconds), responseTimeoutSeconds); - encoder.Encode(to_underlying(Fields::kIpAddress), ipAddress); - encoder.Encode(to_underlying(Fields::kPort), port); return encoder.Finalize(); } @@ -29000,14 +28998,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, responseTimeoutSeconds); } - else if (__context_tag == to_underlying(Fields::kIpAddress)) - { - err = DataModel::Decode(reader, ipAddress); - } - else if (__context_tag == to_underlying(Fields::kPort)) - { - err = DataModel::Decode(reader, port); - } else { } diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 3309b8ee41878b..78022f3ac6ce11 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -42016,8 +42016,6 @@ enum class Fields : uint8_t { kRequestId = 0, kResponseTimeoutSeconds = 1, - kIpAddress = 2, - kPort = 3, }; struct Type @@ -42029,8 +42027,6 @@ struct Type uint64_t requestId = static_cast(0); uint16_t responseTimeoutSeconds = static_cast(0); - Optional ipAddress; - Optional port; CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -42047,8 +42043,6 @@ struct DecodableType uint64_t requestId = static_cast(0); uint16_t responseTimeoutSeconds = static_cast(0); - Optional ipAddress; - Optional port; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace CommissionNode diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index e145de431ed5b1..f50b5721bce5d5 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -13886,8 +13886,6 @@ class CommissionerControlCommissionNode : public ClusterCommand { AddArgument("RequestId", 0, UINT64_MAX, &mRequest.requestId); AddArgument("ResponseTimeoutSeconds", 0, UINT16_MAX, &mRequest.responseTimeoutSeconds); - AddArgument("IpAddress", &mRequest.ipAddress); - AddArgument("Port", 0, UINT16_MAX, &mRequest.port); ClusterCommand::AddArguments(); } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index e8aa8848588f3c..a77ea1f918b90b 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -164752,12 +164752,6 @@ class CommissionerControlCommissionNode : public ClusterCommand { #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL AddArgument("ResponseTimeoutSeconds", 0, UINT16_MAX, &mRequest.responseTimeoutSeconds); -#endif // MTR_ENABLE_PROVISIONAL -#if MTR_ENABLE_PROVISIONAL - AddArgument("IpAddress", &mRequest.ipAddress); -#endif // MTR_ENABLE_PROVISIONAL -#if MTR_ENABLE_PROVISIONAL - AddArgument("Port", 0, UINT16_MAX, &mRequest.port); #endif // MTR_ENABLE_PROVISIONAL ClusterCommand::AddArguments(); } @@ -164778,20 +164772,6 @@ class CommissionerControlCommissionNode : public ClusterCommand { #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL params.responseTimeoutSeconds = [NSNumber numberWithUnsignedShort:mRequest.responseTimeoutSeconds]; -#endif // MTR_ENABLE_PROVISIONAL -#if MTR_ENABLE_PROVISIONAL - if (mRequest.ipAddress.HasValue()) { - params.ipAddress = [NSData dataWithBytes:mRequest.ipAddress.Value().data() length:mRequest.ipAddress.Value().size()]; - } else { - params.ipAddress = nil; - } -#endif // MTR_ENABLE_PROVISIONAL -#if MTR_ENABLE_PROVISIONAL - if (mRequest.port.HasValue()) { - params.port = [NSNumber numberWithUnsignedShort:mRequest.port.Value()]; - } else { - params.port = nil; - } #endif // MTR_ENABLE_PROVISIONAL uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount;