mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-26 12:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

l2cap-ertm: set req_seq to tx_seq + 1 if expected, send S-REJ for unexpected packets

Browse Source
This commit is contained in:
Matthias Ringwald 2017-07-18 17:11:33 +02:00
parent dcb071b72b
commit c7309e8d6f
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/l2cap.c
View File

@ -1047,6 +1047,13 @@ static void l2cap_run(void){
l2cap_ertm_send_supervisor_frame(channel, control);
continue;
}
if (channel->send_supervisor_frame_reject){
channel->send_supervisor_frame_reject = 0;
log_info("Send S-Frame: REJ %u", channel->req_seq);
uint16_t control = l2cap_encanced_control_field_for_supevisor_frame( L2CAP_SUPERVISORY_FUNCTION_REJ_REJECT, 0, 0, channel->req_seq);
l2cap_ertm_send_supervisor_frame(channel, control);
continue;
}
if (channel->srej_active){
int i;
@ -2671,7 +2678,7 @@ static void l2cap_acl_handler(uint8_t packet_type, uint16_t channel, uint8_t *pa
// check ordering
if (l2cap_channel->expected_tx_seq == tx_seq){
log_info("Received expected frame with TxSeq == ExpectedTxSeq == %02u", tx_seq);
l2cap_channel->req_seq = tx_seq;
l2cap_channel->req_seq = (tx_seq+1) & 0x3f;
l2cap_channel->send_supervisor_frame_receiver_ready = 1;
l2cap_channel->expected_tx_seq = l2cap_next_ertm_seq_nr(l2cap_channel->expected_tx_seq);
uint16_t sdu_length;
@ -2707,9 +2714,12 @@ static void l2cap_acl_handler(uint8_t packet_type, uint16_t channel, uint8_t *pa
memcpy(&l2cap_channel->rx_packets_data[l2cap_channel->rx_packets_state->pos], &packet[payload_offset], segment_length);
l2cap_channel->rx_packets_state->pos += segment_length;
break;
}
}
} else {
log_info("Received unexpected frame TxSeq %u but expected %u", tx_seq, l2cap_channel->expected_tx_seq);
l2cap_channel->send_supervisor_frame_reject = 1;
}
}
break;
}
#endif

3
src/l2cap.h
View File

@ -243,6 +243,9 @@ typedef struct {
// receiver: send RNR frame - flag
uint8_t send_supervisor_frame_receiver_not_ready;
// receiver: send REJ frame - flag
uint8_t send_supervisor_frame_reject;
// receiver: value of tx_seq in next expected i-frame
uint8_t expected_tx_seq;