Schoumi/BLE_API
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

minor renames around securitySetup

Browse source
This commit is contained in:
Rohit Grover 2015-05-08 11:55:56 +01:00
parent 9cdae9625b
commit 689848a5dd
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
public/BLEDevice.h
View file

@ -333,13 +333,13 @@ public:
/**
* Setup a callback for when the security procedure for a link has started.
*/
void onSecurityProcedureInitiated(Gap::SecurityProcedureInitiatedCallback_t callback);
void onSecurityProcedureInitiated(Gap::SecuritySetupInitiatedCallback_t callback);
/**
* Setup a callback for when the security procedure for a link has
* completed.
*/
void onSecurityProcedureCompleted(Gap::SecurityProcedureCompletedCallback_t callback);
void onSecurityProcedureCompleted(Gap::SecuritySetupCompletedCallback_t callback);
/**
* Setup a callback for when a link with the peer is secured. For bonded
@ -768,13 +768,13 @@ BLEDevice::onRadioNotification(Gap::RadioNotificationEventCallback_t callback)
}
inline void
BLEDevice::onSecurityProcedureInitiated(Gap::SecurityProcedureInitiatedCallback_t callback)
BLEDevice::onSecurityProcedureInitiated(Gap::SecuritySetupInitiatedCallback_t callback)
{
transport->getGap().setOnSecurityProcedureInitiated(callback);
}
inline void
BLEDevice::onSecurityProcedureCompleted(Gap::SecurityProcedureCompletedCallback_t callback)
BLEDevice::onSecurityProcedureCompleted(Gap::SecuritySetupCompletedCallback_t callback)
{
transport->getGap().setOnSecurityProcedureCompleted(callback);
}

32
public/Gap.h
View file

@ -136,8 +136,8 @@ public:
typedef void (*HandleSpecificEvent_t)(Handle_t handle);
typedef void (*DisconnectionEventCallback_t)(Handle_t, DisconnectionReason_t);
typedef void (*RadioNotificationEventCallback_t) (bool radio_active); /* gets passed true for ACTIVE; false for INACTIVE. */
typedef void (*SecurityProcedureInitiatedCallback_t)(Handle_t, bool allowBonding, bool requireMITM, SecurityIOCapabilities_t iocaps);
typedef void (*SecurityProcedureCompletedCallback_t)(Handle_t, SecurityCompletionStatus_t status);
typedef void (*SecuritySetupInitiatedCallback_t)(Handle_t, bool allowBonding, bool requireMITM, SecurityIOCapabilities_t iocaps);
typedef void (*SecuritySetupCompletedCallback_t)(Handle_t, SecurityCompletionStatus_t status);
typedef void (*LinkSecuredCallback_t)(Handle_t handle, SecurityMode_t securityMode);
friend class BLEDevice;
@ -186,12 +186,12 @@ protected:
/**
* To indicate that security procedure for link has started.
*/
virtual void setOnSecurityProcedureInitiated(SecurityProcedureInitiatedCallback_t callback) {onSecurityProcedureInitiated = callback;}
virtual void setOnSecurityProcedureInitiated(SecuritySetupInitiatedCallback_t callback) {onSecurityProcedureInitiated = callback;}
/**
* To indicate that security procedure for link has completed.
*/
virtual void setOnSecurityProcedureCompleted(SecurityProcedureCompletedCallback_t callback) {onSecurityProcedureCompleted = callback;}
virtual void setOnSecurityProcedureCompleted(SecuritySetupCompletedCallback_t callback) {onSecurityProcedureCompleted = callback;}
/**
* To indicate that link with the peer is secured. For bonded devices,
@ -257,13 +257,13 @@ public:
disconnectionCallChain.call();
}
void processSecurityProcedureInitiatedEvent(Handle_t handle, bool allowBonding, bool requireMITM, SecurityIOCapabilities_t iocaps) {
void processSecuritySetupInitiatedEvent(Handle_t handle, bool allowBonding, bool requireMITM, SecurityIOCapabilities_t iocaps) {
if (onSecurityProcedureInitiated) {
onSecurityProcedureInitiated(handle, allowBonding, requireMITM, iocaps);
}
}
void processSecurityProcedureCompletedEvent(Handle_t handle, SecurityCompletionStatus_t status) {
void processSecuritySetupCompletedEvent(Handle_t handle, SecurityCompletionStatus_t status) {
if (onSecurityProcedureCompleted) {
onSecurityProcedureCompleted(handle, status);
}
@ -295,18 +295,18 @@ public:
}
protected:
GapState_t state;
GapState_t state;
protected:
EventCallback_t onTimeout;
ConnectionEventCallback_t onConnection;
DisconnectionEventCallback_t onDisconnection;
RadioNotificationEventCallback_t onRadioNotification;
SecurityProcedureInitiatedCallback_t onSecurityProcedureInitiated;
SecurityProcedureCompletedCallback_t onSecurityProcedureCompleted;
LinkSecuredCallback_t onLinkSecured;
HandleSpecificEvent_t onSecurityContextStored;
CallChain disconnectionCallChain;
EventCallback_t onTimeout;
ConnectionEventCallback_t onConnection;
DisconnectionEventCallback_t onDisconnection;
RadioNotificationEventCallback_t onRadioNotification;
SecuritySetupInitiatedCallback_t onSecurityProcedureInitiated;
SecuritySetupCompletedCallback_t onSecurityProcedureCompleted;
LinkSecuredCallback_t onLinkSecured;
HandleSpecificEvent_t onSecurityContextStored;
CallChain disconnectionCallChain;
private:
/* disallow copy and assignment */