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 SetRemoteNodeId/SetLocalNodeId from RendezvousParameters #9830

Merged
merged 1 commit into from
Sep 20, 2021
Merged

Remove SetRemoteNodeId/SetLocalNodeId from RendezvousParameters #9830

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/controller/python/chip/internal/CommissionerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ pychip_internal_Commissioner_BleConnectForPairing(chip::Controller::DeviceCommis
chip::python::ChipMainThreadScheduleAndWait([&]() {
chip::RendezvousParameters params;

params.SetDiscriminator(discriminator).SetSetupPINCode(pinCode).SetRemoteNodeId(remoteNodeId);
params.SetDiscriminator(discriminator).SetSetupPINCode(pinCode);
#if CONFIG_NETWORK_LAYER_BLE
params.SetBleLayer(chip::DeviceLayer::ConnectivityMgr().GetBleLayer()).SetPeerAddress(chip::Transport::PeerAddress::BLE());
#endif
Expand Down
18 changes: 0 additions & 18 deletions src/protocols/secure_channel/RendezvousParameters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,6 @@ class RendezvousParameters
return *this;
}

bool HasLocalNodeId() const { return mLocalNodeId.HasValue(); }
const Optional<NodeId> GetLocalNodeId() const { return mLocalNodeId; }
RendezvousParameters & SetLocalNodeId(NodeId nodeId)
{
mLocalNodeId.SetValue(nodeId);
return *this;
}

bool HasRemoteNodeId() const { return mRemoteNodeId.HasValue(); }
const Optional<NodeId> GetRemoteNodeId() const { return mRemoteNodeId; }
RendezvousParameters & SetRemoteNodeId(NodeId nodeId)
{
mRemoteNodeId.SetValue(nodeId);
return *this;
}

bool HasPASEVerifier() const { return mHasPASEVerifier; }
bool HasCSRNonce() const { return mCSRNonce.HasValue(); }
const PASEVerifier & GetPASEVerifier() const { return mPASEVerifier; }
Expand Down Expand Up @@ -117,9 +101,7 @@ class RendezvousParameters
#endif // CONFIG_NETWORK_LAYER_BLE

private:
Optional<NodeId> mLocalNodeId; ///< the local node id
Transport::PeerAddress mPeerAddress; ///< the peer node address
Optional<NodeId> mRemoteNodeId; ///< the remote node id
uint32_t mSetupPINCode = 0; ///< the target peripheral setup PIN Code
uint16_t mDiscriminator = UINT16_MAX; ///< the target peripheral discriminator
Optional<ByteSpan> mCSRNonce; ///< CSR Nonce passed by the commissioner
Expand Down