Skip to content

Commit

Permalink
[IM] Change type of SubscriptionId-s to uint32_t per spec (#18410)
Browse files Browse the repository at this point in the history
* [IM] Change SubscriptionId to uint32_t per spec

* Fix
  • Loading branch information
erjiaqing authored and pull[bot] committed Feb 13, 2024
1 parent 30c18bc commit 2630738
Show file tree
Hide file tree
Showing 31 changed files with 67 additions and 60 deletions.
2 changes: 1 addition & 1 deletion examples/chip-tool/commands/clusters/ReportCommand.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class ReportCommand : public InteractionModelReports, public ModelCommand, publi
SetCommandExitStatus(mError);
}

void OnSubscriptionEstablished(uint64_t subscriptionId) override { OnSubscription(); }
void OnSubscriptionEstablished(chip::SubscriptionId subscriptionId) override { OnSubscription(); }

protected:
// Use a 3x-longer-than-default timeout because wildcard reads can take a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ShutdownSubscription : public CHIPCommand
chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(10); }

private:
uint64_t mSubscriptionId;
chip::SubscriptionId mSubscriptionId;
};

class ShutdownSubscriptions : public CHIPCommand
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class ReportCommand : public ModelCommand, public chip::app::ReadClient::Callbac
SetCommandExitStatus(mError);
}

void OnSubscriptionEstablished(uint64_t subscriptionId) override { OnAttributeSubscription(); }
void OnSubscriptionEstablished(chip::SubscriptionId subscriptionId) override { OnAttributeSubscription(); }

protected:
CHIP_ERROR ReportAttribute(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ShutdownSubscription : public CHIPCommand
chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(10); }

private:
uint64_t mSubscriptionId;
chip::SubscriptionId mSubscriptionId;
};

class ShutdownSubscriptions : public CHIPCommand
Expand Down
5 changes: 4 additions & 1 deletion src/app/BufferedReadCallback.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ class BufferedReadCallback : public ReadClient::Callback
}

void OnDone() override { return mCallback.OnDone(); }
void OnSubscriptionEstablished(uint64_t aSubscriptionId) override { mCallback.OnSubscriptionEstablished(aSubscriptionId); }
void OnSubscriptionEstablished(SubscriptionId aSubscriptionId) override
{
mCallback.OnSubscriptionEstablished(aSubscriptionId);
}

void OnDeallocatePaths(chip::app::ReadPrepareParams && aReadPrepareParams) override
{
Expand Down
5 changes: 4 additions & 1 deletion src/app/ClusterStateCache.h
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,10 @@ class ClusterStateCache : protected ReadClient::Callback
return mCallback.OnDone();
}

void OnSubscriptionEstablished(uint64_t aSubscriptionId) override { mCallback.OnSubscriptionEstablished(aSubscriptionId); }
void OnSubscriptionEstablished(SubscriptionId aSubscriptionId) override
{
mCallback.OnSubscriptionEstablished(aSubscriptionId);
}

void OnDeallocatePaths(chip::app::ReadPrepareParams && aReadPrepareParams) override
{
Expand Down
4 changes: 2 additions & 2 deletions src/app/InteractionModelEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ void InteractionModelEngine::CloseTransactionsFromFabricIndex(FabricIndex aFabri
});
}

