pw_bluetooth_sapphire: Rename link_initiated to outgoing_connection Make names consistent with the local variable that gets stored by the pairing state Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1070134 GitOrigin-RevId: 093b38481ad503a338c3740590dc9a58c8f37378 Change-Id: I193d5c055c981d433f63623649bbeb4cd2d9243c Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/221244 Pigweed-Auto-Submit: Faraaz Sareshwala <fsareshwala@google.com> Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com> Reviewed-by: Faraaz Sareshwala <fsareshwala@google.com> Commit-Queue: Jason Graffius <jgraff@google.com>
diff --git a/pw_bluetooth_sapphire/host/gap/pairing_state_manager.cc b/pw_bluetooth_sapphire/host/gap/pairing_state_manager.cc index 439e9a8..11959b3 100644 --- a/pw_bluetooth_sapphire/host/gap/pairing_state_manager.cc +++ b/pw_bluetooth_sapphire/host/gap/pairing_state_manager.cc
@@ -23,12 +23,16 @@ PairingStateManager::PairingStateManager(Peer::WeakPtr peer, WeakPtr<hci::BrEdrConnection> link, - bool link_initiated, + bool outgoing_connection, fit::closure auth_cb, StatusCallback status_cb) : peer_(std::move(peer)), link_(std::move(link)) { - secure_simple_pairing_state_ = std::make_unique<SecureSimplePairingState>( - peer_, link_, link_initiated, std::move(auth_cb), std::move(status_cb)); + secure_simple_pairing_state_ = + std::make_unique<SecureSimplePairingState>(peer_, + link_, + outgoing_connection, + std::move(auth_cb), + std::move(status_cb)); } void PairingStateManager::InitiatePairing(
diff --git a/pw_bluetooth_sapphire/host/gap/secure_simple_pairing_state.cc b/pw_bluetooth_sapphire/host/gap/secure_simple_pairing_state.cc index 5cf2fe6..6dbb351 100644 --- a/pw_bluetooth_sapphire/host/gap/secure_simple_pairing_state.cc +++ b/pw_bluetooth_sapphire/host/gap/secure_simple_pairing_state.cc
@@ -37,13 +37,13 @@ SecureSimplePairingState::SecureSimplePairingState( Peer::WeakPtr peer, WeakPtr<hci::BrEdrConnection> link, - bool link_initiated, + bool outgoing_connection, fit::closure auth_cb, StatusCallback status_cb) : peer_id_(peer->identifier()), peer_(std::move(peer)), link_(std::move(link)), - outgoing_connection_(link_initiated), + outgoing_connection_(outgoing_connection), peer_missing_key_(false), state_(State::kIdle), send_auth_request_callback_(std::move(auth_cb)), @@ -683,9 +683,9 @@ std::unique_ptr<SecureSimplePairingState::Pairing> SecureSimplePairingState::Pairing::MakeInitiator( - BrEdrSecurityRequirements security_requirements, bool link_initiated) { + BrEdrSecurityRequirements security_requirements, bool outgoing_connection) { // Private ctor is inaccessible to std::make_unique. - std::unique_ptr<Pairing> pairing(new Pairing(link_initiated)); + std::unique_ptr<Pairing> pairing(new Pairing(outgoing_connection)); pairing->initiator = true; pairing->preferred_security = security_requirements; return pairing; @@ -693,9 +693,9 @@ std::unique_ptr<SecureSimplePairingState::Pairing> SecureSimplePairingState::Pairing::MakeResponder( - pw::bluetooth::emboss::IoCapability peer_iocap, bool link_initiated) { + pw::bluetooth::emboss::IoCapability peer_iocap, bool outgoing_connection) { // Private ctor is inaccessible to std::make_unique. - std::unique_ptr<Pairing> pairing(new Pairing(link_initiated)); + std::unique_ptr<Pairing> pairing(new Pairing(outgoing_connection)); pairing->initiator = false; pairing->peer_iocap = peer_iocap; // Don't try to upgrade security as responder.
diff --git a/pw_bluetooth_sapphire/host/gap/secure_simple_pairing_state_test.cc b/pw_bluetooth_sapphire/host/gap/secure_simple_pairing_state_test.cc index 0e0f690..1c3a9ec 100644 --- a/pw_bluetooth_sapphire/host/gap/secure_simple_pairing_state_test.cc +++ b/pw_bluetooth_sapphire/host/gap/secure_simple_pairing_state_test.cc
@@ -169,7 +169,7 @@ TEST_F(PairingStateTest, PairingStateStartsAsResponder) { SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), NoOpStatusCallback); EXPECT_FALSE(pairing_state.initiator()); @@ -178,7 +178,7 @@ TEST_F(PairingStateTest, PairingStateRemainsResponderAfterPeerIoCapResponse) { SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), NoOpStatusCallback); pairing_state.OnIoCapabilityResponse(kTestPeerIoCap); @@ -190,7 +190,7 @@ PairingStateBecomesInitiatorAfterLocalPairingInitiated) { SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), NoOpStatusCallback); NoOpPairingDelegate pairing_delegate(kTestLocalIoCap); @@ -204,7 +204,7 @@ PairingStateSendsAuthenticationRequestOnceForDuplicateRequest) { SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), NoOpStatusCallback); NoOpPairingDelegate pairing_delegate(kTestLocalIoCap); @@ -224,7 +224,7 @@ PairingStateRemainsResponderIfPairingInitiatedWhileResponderPairingInProgress) { SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), NoOpStatusCallback); pairing_state.OnIoCapabilityResponse(kTestPeerIoCap); @@ -252,7 +252,7 @@ pairing_state = std::make_unique<SecureSimplePairingState>(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_cb); @@ -267,7 +267,7 @@ std::unique_ptr<SecureSimplePairingState> pairing_state = std::make_unique<SecureSimplePairingState>(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), NoOpStatusCallback); bool cb_called = false; @@ -343,7 +343,7 @@ SecureSimplePairingState pairing_state( peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), link_status_handler.MakeStatusCallback()); @@ -377,7 +377,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(kTestLocalIoCap); @@ -401,7 +401,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); ASSERT_FALSE(connection()->ltk().has_value()); @@ -423,7 +423,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); connection()->set_link_key(hci_spec::LinkKey(UInt128(), 0, 0), @@ -460,7 +460,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(kTestLocalIoCap); @@ -486,7 +486,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(kTestLocalIoCap); @@ -516,7 +516,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(kTestLocalIoCap); @@ -540,7 +540,7 @@ TEST_F(PairingStateTest, EncryptionChangeToEnableCallsInitiatorCallbacks) { SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), NoOpStatusCallback); NoOpPairingDelegate pairing_delegate(kTestLocalIoCap); @@ -583,7 +583,7 @@ TEST_F(PairingStateTest, InitiatingPairingOnResponderWaitsForPairingToFinish) { SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), NoOpStatusCallback); NoOpPairingDelegate pairing_delegate(kTestLocalIoCap); @@ -630,7 +630,7 @@ { SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), overall_status.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(kTestLocalIoCap); @@ -674,7 +674,7 @@ SecureSimplePairingState pairing_state( peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), owner_status_handler.MakeStatusCallback()); @@ -706,7 +706,7 @@ TestStatusHandler status_handler; SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); @@ -730,7 +730,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kDisplayOnly); @@ -763,7 +763,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -795,7 +795,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -825,7 +825,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kDisplayOnly); @@ -870,7 +870,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kDisplayOnly); @@ -918,7 +918,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); FakePairingDelegate pairing_delegate(sm::IOCapability::kDisplayYesNo); @@ -967,7 +967,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); FakePairingDelegate pairing_delegate(sm::IOCapability::kDisplayYesNo); @@ -1016,7 +1016,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); FakePairingDelegate pairing_delegate(sm::IOCapability::kDisplayYesNo); @@ -1054,7 +1054,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); FakePairingDelegate pairing_delegate(sm::IOCapability::kDisplayOnly); @@ -1094,7 +1094,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); FakePairingDelegate pairing_delegate(sm::IOCapability::kKeyboardOnly); @@ -1142,7 +1142,7 @@ SecureSimplePairingState pairing_state( peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/true, + /*outgoing_connection=*/true, MakeAuthRequestCallback(), owner_status_handler.MakeStatusCallback()); @@ -1181,7 +1181,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/true, + /*outgoing_connection=*/true, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); FakePairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -1215,7 +1215,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); FakePairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -1260,7 +1260,7 @@ SecureSimplePairingState pairing_state( peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), owner_status_handler.MakeStatusCallback()); @@ -1313,7 +1313,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); FakePairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -1353,7 +1353,7 @@ SecureSimplePairingState pairing_state( peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), owner_status_handler.MakeStatusCallback()); @@ -1448,7 +1448,7 @@ pairing_state_ = std::make_unique<SecureSimplePairingState>( peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler_.MakeStatusCallback()); pairing_state().SetPairingDelegate(pairing_delegate_->GetWeakPtr()); @@ -2232,7 +2232,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2259,7 +2259,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2284,7 +2284,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2310,7 +2310,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2329,7 +2329,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2353,7 +2353,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2370,7 +2370,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2395,7 +2395,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2416,7 +2416,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2441,7 +2441,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/true, + /*outgoing_connection=*/true, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); FakePairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2510,7 +2510,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); EXPECT_FALSE(pairing_state.initiator()); @@ -2555,7 +2555,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/true, + /*outgoing_connection=*/true, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); FakePairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2652,7 +2652,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2689,7 +2689,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate(sm::IOCapability::kNoInputNoOutput); @@ -2732,7 +2732,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); NoOpPairingDelegate pairing_delegate_no_io( @@ -2779,7 +2779,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback()); FakePairingDelegate fake_pairing_delegate(sm::IOCapability::kDisplayYesNo); @@ -2868,7 +2868,7 @@ SecureSimplePairingState pairing_state(peer()->GetWeakPtr(), connection()->GetWeakPtr(), - /*link_initiated=*/false, + /*outgoing_connection=*/false, MakeAuthRequestCallback(), status_handler.MakeStatusCallback());
diff --git a/pw_bluetooth_sapphire/public/pw_bluetooth_sapphire/internal/host/gap/pairing_state_manager.h b/pw_bluetooth_sapphire/public/pw_bluetooth_sapphire/internal/host/gap/pairing_state_manager.h index 9c097b8..d6aba9c 100644 --- a/pw_bluetooth_sapphire/public/pw_bluetooth_sapphire/internal/host/gap/pairing_state_manager.h +++ b/pw_bluetooth_sapphire/public/pw_bluetooth_sapphire/internal/host/gap/pairing_state_manager.h
@@ -56,8 +56,8 @@ fit::function<void(hci_spec::ConnectionHandle, hci::Result<>)>; // Constructs a PairingStateManager for the ACL connection |link| to - // |peer_id|. |link_initiated| should be true if this device connected, and - // false if it was an incoming connection. This object will receive + // |peer_id|. |outgoing_connection| should be true if this device connected, + // and false if it was an incoming connection. This object will receive // "encryption change" callbacks associate with |peer_id|. Successful pairing // is reported through |status_cb| after encryption is enabled. When errors // occur, this object will be put in a "failed" state and the owner shall @@ -71,7 +71,7 @@ // |link| must be valid for the lifetime of this object. PairingStateManager(Peer::WeakPtr peer, WeakPtr<hci::BrEdrConnection> link, - bool link_initiated, + bool outgoing_connection, fit::closure auth_cb, StatusCallback status_cb); PairingStateManager(PairingStateManager&&) = default;
diff --git a/pw_bluetooth_sapphire/public/pw_bluetooth_sapphire/internal/host/gap/secure_simple_pairing_state.h b/pw_bluetooth_sapphire/public/pw_bluetooth_sapphire/internal/host/gap/secure_simple_pairing_state.h index 77ea2f4..fbc23c6 100644 --- a/pw_bluetooth_sapphire/public/pw_bluetooth_sapphire/internal/host/gap/secure_simple_pairing_state.h +++ b/pw_bluetooth_sapphire/public/pw_bluetooth_sapphire/internal/host/gap/secure_simple_pairing_state.h
@@ -175,8 +175,8 @@ fit::function<void(hci_spec::ConnectionHandle, hci::Result<>)>; // Constructs a SecureSimplePairingState for the ACL connection |link| to - // |peer_id|. |link_initiated| should be true if this device connected, and - // false if it was an incoming connection. This object will receive + // |peer_id|. |outgoing_connection| should be true if this device connected, + // and false if it was an incoming connection. This object will receive // "encryption change" callbacks associate with |peer_id|. Successful pairing // is reported through |status_cb| after encryption is enabled. When errors // occur, this object will be put in a "failed" state and the owner shall @@ -190,7 +190,7 @@ // |link| must be valid for the lifetime of this object. SecureSimplePairingState(Peer::WeakPtr peer, WeakPtr<hci::BrEdrConnection> link, - bool link_initiated, + bool outgoing_connection, fit::closure auth_cb, StatusCallback status_cb); SecureSimplePairingState(SecureSimplePairingState&&) = default; @@ -342,7 +342,8 @@ class Pairing final { public: static std::unique_ptr<Pairing> MakeInitiator( - BrEdrSecurityRequirements security_requirements, bool link_initiated); + BrEdrSecurityRequirements security_requirements, + bool outgoing_connection); static std::unique_ptr<Pairing> MakeResponder( pw::bluetooth::emboss::IoCapability peer_iocap, bool link_inititated); // Make a responder for a peer that has initiated a pairing (asked for our