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

Refactor L2CAP data and event send

Browse Source
This commit is contained in:
matthias.ringwald 2010-04-05 22:47:52 +00:00
parent 6eb71891e9
commit 0d5a78db31
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/daemon.c
View File

@ -211,7 +211,7 @@ static int daemon_client_handler(connection_t *connection, uint16_t packet_type,
return 0;
}
static void daemon_event_handler(uint8_t *packet, uint16_t size){
static void daemon_event_handler(connection_t *connection, uint8_t *packet, uint16_t size){
// local cache
static HCI_STATE hci_state = HCI_STATE_OFF;
static int num_connections = 0;
@ -247,8 +247,16 @@ static void daemon_event_handler(uint8_t *packet, uint16_t size){
}
}
// forward event to clients
socket_connection_send_packet_all(HCI_EVENT_PACKET, 0, packet, size);
// forward event to client(s)
if (connection) {
socket_connection_send_packet(connection, HCI_EVENT_PACKET, 0, packet, size);
} else {
socket_connection_send_packet_all(HCI_EVENT_PACKET, 0, packet, size);
}
}
static void daemon_data_handler(connection_t * connection, uint16_t local_cid, uint8_t *packet, uint16_t size){
socket_connection_send_packet(connection, L2CAP_DATA_PACKET, local_cid, packet, size);
}
static void daemon_sigint_handler(int param){
@ -341,6 +349,7 @@ int main (int argc, char * const * argv){
// init L2CAP
l2cap_init();
l2cap_register_data_packet_handler(daemon_data_handler);
l2cap_register_event_packet_handler(daemon_event_handler);
timeout.process = daemon_no_connections_timeout;

32
src/l2cap.c
View File

@ -49,15 +49,15 @@
// size of HCI ACL + L2CAP Header for regular data packets
#define COMPLETE_L2CAP_HEADER 8
static void null_event_handler(uint8_t *packet, uint16_t size);
static void null_data_handler(uint16_t local_cid, uint8_t *packet, uint16_t size);
static void null_event_handler(connection_t * connection, uint8_t *packet, uint16_t size);
static void null_data_handler(connection_t * connection, uint16_t local_cid, uint8_t *packet, uint16_t size);
static uint8_t * sig_buffer = NULL;
static linked_list_t l2cap_channels = NULL;
static linked_list_t l2cap_services = NULL;
static uint8_t * acl_buffer = NULL;
static void (*event_packet_handler) (uint8_t *packet, uint16_t size) = null_event_handler;
static void (*data_packet_handler) (uint16_t local_cid, uint8_t *packet, uint16_t size) = null_data_handler;
static void (*event_packet_handler) (connection_t * connection, uint8_t *packet, uint16_t size) = null_event_handler;
static void (*data_packet_handler) (connection_t * connection, uint16_t local_cid, uint8_t *packet, uint16_t size) = null_data_handler;
static connection_t * capture_connection = NULL;
static uint8_t config_options[] = { 1, 2, 150, 0}; // mtu = 48
@ -75,14 +75,14 @@ void l2cap_init(){
/** Register L2CAP packet handlers */
static void null_event_handler(uint8_t *packet, uint16_t size){
static void null_event_handler(connection_t * connection, uint8_t *packet, uint16_t size){
}
static void null_data_handler(uint16_t local_cid, uint8_t *packet, uint16_t size){
static void null_data_handler(connection_t * connection, uint16_t local_cid, uint8_t *packet, uint16_t size){
}
void l2cap_register_event_packet_handler(void (*handler)(uint8_t *packet, uint16_t size)){
void l2cap_register_event_packet_handler(void (*handler)(connection_t * connection, uint8_t *packet, uint16_t size)){
event_packet_handler = handler;
}
void l2cap_register_data_packet_handler (void (*handler)(uint16_t local_cid, uint8_t *packet, uint16_t size)){
void l2cap_register_data_packet_handler (void (*handler)(connection_t * connection, uint16_t local_cid, uint8_t *packet, uint16_t size)){
data_packet_handler = handler;
}
@ -242,7 +242,7 @@ void l2cap_event_handler( uint8_t *packet, uint16_t size ){
}
// pass on
(*event_packet_handler)(packet, size);
(*event_packet_handler)(NULL, packet, size);
}
static void l2cap_handle_disconnect_request(l2cap_channel_t *channel, uint16_t identifier){
@ -538,7 +538,7 @@ void l2cap_emit_channel_opened(l2cap_channel_t *channel, uint8_t status) {
bt_store_16(event, 13, channel->local_cid);
bt_store_16(event, 15, channel->remote_cid);
hci_dump_packet( HCI_EVENT_PACKET, 0, event, sizeof(event));
socket_connection_send_packet(channel->connection, HCI_EVENT_PACKET, 0, event, sizeof(event));
(*event_packet_handler)(channel->connection, event, sizeof(event));
}
void l2cap_emit_channel_closed(l2cap_channel_t *channel) {
@ -547,7 +547,7 @@ void l2cap_emit_channel_closed(l2cap_channel_t *channel) {
event[1] = sizeof(event) - 2;
bt_store_16(event, 2, channel->local_cid);
hci_dump_packet( HCI_EVENT_PACKET, 0, event, sizeof(event));
socket_connection_send_packet(channel->connection, HCI_EVENT_PACKET, 0, event, sizeof(event));
(*event_packet_handler)(channel->connection, event, sizeof(event));
}
void l2cap_emit_connection_request(l2cap_channel_t *channel) {
@ -560,20 +560,17 @@ void l2cap_emit_connection_request(l2cap_channel_t *channel) {
bt_store_16(event, 12, channel->local_cid);
bt_store_16(event, 14, channel->remote_cid);
hci_dump_packet( HCI_EVENT_PACKET, 0, event, sizeof(event));
socket_connection_send_packet(channel->connection, HCI_EVENT_PACKET, 0, event, sizeof(event));
(*event_packet_handler)(channel->connection, event, sizeof(event));
}
void l2cap_acl_handler( uint8_t *packet, uint16_t size ){
// Capturing?
if (capture_connection) {
socket_connection_send_packet(capture_connection, HCI_ACL_DATA_PACKET, 0, packet, size);
(*data_packet_handler)(capture_connection, 0, packet, size);
return;
}
// forward to higher layers - not needed yet
// (*data_packet_handler)(channel_id, packet, size);
// Get Channel ID and command code
uint16_t channel_id = READ_L2CAP_CHANNEL_ID(packet);
uint8_t code = READ_L2CAP_SIGNALING_CODE( packet );
@ -629,8 +626,7 @@ void l2cap_acl_handler( uint8_t *packet, uint16_t size ){
// Find channel for this channel_id and connection handle
l2cap_channel_t * channel = l2cap_get_channel_for_local_cid(channel_id);
if (channel) {
socket_connection_send_packet(channel->connection, L2CAP_DATA_PACKET, channel_id,
&packet[COMPLETE_L2CAP_HEADER], size-COMPLETE_L2CAP_HEADER);
(*data_packet_handler)(channel->connection, channel_id, &packet[COMPLETE_L2CAP_HEADER], size-COMPLETE_L2CAP_HEADER);
}
}

3
src/l2cap.h
View File

@ -92,7 +92,8 @@ typedef struct {
} l2cap_service_t;
void l2cap_init();
void l2cap_register_event_packet_handler(void (*handler)(uint8_t *packet, uint16_t size));
void l2cap_register_event_packet_handler(void (*handler)(connection_t * connection, uint8_t *packet, uint16_t size));
void l2cap_register_data_packet_handler(void (*handler)(connection_t * connection, uint16_t local_cid, uint8_t *packet, uint16_t size));
void l2cap_create_channel_internal(connection_t * connection, bd_addr_t address, uint16_t psm);
void l2cap_disconnect_internal(uint16_t local_cid, uint8_t reason);
void l2cap_send_internal(uint16_t local_cid, uint8_t *data, uint16_t len);