Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove UnauthenticatedSession::mLocalMessageCounter #11375

Merged
merged 1 commit into from
Nov 3, 2021
Merged

Remove UnauthenticatedSession::mLocalMessageCounter #11375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/transport/SessionManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ CHIP_ERROR SessionManager::PrepareMessage(SessionHandle sessionHandle, PayloadHe
{
ReturnErrorOnFailure(payloadHeader.EncodeBeforeData(message));

MessageCounter & counter = sessionHandle.GetUnauthenticatedSession()->GetLocalMessageCounter();
MessageCounter & counter = mGlobalUnencryptedMessageCounter;
uint32_t messageCounter = counter.Value();
ReturnErrorOnFailure(counter.Advance());

Expand Down
4 changes: 1 addition & 3 deletions src/transport/UnauthenticatedSessionTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class UnauthenticatedSessionDeleter
class UnauthenticatedSession : public ReferenceCounted<UnauthenticatedSession, UnauthenticatedSessionDeleter, 0>
{
public:
UnauthenticatedSession(const PeerAddress & address) : mPeerAddress(address) { mLocalMessageCounter.Init(); }
UnauthenticatedSession(const PeerAddress & address) : mPeerAddress(address) {}

UnauthenticatedSession(const UnauthenticatedSession &) = delete;
UnauthenticatedSession & operator=(const UnauthenticatedSession &) = delete;
Expand All @@ -59,14 +59,12 @@ class UnauthenticatedSession : public ReferenceCounted<UnauthenticatedSession, U

const PeerAddress & GetPeerAddress() const { return mPeerAddress; }

MessageCounter & GetLocalMessageCounter() { return mLocalMessageCounter; }
PeerMessageCounter & GetPeerMessageCounter() { return mPeerMessageCounter; }

private:
uint64_t mLastActivityTimeMs = 0;

const PeerAddress mPeerAddress;
GlobalUnencryptedMessageCounter mLocalMessageCounter;
PeerMessageCounter mPeerMessageCounter;
};

Expand Down