mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-16 08:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

added basic link key management

Browse Source
This commit is contained in:
matthias.ringwald 2010-04-27 19:29:17 +00:00
parent 84dd0a24e1
commit c9f5e5e754
2 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CocoaTouch/include/BTstack/BTstackManager.h
View File

@ -117,6 +117,9 @@ typedef enum {
-(BTDevice*) deviceAtIndex:(int)index; -(BTDevice*) deviceAtIndex:(int)index;
-(BOOL) isDiscoveryActive; -(BOOL) isDiscoveryActive;
// Link Key Management
-(void) dropLinkKeyForAddress:(bd_addr_t*) address;
// Connections // Connections
-(BTstackError) createL2CAPChannelAtAddress:(bd_addr_t*) address withPSM:(uint16_t)psm authenticated:(BOOL)authentication; -(BTstackError) createL2CAPChannelAtAddress:(bd_addr_t*) address withPSM:(uint16_t)psm authenticated:(BOOL)authentication;
-(BTstackError) closeL2CAPChannelWithID:(uint16_t) channelID; -(BTstackError) closeL2CAPChannelWithID:(uint16_t) channelID;
@ -126,6 +129,7 @@ typedef enum {
-(BTstackError) closeRFCOMMConnectionWithID:(uint16_t) connectionID; -(BTstackError) closeRFCOMMConnectionWithID:(uint16_t) connectionID;
-(BTstackError) sendRFCOMMPacketForChannelID:(uint16_t)connectionID; -(BTstackError) sendRFCOMMPacketForChannelID:(uint16_t)connectionID;
// TODO add l2cap and rfcomm incoming commands // TODO add l2cap and rfcomm incoming commands
// store remote names and link keys // store remote names and link keys

57
CocoaTouch/src/BTstackManager.m
View File

@ -496,6 +496,45 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
} }
} }
-(void) handleLinkKeyRequestEvent:(uint8_t *)packet withLen:(uint16_t) len {
bd_addr_t event_addr;
bt_flip_addr(event_addr, &packet[2]);
// get link key from deviceInfo
NSString *devAddress = devAddress = [BTDevice stringForAddress:&event_addr];
NSMutableDictionary * deviceDict = [deviceInfo objectForKey:devAddress];
NSData *linkKey = nil;
if (deviceDict){
linkKey = [deviceDict objectForKey:PREFS_LINK_KEY];
}
if (linkKey) {
NSLog(@"Sending link key for %@, value %@", devAddress, linkKey);
bt_send_cmd(&hci_link_key_request_reply, &event_addr, [linkKey bytes]);
} else {
bt_send_cmd(&hci_link_key_request_negative_reply, &event_addr);
}
}
-(void) handleLinkKeyNotificationEvent:(uint8_t *)packet withLen:(uint16_t) len {
bd_addr_t event_addr;
bt_flip_addr(event_addr, &packet[2]);
NSString *devAddress = [BTDevice stringForAddress:&event_addr];
NSData *linkKey = [NSData dataWithBytes:&packet[8] length:16];
NSMutableDictionary * deviceDict = [deviceInfo objectForKey:devAddress];
if (!deviceDict){
deviceDict = [NSMutableDictionary dictionaryWithCapacity:3];
[deviceInfo setObject:deviceDict forKey:devAddress];
}
[deviceDict setObject:linkKey forKey:PREFS_LINK_KEY];
NSLog(@"Adding link key for %@, value %@", devAddress, linkKey);
}
-(void) dropLinkKeyForAddress:(bd_addr_t*) address {
NSString *devAddress = [BTDevice stringForAddress:address];
NSMutableDictionary * deviceDict = [deviceInfo objectForKey:devAddress];
[deviceDict removeObjectForKey:PREFS_LINK_KEY];
NSLog(@"Removing link key for %@", devAddress);
}
-(void) handlePacketWithType:(uint8_t)packet_type forChannel:(uint16_t)channel andData:(uint8_t *)packet withLen:(uint16_t) size { -(void) handlePacketWithType:(uint8_t)packet_type forChannel:(uint16_t)channel andData:(uint8_t *)packet withLen:(uint16_t) size {
switch (state) { switch (state) {
@ -507,12 +546,24 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
case kW4SysBTDisabled: case kW4SysBTDisabled:
case kW4Activated: case kW4Activated:
case kW4Deactivated: case kW4Deactivated:
if (packet_type == HCI_EVENT_PACKET) [self activationHandleEvent:packet withLen:size]; if (packet_type != HCI_EVENT_PACKET) break;
[self activationHandleEvent:packet withLen:size];
break; break;
// Discovery // Pairing + Discovery
case kActivated: case kActivated:
if (packet_type == HCI_EVENT_PACKET) [self discoveryHandleEvent:packet withLen:size]; if (packet_type != HCI_EVENT_PACKET) break;
switch (packet[0]){
case HCI_EVENT_LINK_KEY_REQUEST:
[self handleLinkKeyRequestEvent:packet withLen:size];
break;
case HCI_EVENT_LINK_KEY_NOTIFICATION:
[self handleLinkKeyNotificationEvent:packet withLen:size];
break;
default:
break;
}
[self discoveryHandleEvent:packet withLen:size];
break; break;
default: default: