fix error type name and unified connection handle name

pull/6188/head
paul-szczepanek-arm 2018-01-16 11:15:39 +00:00
parent 52669fff98
commit daab0b4fe1
1 changed files with 24 additions and 24 deletions

View File

@ -150,7 +150,7 @@ public:
* Called when the application should display a passkey. * Called when the application should display a passkey.
*/ */
virtual void on_passkey_display( virtual void on_passkey_display(
connection_handle_t handle, const passkey_t& passkey connection_handle_t connection, const passkey_t& passkey
) = 0; ) = 0;
/** /**
@ -159,7 +159,7 @@ public:
* @note shall be followed by: pal::SecurityManager::passkey_request_reply * @note shall be followed by: pal::SecurityManager::passkey_request_reply
* or a cancellation of the procedure. * or a cancellation of the procedure.
*/ */
virtual void on_passkey_request(connection_handle_t handle) = 0; virtual void on_passkey_request(connection_handle_t connection) = 0;
/** /**
* Request oob data entered during pairing * Request oob data entered during pairing
@ -167,38 +167,38 @@ public:
* @note shall be followed by: pal::SecurityManager::oob_data_request_reply * @note shall be followed by: pal::SecurityManager::oob_data_request_reply
* or a cancellation of the procedure. * or a cancellation of the procedure.
*/ */
virtual void on_oob_data_request(connection_handle_t handle) = 0; virtual void on_oob_data_request(connection_handle_t connection) = 0;
virtual void security_setup_initiated( virtual void security_setup_initiated(
connection_handle_t handle, connection_handle_t connection,
bool allow_bonding, bool allow_bonding,
bool require_mitm, bool require_mitm,
io_capability_t iocaps io_capability_t iocaps
) = 0; ) = 0;
virtual void security_setup_completed( virtual void security_setup_completed(
connection_handle_t handle, connection_handle_t connection,
SecurityManager::SecurityCompletionStatus_t status SecurityManager::SecurityCompletionStatus_t status
) = 0; ) = 0;
virtual void link_secured( virtual void link_secured(
connection_handle_t handle, SecurityManager::SecurityMode_t security_mode connection_handle_t connection, SecurityManager::SecurityMode_t security_mode
) = 0; ) = 0;
virtual void valid_mic_timeout(connection_handle_t handle) = 0; virtual void valid_mic_timeout(connection_handle_t connection) = 0;
virtual void link_key_failure(connection_handle_t handle) = 0; virtual void link_key_failure(connection_handle_t connection) = 0;
virtual void keypress_notification(connection_handle_t handle, SecurityManager::Keypress_t keypress) = 0; virtual void keypress_notification(connection_handle_t connection, SecurityManager::Keypress_t keypress) = 0;
virtual void legacy_pariring_oob_request(connection_handle_t handle) = 0; virtual void legacy_pariring_oob_request(connection_handle_t connection) = 0;
virtual void confirmation_request(connection_handle_t handle) = 0; virtual void confirmation_request(connection_handle_t connection) = 0;
virtual void keys_exchanged( virtual void keys_exchanged(
connection_handle_t handle, connection_handle_t connection,
advertising_peer_address_type_t peer_identity_address_type, advertising_peer_address_type_t peer_identity_address_type,
address_t &peer_identity_address, address_t &peer_identity_address,
ediv_t &ediv, ediv_t &ediv,
@ -209,7 +209,7 @@ public:
) = 0; ) = 0;
virtual void ltk_request( virtual void ltk_request(
connection_handle_t handle, connection_handle_t connection,
ediv_t &ediv, ediv_t &ediv,
rand_t &rand rand_t &rand
) = 0; ) = 0;
@ -305,19 +305,19 @@ public:
// Encryption // Encryption
// //
virtual ble_error_t enable_encryption(connection_handle_t handle) = 0; virtual ble_error_t enable_encryption(connection_handle_t connection) = 0;
virtual ble_error_t disable_encryption(connection_handle_t handle) = 0; virtual ble_error_t disable_encryption(connection_handle_t connection) = 0;
virtual ble_error_t get_encryption_status( virtual ble_error_t get_encryption_status(
connection_handle_t handle, LinkSecurityStatus_t &status connection_handle_t connection, LinkSecurityStatus_t &status
) = 0; ) = 0;
virtual ble_error_t get_encryption_key_size( virtual ble_error_t get_encryption_key_size(
connection_handle_t, uint8_t &bitsize connection_handle_t, uint8_t &bitsize
) = 0; ) = 0;
virtual ble_error_t refresh_encryption_key(connection_handle_t handle) = 0; virtual ble_error_t refresh_encryption_key(connection_handle_t connection) = 0;
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Privacy // Privacy
@ -329,7 +329,7 @@ public:
// Keys // Keys
// //
virtual ble_error_t set_ltk(connection_handle_t handle, ltk_t ltk) = 0; virtual ble_error_t set_ltk(connection_handle_t connection, ltk_t ltk) = 0;
/** /**
* Set the local IRK * Set the local IRK
@ -385,10 +385,10 @@ public:
* @see BLUETOOTH SPECIFICATION Version 5.0 | Vol 3, Part H - 3.5.5 * @see BLUETOOTH SPECIFICATION Version 5.0 | Vol 3, Part H - 3.5.5
*/ */
virtual ble_error_t cancel_pairing( virtual ble_error_t cancel_pairing(
connection_handle_t handle, pairing_failed_reason_t reason connection_handle_t connection, pairing_failure_t reason
) = 0; ) = 0;
virtual ble_error_t request_authentication(connection_handle_t handle) = 0; virtual ble_error_t request_authentication(connection_handle_t connection) = 0;
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// MITM // MITM
@ -398,23 +398,23 @@ public:
* Reply to a passkey request received from the SecurityManagerEventHandler. * Reply to a passkey request received from the SecurityManagerEventHandler.
*/ */
virtual ble_error_t passkey_request_reply( virtual ble_error_t passkey_request_reply(
connection_handle_t handle, const passkey_t& passkey connection_handle_t connection, const passkey_t& passkey
) = 0; ) = 0;
/** /**
* Reply to an oob data request received from the SecurityManagerEventHandler. * Reply to an oob data request received from the SecurityManagerEventHandler.
*/ */
virtual ble_error_t oob_data_request_reply( virtual ble_error_t oob_data_request_reply(
connection_handle_t handle, const oob_data_t& oob_data connection_handle_t connection, const oob_data_t& oob_data
) = 0; ) = 0;
virtual ble_error_t confirmation_entered( virtual ble_error_t confirmation_entered(
connection_handle_t handle, bool confirmation connection_handle_t connection, bool confirmation
) = 0; ) = 0;
virtual ble_error_t send_keypress_notification( virtual ble_error_t send_keypress_notification(
connection_handle_t handle, Keypress_t keypress connection_handle_t connection, Keypress_t keypress
) = 0; ) = 0;
/* Entry points for the underlying stack to report events back to the user. */ /* Entry points for the underlying stack to report events back to the user. */