mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-06 19:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle malloc failure for rfcomm_multiplexer in event handler, malloc multiplexer on incoming connection instead on channel open to be able to decline, use proper result code for l2cap connection response decline

Browse Source
This commit is contained in:
matthias.ringwald 2011-07-25 20:26:14 +00:00
parent 277abc2cc0
commit 034e059cb4
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/rfcomm.c
View File

@ -608,18 +608,28 @@ static int rfcomm_multiplexer_hci_event_handler(uint8_t *packet, uint16_t size){
if (psm != PSM_RFCOMM) break; if (psm != PSM_RFCOMM) break;
l2cap_cid = READ_BT_16(packet, 12); l2cap_cid = READ_BT_16(packet, 12);
multiplexer = rfcomm_multiplexer_for_addr(&event_addr); multiplexer = rfcomm_multiplexer_for_addr(&event_addr);
log_info("L2CAP_EVENT_INCOMING_CONNECTION (l2cap_cid 0x%02x) for PSM_RFCOMM from ", l2cap_cid);
if (multiplexer) { if (multiplexer) {
log_info(" => decline\n"); log_info("INCOMING_CONNECTION (l2cap_cid 0x%02x) for PSM_RFCOMM => decline - multiplexer already exists", l2cap_cid);
// bt_send_cmd(&l2cap_decline_connection, l2cap_cid); l2cap_decline_connection_internal(l2cap_cid, 0x04); // no resources available
l2cap_decline_connection_internal(l2cap_cid, 0x13); return 1;
} else {
log_info(" => accept\n");
// bt_send_cmd(&l2cap_accept_connection, l2cap_cid);
l2cap_accept_connection_internal(l2cap_cid);
} }
break;
// create and inititialize new multiplexer instance (incoming)
multiplexer = rfcomm_multiplexer_create_for_addr(&event_addr);
if (!multiplexer){
log_info("INCOMING_CONNECTION (l2cap_cid 0x%02x) for PSM_RFCOMM => decline - no memory left", l2cap_cid);
l2cap_decline_connection_internal(l2cap_cid, 0x04); // no resources available
return 1;
}
multiplexer->con_handle = con_handle;
multiplexer->l2cap_cid = l2cap_cid;
multiplexer->state = RFCOMM_MULTIPLEXER_W4_SABM_0;
log_info("L2CAP_EVENT_INCOMING_CONNECTION (l2cap_cid 0x%02x) for PSM_RFCOMM => accept", l2cap_cid);
l2cap_accept_connection_internal(l2cap_cid);
return 1;
// l2cap connection opened -> store l2cap_cid, remote_addr // l2cap connection opened -> store l2cap_cid, remote_addr
case L2CAP_EVENT_CHANNEL_OPENED: case L2CAP_EVENT_CHANNEL_OPENED:
@ -630,30 +640,26 @@ static int rfcomm_multiplexer_hci_event_handler(uint8_t *packet, uint16_t size){
l2cap_cid = READ_BT_16(packet, 13); l2cap_cid = READ_BT_16(packet, 13);
bt_flip_addr(event_addr, &packet[3]); bt_flip_addr(event_addr, &packet[3]);
multiplexer = rfcomm_multiplexer_for_addr(&event_addr); multiplexer = rfcomm_multiplexer_for_addr(&event_addr);
if (multiplexer) { if (!multiplexer) {
log_error("L2CAP_EVENT_CHANNEL_OPENED but no multiplexer prepared\n");
return 1;
}
if (multiplexer->state == RFCOMM_MULTIPLEXER_W4_CONNECT) { if (multiplexer->state == RFCOMM_MULTIPLEXER_W4_CONNECT) {
log_info("L2CAP_EVENT_CHANNEL_OPENED: outgoing connection A\n"); log_info("L2CAP_EVENT_CHANNEL_OPENED: outgoing connection\n");
// wrong remote addr // wrong remote addr
if (BD_ADDR_CMP(event_addr, multiplexer->remote_addr)) break; if (BD_ADDR_CMP(event_addr, multiplexer->remote_addr)) break;
multiplexer->l2cap_cid = l2cap_cid; multiplexer->l2cap_cid = l2cap_cid;
multiplexer->con_handle = con_handle; multiplexer->con_handle = con_handle;
// send SABM #0 // send SABM #0
multiplexer->state = RFCOMM_MULTIPLEXER_SEND_SABM_0; multiplexer->state = RFCOMM_MULTIPLEXER_SEND_SABM_0;
return 1; } else {
} // multiplexer->state == RFCOMM_MULTIPLEXER_W4_SABM_0
log_info("L2CAP_EVENT_CHANNEL_OPENED: multiplexer already exists\n"); //
// single multiplexer per baseband connection // get max frame size from l2cap MTU
break;
}
log_info("L2CAP_EVENT_CHANNEL_OPENED: create incoming multiplexer for channel %02x\n", l2cap_cid);
// create and inititialize new multiplexer instance (incoming)
// - Max RFCOMM header has 6 bytes (P/F bit is set, payload length >= 128) // - Max RFCOMM header has 6 bytes (P/F bit is set, payload length >= 128)
// - therefore, we set RFCOMM max frame size <= Local L2CAP MTU - 6 // - therefore, we set RFCOMM max frame size <= Local L2CAP MTU - 6
multiplexer = rfcomm_multiplexer_create_for_addr(&event_addr);
multiplexer->con_handle = con_handle;
multiplexer->l2cap_cid = l2cap_cid;
multiplexer->state = RFCOMM_MULTIPLEXER_W4_SABM_0;
multiplexer->max_frame_size = READ_BT_16(packet, 17) - 6; multiplexer->max_frame_size = READ_BT_16(packet, 17) - 6;
}
return 1; return 1;
// l2cap disconnect -> state = RFCOMM_MULTIPLEXER_CLOSED; // l2cap disconnect -> state = RFCOMM_MULTIPLEXER_CLOSED;