mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-11 00:40:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved handling of incoming channel to channel state machine

Browse Source
This commit is contained in:
matthias.ringwald 2011-07-05 16:58:18 +00:00
parent ebe1d7cd5b
commit abec21804c
1 changed files with 87 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/rfcomm.c
View File

@ -137,6 +137,9 @@ typedef enum {
CH_EVT_RCVD_UA, CH_EVT_RCVD_UA,
CH_EVT_RCVD_PN, CH_EVT_RCVD_PN,
CH_EVT_RCVD_PN_RSP, CH_EVT_RCVD_PN_RSP,
CH_EVT_RCVD_DISC,
CH_EVT_RCVD_DM,
} RFCOMM_CHANNEL_EVENT; } RFCOMM_CHANNEL_EVENT;
typedef struct rfcomm_channel_event { typedef struct rfcomm_channel_event {
@ -1007,6 +1010,28 @@ static void rfcomm_channel_accept_pn(rfcomm_channel_t *channel, rfcomm_channel_e
} }
static void rfcomm_channel_state_machine(rfcomm_channel_t *channel, rfcomm_channel_event_t *event){ static void rfcomm_channel_state_machine(rfcomm_channel_t *channel, rfcomm_channel_event_t *event){
rfcomm_multiplexer_t *multiplexer = channel->multiplexer;
// TODO: integrate
if (event->type == CH_EVT_RCVD_DISC){
channel->state = RFCOMM_CHANNEL_SEND_UA_AND_DISC;
return;
}
// TODO: integrate
if (event->type == CH_EVT_RCVD_DM){
log_dbg("Received DM message for #%u\n", channel->dlci);
log_dbg("-> Closing channel locally for #%u\n", channel->dlci);
rfcomm_emit_channel_closed(channel);
linked_list_remove( &rfcomm_channels, (linked_item_t *) channel);
free(channel);
rfcomm_multiplexer_prepare_idle_timer(multiplexer);
return;
}
rfcomm_channel_event_pn_t * event_pn = (rfcomm_channel_event_pn_t*) event;
switch (channel->state) { switch (channel->state) {
case RFCOMM_CHANNEL_CLOSED: case RFCOMM_CHANNEL_CLOSED:
switch (event->type){ switch (event->type){
@ -1017,7 +1042,7 @@ static void rfcomm_channel_state_machine(rfcomm_channel_t *channel, rfcomm_chann
channel->state = RFCOMM_CHANNEL_INCOMING_SETUP; channel->state = RFCOMM_CHANNEL_INCOMING_SETUP;
break; break;
case CH_EVT_RCVD_PN: case CH_EVT_RCVD_PN:
rfcomm_channel_accept_pn(channel, (rfcomm_channel_event_pn_t*) event); rfcomm_channel_accept_pn(channel, event_pn);
log_dbg("-> Inform app\n"); log_dbg("-> Inform app\n");
rfcomm_emit_connection_request(channel); rfcomm_emit_connection_request(channel);
channel->state_var |= STATE_VAR_RCVD_PN; channel->state_var |= STATE_VAR_RCVD_PN;
@ -1038,12 +1063,41 @@ static void rfcomm_channel_state_machine(rfcomm_channel_t *channel, rfcomm_chann
} }
break; break;
case CH_EVT_RCVD_PN: case CH_EVT_RCVD_PN:
rfcomm_channel_accept_pn(channel, (rfcomm_channel_event_pn_t*) event); rfcomm_channel_accept_pn(channel, event_pn);
channel->state_var |= STATE_VAR_RCVD_PN; channel->state_var |= STATE_VAR_RCVD_PN;
break; break;
default: default:
break; break;
} }
break;
case RFCOMM_CHANNEL_W4_UA:
switch (event->type){
case CH_EVT_RCVD_UA:
log_dbg("Received RFCOMM unnumbered acknowledgement for #%u - channel opened\n", channel->dlci);
channel->state = RFCOMM_CHANNEL_SEND_MSC_CMD_W4_MSC_CMD_OR_MSC_RSP;
break;
default:
break;
}
case RFCOMM_CHANNEL_W4_PN_RSP:
switch (event->type){
case CH_EVT_RCVD_PN_RSP:
log_dbg("UIH Parameter Negotiation Response max frame %u, credits %u\n",
event_pn->max_frame_size, event_pn->credits_outgoing);
// update max frame size
if (channel->max_frame_size > event_pn->max_frame_size) {
channel->max_frame_size = event_pn->max_frame_size;
}
// new credits
channel->credits_outgoing = event_pn->credits_outgoing;
channel->state = RFCOMM_CHANNEL_SEND_SABM_W4_UA;
break;
default:
break;
}
default: default:
break; break;
} }
@ -1098,7 +1152,7 @@ void rfcomm_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
rfcomm_channel_t * rfChannel = NULL; rfcomm_channel_t * rfChannel = NULL;
rfcomm_service_t * rfService = NULL; rfcomm_service_t * rfService = NULL;
uint16_t max_frame_size; rfcomm_channel_event_t event;
// switch by rfcomm message type // switch by rfcomm message type
switch(packet[1]) { switch(packet[1]) {
@ -1108,10 +1162,8 @@ void rfcomm_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
if (rfService) { if (rfService) {
log_dbg("Received SABM #%u\n", frame_dlci); log_dbg("Received SABM #%u\n", frame_dlci);
// get channel // get or create channel
rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, frame_dlci); rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, frame_dlci);
// new channel
if (!rfChannel) { if (!rfChannel) {
// setup incoming channel // setup incoming channel
rfChannel = rfcomm_channel_create(multiplexer, rfService, frame_dlci >> 1); rfChannel = rfcomm_channel_create(multiplexer, rfService, frame_dlci >> 1);
@ -1119,7 +1171,7 @@ void rfcomm_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
rfChannel->connection = rfService->connection; rfChannel->connection = rfService->connection;
} }
rfcomm_channel_event_t event; // create event and send to sm
event.type = CH_EVT_RCVD_SABM; event.type = CH_EVT_RCVD_SABM;
rfcomm_channel_state_machine(rfChannel, &event); rfcomm_channel_state_machine(rfChannel, &event);
@ -1128,39 +1180,36 @@ void rfcomm_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
} else { } else {
// discard request by sending disconnected mode // discard request by sending disconnected mode
// TODO: store "send DM for #x" in multiplexer struct
rfcomm_send_dm_pf(multiplexer, frame_dlci); rfcomm_send_dm_pf(multiplexer, frame_dlci);
} }
break; break;
case BT_RFCOMM_UA: case BT_RFCOMM_UA:
rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, frame_dlci); rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, frame_dlci);
if (rfChannel && rfChannel->state == RFCOMM_CHANNEL_W4_UA){ if (!rfChannel) break;
log_dbg("Received RFCOMM unnumbered acknowledgement for #%u - channel opened\n", frame_dlci); // create event and send to sm
rfChannel->state = RFCOMM_CHANNEL_SEND_MSC_CMD_W4_MSC_CMD_OR_MSC_RSP; event.type = CH_EVT_RCVD_UA;
} rfcomm_channel_state_machine(rfChannel, &event);
break; break;
case BT_RFCOMM_DISC: case BT_RFCOMM_DISC:
log_dbg("Received DISC command for #%u\n", frame_dlci);
rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, frame_dlci); rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, frame_dlci);
if (rfChannel) { if (!rfChannel) break;
rfChannel->state = RFCOMM_CHANNEL_SEND_UA_AND_DISC; // create event and send to sm
} event.type = CH_EVT_RCVD_DISC;
rfcomm_channel_state_machine(rfChannel, &event);
break; break;
case BT_RFCOMM_DM: case BT_RFCOMM_DM:
case BT_RFCOMM_DM_PF: case BT_RFCOMM_DM_PF:
log_dbg("Received DM message for #%u\n", frame_dlci);
log_dbg("-> Closing channel locally for #%u\n", frame_dlci);
rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, frame_dlci); rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, frame_dlci);
if (rfChannel) { if (!rfChannel) break;
rfcomm_emit_channel_closed(rfChannel); // create event and send to sm
linked_list_remove( &rfcomm_channels, (linked_item_t *) rfChannel); event.type = CH_EVT_RCVD_DISC;
free(rfChannel); rfcomm_channel_state_machine(rfChannel, &event);
rfcomm_multiplexer_prepare_idle_timer(multiplexer);
}
break; break;
case BT_RFCOMM_UIH_PF: case BT_RFCOMM_UIH_PF:
case BT_RFCOMM_UIH: case BT_RFCOMM_UIH:
switch (packet[payload_offset]) { switch (packet[payload_offset]) {
@ -1171,56 +1220,42 @@ void rfcomm_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
log_dbg("Received UIH Parameter Negotiation Command for #%u\n", message_dlci); log_dbg("Received UIH Parameter Negotiation Command for #%u\n", message_dlci);
max_frame_size = READ_BT_16(packet, payload_offset+6);
uint8_t priority = packet[payload_offset+4];
uint8_t credits_outgoing = packet[payload_offset+9];
rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, message_dlci); rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, message_dlci);
if (!rfChannel){ if (!rfChannel){
// setup incoming channel => state = RFCOMM_CHANNEL_CLOSED
// setup incoming channel
rfChannel = rfcomm_channel_create(multiplexer, rfService, message_dlci >> 1); rfChannel = rfcomm_channel_create(multiplexer, rfService, message_dlci >> 1);
if (!rfChannel) break; if (!rfChannel) break;
rfChannel->connection = rfService->connection; rfChannel->connection = rfService->connection;
// => state = RFCOMM_CHANNEL_CLOSED
} }
rfcomm_channel_event_pn_t event; rfcomm_channel_event_pn_t event;
event.super.type = CH_EVT_RCVD_PN; event.super.type = CH_EVT_RCVD_PN;
event.priority = priority; event.priority = packet[payload_offset+4];
event.max_frame_size = max_frame_size; event.max_frame_size = READ_BT_16(packet, payload_offset+6);
event.credits_outgoing = credits_outgoing; event.credits_outgoing = packet[payload_offset+9];
rfcomm_channel_state_machine(rfChannel, (rfcomm_channel_event_t *) &event); rfcomm_channel_state_machine(rfChannel, (rfcomm_channel_event_t *) &event);
break; break;
} else { } else {
// discard request by sending disconnected mode // discard request by sending disconnected mode
// TODO: store "send DM for #x" in multiplexer struct
rfcomm_send_dm_pf(multiplexer, message_dlci); rfcomm_send_dm_pf(multiplexer, message_dlci);
} }
break; break;
case BT_RFCOMM_PN_RSP: case BT_RFCOMM_PN_RSP:
message_dlci = packet[payload_offset+2]; message_dlci = packet[payload_offset+2];
log_dbg("Received UIH Parameter Negotiation Response for #%u\n", message_dlci);
rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, message_dlci); rfChannel = rfcomm_channel_for_multiplexer_and_dlci(multiplexer, message_dlci);
if (rfChannel && rfChannel->state == RFCOMM_CHANNEL_W4_PN_RSP){ if (!rfChannel) break;
// received UIH Parameter Negotiation Response log_dbg("Received UIH Parameter Negotiation Response for #%u\n", message_dlci);
max_frame_size = READ_BT_16(packet, payload_offset+6);
if (rfChannel->max_frame_size > max_frame_size) { rfcomm_channel_event_pn_t event;
rfChannel->max_frame_size = max_frame_size; event.super.type = CH_EVT_RCVD_PN_RSP;
} event.priority = packet[payload_offset+4];
event.max_frame_size = READ_BT_16(packet, payload_offset+6);
// new credits event.credits_outgoing = packet[payload_offset+9];
rfChannel->credits_outgoing = packet[payload_offset+9]; rfcomm_channel_state_machine(rfChannel, (rfcomm_channel_event_t *) &event);
log_dbg("UIH Parameter Negotiation Response max frame %u, credits %u\n",
max_frame_size, rfChannel->credits_outgoing);
rfChannel->state = RFCOMM_CHANNEL_SEND_SABM_W4_UA;
}
break; break;
case BT_RFCOMM_MSC_CMD: case BT_RFCOMM_MSC_CMD:
@ -1232,7 +1267,6 @@ void rfcomm_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
case RFCOMM_CHANNEL_W4_MSC_CMD_OR_MSC_RSP: case RFCOMM_CHANNEL_W4_MSC_CMD_OR_MSC_RSP:
rfChannel->state = RFCOMM_CHANNEL_SEND_MSC_RSP_W4_MSC_RSP; rfChannel->state = RFCOMM_CHANNEL_SEND_MSC_RSP_W4_MSC_RSP;
break; break;
case RFCOMM_CHANNEL_W4_MSC_CMD: case RFCOMM_CHANNEL_W4_MSC_CMD:
rfChannel->state = RFCOMM_CHANNEL_SEND_MSC_RSP_MSC_CMD_W4_CREDITS; rfChannel->state = RFCOMM_CHANNEL_SEND_MSC_RSP_MSC_CMD_W4_CREDITS;
break; break;