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

Disable CRMP when PASE uses BLE #6317

Merged
merged 1 commit into from
Apr 27, 2021
Merged

Disable CRMP when PASE uses BLE #6317

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
1 change: 0 additions & 1 deletion src/protocols/secure_channel/RendezvousSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <protocols/secure_channel/NetworkProvisioning.h>
#include <protocols/secure_channel/PASESession.h>
#include <protocols/secure_channel/RendezvousParameters.h>
#include <protocols/secure_channel/SessionEstablishmentExchangeDispatch.h>
#include <support/BufferWriter.h>
#include <transport/AdminPairingTable.h>
#include <transport/RendezvousSessionDelegate.h>
Expand Down
4 changes: 1 addition & 3 deletions src/protocols/secure_channel/SessionEstablishmentExchangeDispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@ CHIP_ERROR SessionEstablishmentExchangeDispatch::OnMessageReceived(const Payload
const Transport::PeerAddress & peerAddress,
ReliableMessageContext * reliableMessageContext)
{
ReturnErrorOnFailure(ExchangeMessageDispatch::OnMessageReceived(payloadHeader, messageId, peerAddress, reliableMessageContext));
mPeerAddress = peerAddress;

return CHIP_NO_ERROR;
return ExchangeMessageDispatch::OnMessageReceived(payloadHeader, messageId, peerAddress, reliableMessageContext);
}

bool SessionEstablishmentExchangeDispatch::MessagePermitted(uint16_t protocol, uint8_t type)
Expand Down
5 changes: 2 additions & 3 deletions src/protocols/secure_channel/SessionEstablishmentExchangeDispatch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ class SessionEstablishmentExchangeDispatch : public Messaging::ExchangeMessageDi

bool IsTransportReliable() override
{
// If we are not using BLE as the transport, the underlying transport is UDP based.
// (return true only if BLE is being used as the transport)
return (mTransportMgr == nullptr);
// If the underlying transport is not UDP.
return (mPeerAddress.GetTransportType() != Transport::Type::kUdp);
}

private:
Expand Down