CHIP_ERROR InteractionModelEngine::ShutdownSubscription(uint64_t aSubscriptionId)
CHIP_ERROR InteractionModelEngine::ShutdownSubscription(SubscriptionId aSubscriptionId)
{
for (auto * readClient = mpActiveReadClientList; readClient != nullptr; readClient = readClient->GetNextClient())
{
Expand Down Expand Up @@ -470,7 +470,7 @@ CHIP_ERROR InteractionModelEngine::OnUnsolicitedReportData(Messaging::ExchangeCo
ReportDataMessage::Parser report;
ReturnErrorOnFailure(report.Init(reader));

uint64_t subscriptionId = 0;
SubscriptionId subscriptionId = 0;
ReturnErrorOnFailure(report.GetSubscriptionId(&subscriptionId));
ReturnErrorOnFailure(report.ExitContainer());

Expand Down
2 changes: 1 addition & 1 deletion src/app/InteractionModelEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class InteractionModelEngine : public Messaging::UnsolicitedMessageHandler,
* @retval #CHIP_ERROR_KEY_NOT_FOUND If the subscription is not found.
* @retval #CHIP_NO_ERROR On success.
*/
CHIP_ERROR ShutdownSubscription(uint64_t aSubscriptionId);
CHIP_ERROR ShutdownSubscription(SubscriptionId aSubscriptionId);

/**
* Tears down active subscriptions for a given peer node ID.
Expand Down
6 changes: 3 additions & 3 deletions src/app/MessageDef/ReportDataMessage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ CHIP_ERROR ReportDataMessage::Parser::CheckSchemaValidity() const
VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
#if CHIP_DETAIL_LOGGING
{
uint64_t subscriptionId;
SubscriptionId subscriptionId;
ReturnErrorOnFailure(reader.Get(subscriptionId));
PRETTY_PRINT("\tSubscriptionId = 0x%" PRIx64 ",", subscriptionId);
}
Expand Down Expand Up @@ -151,7 +151,7 @@ CHIP_ERROR ReportDataMessage::Parser::GetSuppressResponse(bool * const apSuppres
return GetSimpleValue(to_underlying(Tag::kSuppressResponse), TLV::kTLVType_Boolean, apSuppressResponse);
}

CHIP_ERROR ReportDataMessage::Parser::GetSubscriptionId(uint64_t * const apSubscriptionId) const
CHIP_ERROR ReportDataMessage::Parser::GetSubscriptionId(SubscriptionId * const apSubscriptionId) const
{
return GetUnsignedInteger(to_underlying(Tag::kSubscriptionId), apSubscriptionId);
}
Expand Down Expand Up @@ -185,7 +185,7 @@ ReportDataMessage::Builder & ReportDataMessage::Builder::SuppressResponse(const
return *this;
}

ReportDataMessage::Builder & ReportDataMessage::Builder::SubscriptionId(const uint64_t aSubscriptionId)
ReportDataMessage::Builder & ReportDataMessage::Builder::SubscriptionId(const chip::SubscriptionId aSubscriptionId)
{
// skip if error has already been set
if (mError == CHIP_NO_ERROR)
Expand Down
4 changes: 2 additions & 2 deletions src/app/MessageDef/ReportDataMessage.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class Parser : public MessageParser
* @return #CHIP_NO_ERROR on success
* #CHIP_END_OF_TLV if there is no such element
*/
CHIP_ERROR GetSubscriptionId(uint64_t * const apSubscriptionId) const;
CHIP_ERROR GetSubscriptionId(SubscriptionId * const apSubscriptionId) const;

/**
* @brief Get a TLVReader for the AttributesDataList. Next() must be called before accessing them.
Expand Down Expand Up @@ -145,7 +145,7 @@ class Builder : public MessageBuilder
*
* @return A reference to *this
*/
ReportDataMessage::Builder & SubscriptionId(const uint64_t aSubscriptionId);
ReportDataMessage::Builder & SubscriptionId(const chip::SubscriptionId aSubscriptionId);

/**
* @brief Initialize a AttributeReportIBs::Builder for writing into the TLV stream
Expand Down
6 changes: 3 additions & 3 deletions src/app/MessageDef/SubscribeResponseMessage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ CHIP_ERROR SubscribeResponseMessage::Parser::CheckSchemaValidity() const
VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
#if CHIP_DETAIL_LOGGING
{
uint64_t subscriptionId;
SubscriptionId subscriptionId;
ReturnErrorOnFailure(reader.Get(subscriptionId));
PRETTY_PRINT("\tSubscriptionId = 0x%" PRIx64 ",", subscriptionId);
}
Expand Down Expand Up @@ -108,7 +108,7 @@ CHIP_ERROR SubscribeResponseMessage::Parser::CheckSchemaValidity() const
}
#endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK

CHIP_ERROR SubscribeResponseMessage::Parser::GetSubscriptionId(uint64_t * const apSubscribeId) const
CHIP_ERROR SubscribeResponseMessage::Parser::GetSubscriptionId(SubscriptionId * const apSubscribeId) const
{
return GetUnsignedInteger(to_underlying(Tag::kSubscriptionId), apSubscribeId);
}
Expand All @@ -123,7 +123,7 @@ CHIP_ERROR SubscribeResponseMessage::Parser::GetMaxIntervalCeilingSeconds(uint16
return GetUnsignedInteger(to_underlying(Tag::kMaxIntervalCeilingSeconds), apMaxIntervalCeilingSeconds);
}

SubscribeResponseMessage::Builder & SubscribeResponseMessage::Builder::SubscriptionId(const uint64_t aSubscribeId)
SubscribeResponseMessage::Builder & SubscribeResponseMessage::Builder::SubscriptionId(const chip::SubscriptionId aSubscribeId)
{
if (mError == CHIP_NO_ERROR)
{
Expand Down
4 changes: 2 additions & 2 deletions src/app/MessageDef/SubscribeResponseMessage.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class Parser : public MessageParser
* @return #CHIP_NO_ERROR on success
* #CHIP_END_OF_TLV if there is no such element
*/
CHIP_ERROR GetSubscriptionId(uint64_t * const apSubscriptionId) const;
CHIP_ERROR GetSubscriptionId(SubscriptionId * const apSubscriptionId) const;

/**
* @brief Get Final MinIntervalFloorSeconds. Next() must be called before accessing them.
Expand All @@ -85,7 +85,7 @@ class Builder : public MessageBuilder
/**
* @brief final subscription Id for the subscription back to the client.s.
*/
SubscribeResponseMessage::Builder & SubscriptionId(const uint64_t SubscriptionId);
SubscribeResponseMessage::Builder & SubscriptionId(const chip::SubscriptionId SubscriptionId);

/**
* @brief Final Min Interval for the subscription back to the clients.
Expand Down
22 changes: 11 additions & 11 deletions src/app/ReadClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,8 @@ CHIP_ERROR ReadClient::ProcessReportData(System::PacketBufferHandle && aPayload)
CHIP_ERROR err = CHIP_NO_ERROR;
ReportDataMessage::Parser report;

bool suppressResponse = true;
uint64_t subscriptionId = 0;
bool suppressResponse = true;
SubscriptionId subscriptionId = 0;
EventReportIBs::Parser eventReportIBs;
AttributeReportIBs::Parser attributeReportIBs;
System::PacketBufferTLVReader reader;
Expand Down Expand Up @@ -735,10 +735,10 @@ CHIP_ERROR ReadClient::RefreshLivenessCheckTimer()
System::Clock::Timeout timeout =
System::Clock::Seconds16(mMaxIntervalCeilingSeconds) + mpExchangeCtx->GetSessionHandle()->GetAckTimeout();
// EFR32/MBED/INFINION/K32W's chrono count return long unsinged, but other platform returns unsigned
ChipLogProgress(
DataManagement,
"Refresh LivenessCheckTime for %lu milliseconds with SubscriptionId = 0x" ChipLogFormatX64 " Peer = %02x:" ChipLogFormatX64,
static_cast<long unsigned>(timeout.count()), ChipLogValueX64(mSubscriptionId), mFabricIndex, ChipLogValueX64(mPeerNodeId));
ChipLogProgress(DataManagement,
"Refresh LivenessCheckTime for %lu milliseconds with SubscriptionId = 0x%08" PRIx32
" Peer = %02x:" ChipLogFormatX64,
static_cast<long unsigned>(timeout.count()), mSubscriptionId, mFabricIndex, ChipLogValueX64(mPeerNodeId));
err = InteractionModelEngine::GetInstance()->GetExchangeManager()->GetSessionManager()->SystemLayer()->StartTimer(
timeout, OnLivenessTimeoutCallback, this);

Expand Down Expand Up @@ -774,8 +774,8 @@ void ReadClient::OnLivenessTimeoutCallback(System::Layer * apSystemLayer, void *
VerifyOrDie(_this->mpImEngine->InActiveReadClientList(_this));

ChipLogError(DataManagement,
"Subscription Liveness timeout with SubscriptionID = 0x" ChipLogFormatX64 ", Peer = %02x:" ChipLogFormatX64,
ChipLogValueX64(_this->mSubscriptionId), _this->mFabricIndex, ChipLogValueX64(_this->mPeerNodeId));
"Subscription Liveness timeout with SubscriptionID = 0x%08" PRIx32 ", Peer = %02x:" ChipLogFormatX64,
_this->mSubscriptionId, _this->mFabricIndex, ChipLogValueX64(_this->mPeerNodeId));

// TODO: add a more specific error here for liveness timeout failure to distinguish between other classes of timeouts (i.e
// response timeouts).
Expand All @@ -794,16 +794,16 @@ CHIP_ERROR ReadClient::ProcessSubscribeResponse(System::PacketBufferHandle && aP
ReturnErrorOnFailure(subscribeResponse.CheckSchemaValidity());
#endif

uint64_t subscriptionId = 0;
SubscriptionId subscriptionId = 0;
ReturnErrorOnFailure(subscribeResponse.GetSubscriptionId(&subscriptionId));
VerifyOrReturnError(IsMatchingClient(subscriptionId), CHIP_ERROR_INVALID_ARGUMENT);
ReturnErrorOnFailure(subscribeResponse.GetMinIntervalFloorSeconds(&mMinIntervalFloorSeconds));
ReturnErrorOnFailure(subscribeResponse.GetMaxIntervalCeilingSeconds(&mMaxIntervalCeilingSeconds));

ChipLogProgress(DataManagement,
"Subscription established with SubscriptionID = 0x" ChipLogFormatX64 " MinInterval = %u"
"Subscription established with SubscriptionID = 0x%08" PRIx32 " MinInterval = %u"
"s MaxInterval = %us Peer = %02x:" ChipLogFormatX64,
ChipLogValueX64(mSubscriptionId), mMinIntervalFloorSeconds, mMaxIntervalCeilingSeconds, mFabricIndex,
mSubscriptionId, mMinIntervalFloorSeconds, mMaxIntervalCeilingSeconds, mFabricIndex,
ChipLogValueX64(mPeerNodeId));

ReturnErrorOnFailure(subscribeResponse.ExitContainer());
Expand Down
6 changes: 3 additions & 3 deletions src/app/ReadClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class ReadClient : public Messaging::ExchangeDelegate
*
* @param[in] aSubscriptionId The identifier of the subscription that was established.
*/
virtual void OnSubscriptionEstablished(uint64_t aSubscriptionId) {}
virtual void OnSubscriptionEstablished(SubscriptionId aSubscriptionId) {}

/**
* OnError will be called when an error occurs *after* a successful call to SendRequest(). The following
Expand Down Expand Up @@ -312,7 +312,7 @@ class ReadClient : public Messaging::ExchangeDelegate
SubscriptionActive, ///< The client is maintaining subscription
};

bool IsMatchingClient(uint64_t aSubscriptionId)
bool IsMatchingClient(SubscriptionId aSubscriptionId)
{
return aSubscriptionId == mSubscriptionId && mInteractionType == InteractionType::Subscribe;
}
Expand Down Expand Up @@ -383,7 +383,7 @@ class ReadClient : public Messaging::ExchangeDelegate
bool mPendingMoreChunks = false;
uint16_t mMinIntervalFloorSeconds = 0;
uint16_t mMaxIntervalCeilingSeconds = 0;
uint64_t mSubscriptionId = 0;
SubscriptionId mSubscriptionId = 0;
NodeId mPeerNodeId = kUndefinedNodeId;
FabricIndex mFabricIndex = kUndefinedFabricIndex;
InteractionType mInteractionType = InteractionType::Read;
Expand Down
4 changes: 2 additions & 2 deletions src/app/ReadHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ class ReadHandler : public Messaging::ExchangeDelegate
bool IsActiveSubscription() const { return mActiveSubscription; }
bool IsFabricFiltered() const { return mIsFabricFiltered; }
CHIP_ERROR OnSubscribeRequest(Messaging::ExchangeContext * apExchangeContext, System::PacketBufferHandle && aPayload);
void GetSubscriptionId(uint64_t & aSubscriptionId) const { aSubscriptionId = mSubscriptionId; }
void GetSubscriptionId(SubscriptionId & aSubscriptionId) const { aSubscriptionId = mSubscriptionId; }
AttributePathExpandIterator * GetAttributePathExpandIterator() { return &mAttributePathExpandIterator; }

/**
Expand Down Expand Up @@ -356,7 +356,7 @@ class ReadHandler : public Messaging::ExchangeDelegate
// prior to receiving a subscribe response.
bool mIsPrimingReports = true;
InteractionType mInteractionType = InteractionType::Read;
uint64_t mSubscriptionId = 0;
SubscriptionId mSubscriptionId = 0;
uint16_t mMinIntervalFloorSeconds = 0;
uint16_t mMaxIntervalCeilingSeconds = 0;
SessionHolder mSessionHandle;
Expand Down
2 changes: 1 addition & 1 deletion src/app/reporting/Engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ CHIP_ERROR Engine::BuildAndSendSingleReportData(ReadHandler * apReadHandler)

if (apReadHandler->IsType(ReadHandler::InteractionType::Subscribe))
{
uint64_t subscriptionId = 0;
SubscriptionId subscriptionId = 0;
apReadHandler->GetSubscriptionId(subscriptionId);
reportDataBuilder.SubscriptionId(subscriptionId);
}
Expand Down
12 changes: 6 additions & 6 deletions src/app/tests/TestMessageDef.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1051,8 +1051,8 @@ void ParseReportDataMessage(nlTestSuite * apSuite, chip::TLV::TLVReader & aReade
CHIP_ERROR err = CHIP_NO_ERROR;
ReportDataMessage::Parser reportDataParser;

bool suppressResponse = false;
uint64_t subscriptionId = 0;
bool suppressResponse = false;
chip::SubscriptionId subscriptionId = 0;
AttributeReportIBs::Parser attributeReportIBsParser;
EventReportIBs::Parser eventReportsParser;
bool moreChunkedMessages = false;
Expand Down Expand Up @@ -1352,10 +1352,10 @@ void ParseSubscribeResponseMessage(nlTestSuite * apSuite, chip::TLV::TLVReader &
CHIP_ERROR err = CHIP_NO_ERROR;

SubscribeResponseMessage::Parser subscribeResponseParser;
uint64_t subscriptionId = 0;
uint16_t minIntervalFloorSeconds = 0;
uint16_t maxIntervalCeilingSeconds = 0;
err = subscribeResponseParser.Init(aReader);
chip::SubscriptionId subscriptionId = 0;
uint16_t minIntervalFloorSeconds = 0;
uint16_t maxIntervalCeilingSeconds = 0;
err = subscribeResponseParser.Init(aReader);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
err = subscribeResponseParser.CheckSchemaValidity();
Expand Down
2 changes: 1 addition & 1 deletion src/app/tests/integration/chip_im_initiator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class MockInteractionModelApp : public ::chip::app::CommandSender::Callback,
void OnEventData(const chip::app::EventHeader & aEventHeader, chip::TLV::TLVReader * apData,
const chip::app::StatusIB * apStatus) override
{}
void OnSubscriptionEstablished(uint64_t aSubscriptionId) override
void OnSubscriptionEstablished(chip::SubscriptionId aSubscriptionId) override
{
if (mReadClient->IsSubscriptionType())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void InteractionModel::OnDone()
ContinueOnChipMainThread(CHIP_NO_ERROR);
}

void InteractionModel::OnSubscriptionEstablished(uint64_t subscriptionId)
void InteractionModel::OnSubscriptionEstablished(SubscriptionId subscriptionId)
{
ContinueOnChipMainThread(CHIP_NO_ERROR);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ class InteractionModel : public InteractionModelReports,
const chip::app::StatusIB * status) override;
void OnError(CHIP_ERROR error) override;
void OnDone() override;
void OnSubscriptionEstablished(uint64_t subscriptionId) override;
void OnSubscriptionEstablished(chip::SubscriptionId subscriptionId) override;

/////////// WriteClient Callback Interface /////////
void OnResponse(const chip::app::WriteClient * client, const chip::app::ConcreteDataAttributePath & path,
Expand Down
4 changes: 2 additions & 2 deletions src/controller/TypedReadCallback.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class TypedReadAttributeCallback final : public app::ReadClient::Callback

void OnDone() override { mOnDone(this); }

void OnSubscriptionEstablished(uint64_t aSubscriptionId) override
void OnSubscriptionEstablished(SubscriptionId aSubscriptionId) override
{
if (mOnSubscriptionEstablished)
{
Expand Down Expand Up @@ -181,7 +181,7 @@ class TypedReadEventCallback final : public app::ReadClient::Callback
chip::Platform::Delete<app::EventPathParams>(aReadPrepareParams.mpEventPathParamsList);
}

void OnSubscriptionEstablished(uint64_t aSubscriptionId) override
void OnSubscriptionEstablished(SubscriptionId aSubscriptionId) override
{
if (mOnSubscriptionEstablished)
{
Expand Down
2 changes: 1 addition & 1 deletion src/controller/java/AndroidCallbacks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ void ReportCallback::OnDone()
JniReferences::GetInstance().GetEnvForCurrentThread()->DeleteGlobalRef(mWrapperCallbackRef);
}

void ReportCallback::OnSubscriptionEstablished(uint64_t aSubscriptionId)
void ReportCallback::OnSubscriptionEstablished(SubscriptionId aSubscriptionId)
{
JniReferences::GetInstance().CallSubscriptionEstablished(mSubscriptionEstablishedCallbackRef);
}
Expand Down
2 changes: 1 addition & 1 deletion src/controller/java/AndroidCallbacks.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ struct ReportCallback : public app::ReadClient::Callback

void OnDone() override;

void OnSubscriptionEstablished(uint64_t aSubscriptionId) override;
void OnSubscriptionEstablished(SubscriptionId aSubscriptionId) override;

/** Report errors back to Java layer. attributePath may be nullptr for general errors. */
void ReportError(jobject attributePath, CHIP_ERROR err);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ uint64_t pychip_GetCommandSenderHandle(chip::DeviceProxy * device);
// CHIP Stack objects
ChipError::StorageType pychip_BLEMgrImpl_ConfigureBle(uint32_t bluetoothAdapterId);

chip::ChipError::StorageType pychip_InteractionModel_ShutdownSubscription(uint64_t subscriptionId);
chip::ChipError::StorageType pychip_InteractionModel_ShutdownSubscription(SubscriptionId subscriptionId);

//
// Storage
Expand Down
2 changes: 1 addition & 1 deletion src/controller/python/chip/clusters/Attribute.py
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ def handleDone(self):

_OnReadAttributeDataCallbackFunct = CFUNCTYPE(
None, py_object, c_uint32, c_uint16, c_uint32, c_uint32, c_uint8, c_void_p, c_size_t)
_OnSubscriptionEstablishedCallbackFunct = CFUNCTYPE(None, py_object, c_uint64)
_OnSubscriptionEstablishedCallbackFunct = CFUNCTYPE(None, py_object, c_uint32)
_OnReadEventDataCallbackFunct = CFUNCTYPE(
None, py_object, c_uint16, c_uint32, c_uint32, c_uint64, c_uint8, c_uint64, c_uint8, c_void_p, c_size_t, c_uint8)
_OnReadErrorCallbackFunct = CFUNCTYPE(
Expand Down
Loading

0 comments on commit 2630738

Please sign in to comment.