mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-03 10:20:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

introduce a packet handler pointer to l2cap services and channels, unset for now

Browse Source
This commit is contained in:
matthias.ringwald 2010-06-09 15:31:46 +00:00
parent 378e197db2
commit b5a49eb182
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/l2cap.c
View File

@ -126,6 +126,7 @@ void l2cap_create_channel_internal(connection_t * connection, bd_addr_t address,
chan->psm = psm; chan->psm = psm;
chan->handle = 0; chan->handle = 0;
chan->connection = connection; chan->connection = connection;
chan->packet_handler = NULL;
// set initial state // set initial state
chan->state = L2CAP_STATE_CLOSED; chan->state = L2CAP_STATE_CLOSED;
@ -286,7 +287,8 @@ static void l2cap_handle_connection_request(hci_con_handle_t handle, uint8_t sig
channel->connection = service->connection; channel->connection = service->connection;
channel->local_cid = l2cap_next_local_cid(); channel->local_cid = l2cap_next_local_cid();
channel->remote_cid = source_cid; channel->remote_cid = source_cid;
channel->packet_handler = NULL;
// set initial state // set initial state
channel->state = L2CAP_STATE_WAIT_CLIENT_ACCEPT_OR_REJECT; channel->state = L2CAP_STATE_WAIT_CLIENT_ACCEPT_OR_REJECT;
@ -601,6 +603,8 @@ void l2cap_register_service_internal(connection_t *connection, uint16_t psm, uin
service->psm = psm; service->psm = psm;
service->mtu = mtu; service->mtu = mtu;
service->connection = connection; service->connection = connection;
service->packet_handler = NULL;
// add to services list // add to services list
linked_list_add(&l2cap_services, (linked_item_t *) service); linked_list_add(&l2cap_services, (linked_item_t *) service);
@ -641,7 +645,15 @@ void l2cap_close_connection(connection_t *connection){
} }
} }
// notify client // notify client/protocol handler
void l2cap_dispatch(l2cap_channel_t *channel, uint8_t type, uint8_t * data, uint16_t size){
if (channel->packet_handler) {
} else {
(*event_packet_handler)(channel->connection, data, size);
}
}
void l2cap_emit_channel_opened(l2cap_channel_t *channel, uint8_t status) { void l2cap_emit_channel_opened(l2cap_channel_t *channel, uint8_t status) {
uint8_t event[17]; uint8_t event[17];
event[0] = L2CAP_EVENT_CHANNEL_OPENED; event[0] = L2CAP_EVENT_CHANNEL_OPENED;
@ -653,7 +665,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, 13, channel->local_cid);
bt_store_16(event, 15, channel->remote_cid); bt_store_16(event, 15, channel->remote_cid);
hci_dump_packet( HCI_EVENT_PACKET, 0, event, sizeof(event)); hci_dump_packet( HCI_EVENT_PACKET, 0, event, sizeof(event));
(*event_packet_handler)(channel->connection, event, sizeof(event)); l2cap_dispatch(channel, HCI_EVENT_PACKET, event, sizeof(event));
} }
void l2cap_emit_channel_closed(l2cap_channel_t *channel) { void l2cap_emit_channel_closed(l2cap_channel_t *channel) {
@ -662,7 +674,7 @@ void l2cap_emit_channel_closed(l2cap_channel_t *channel) {
event[1] = sizeof(event) - 2; event[1] = sizeof(event) - 2;
bt_store_16(event, 2, channel->local_cid); bt_store_16(event, 2, channel->local_cid);
hci_dump_packet( HCI_EVENT_PACKET, 0, event, sizeof(event)); hci_dump_packet( HCI_EVENT_PACKET, 0, event, sizeof(event));
(*event_packet_handler)(channel->connection, event, sizeof(event)); l2cap_dispatch(channel, HCI_EVENT_PACKET, event, sizeof(event));
} }
void l2cap_emit_connection_request(l2cap_channel_t *channel) { void l2cap_emit_connection_request(l2cap_channel_t *channel) {
@ -675,7 +687,7 @@ void l2cap_emit_connection_request(l2cap_channel_t *channel) {
bt_store_16(event, 12, channel->local_cid); bt_store_16(event, 12, channel->local_cid);
bt_store_16(event, 14, channel->remote_cid); bt_store_16(event, 14, channel->remote_cid);
hci_dump_packet( HCI_EVENT_PACKET, 0, event, sizeof(event)); hci_dump_packet( HCI_EVENT_PACKET, 0, event, sizeof(event));
(*event_packet_handler)(channel->connection, event, sizeof(event)); l2cap_dispatch(channel, HCI_EVENT_PACKET, event, sizeof(event));
} }
void l2cap_send_internal(uint16_t local_cid, uint8_t *data, uint16_t len){ void l2cap_send_internal(uint16_t local_cid, uint8_t *data, uint16_t len){

16
src/l2cap.h
View File

@ -42,6 +42,7 @@
#include "hci.h" #include "hci.h"
#include "l2cap_signaling.h" #include "l2cap_signaling.h"
#include <btstack/utils.h> #include <btstack/utils.h>
#include <btstack/btstack.h>
#include "socket_connection.h" #include "socket_connection.h"
#define L2CAP_SIG_ID_INVALID 0 #define L2CAP_SIG_ID_INVALID 0
@ -69,11 +70,18 @@ typedef struct {
bd_addr_t address; bd_addr_t address;
uint16_t psm; uint16_t psm;
hci_con_handle_t handle; hci_con_handle_t handle;
connection_t *connection;
// uint16_t mtu_incoming; // uint16_t mtu_incoming;
// uint16_t mtu_outgoing; // uint16_t mtu_outgoing;
// uint16_t flush_timeout_incoming; // uint16_t flush_timeout_incoming;
// uint16_t flush_timeout_outgoing; // uint16_t flush_timeout_outgoing;
// client connection
connection_t * connection;
// internal connection
btstack_packet_handler_t * packet_handler;
} l2cap_channel_t; } l2cap_channel_t;
// info regarding potential connections // info regarding potential connections
@ -87,8 +95,12 @@ typedef struct {
// incoming MTU // incoming MTU
uint16_t mtu; uint16_t mtu;
// provider for this server // client connection
connection_t *connection; connection_t *connection;
// internal connection
btstack_packet_handler_t * packet_handler;
} l2cap_service_t; } l2cap_service_t;
void l2cap_init(); void l2cap_init();