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

l2cap: stop ertm timers in l2cap_free_channel_entry

Browse Source
This commit is contained in:
Matthias Ringwald 2019-08-06 17:59:22 +02:00
parent b5bab9c804
commit 8f4dd6c139
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed ### Fixed
- RFCOMM: accept incoming L2CAP connection in Basic mode if ERTM is enabled but not requested for this connection - RFCOMM: accept incoming L2CAP connection in Basic mode if ERTM is enabled but not requested for this connection
- POSIX, WICED, Windows, FreeRTOS: handle time_ms overrun after 49 days - POSIX, WICED, Windows, FreeRTOS: handle time_ms overrun after 49 days
- L2CAP ERTM: stop timers on disconnect
### Added ### Added
- btstack_run_loop_base: portable implementation of timer and data source managment as base for platform specific implementations - btstack_run_loop_base: portable implementation of timer and data source managment as base for platform specific implementations

6
src/l2cap.c
View File

@ -1867,8 +1867,12 @@ static l2cap_channel_t * l2cap_create_channel_entry(btstack_packet_handler_t pac
static void l2cap_free_channel_entry(l2cap_channel_t * channel){ static void l2cap_free_channel_entry(l2cap_channel_t * channel){
log_info("free channel %p, local_cid 0x%04x", channel, channel->local_cid); log_info("free channel %p, local_cid 0x%04x", channel, channel->local_cid);
// assert rts/ertx timers are stopped // assert all timers are stopped
l2cap_stop_rtx(channel); l2cap_stop_rtx(channel);
#ifdef ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE
l2cap_ertm_stop_retransmission_timer(channel);
l2cap_ertm_stop_monitor_timer(channel);
#endif
// free memory // free memory
btstack_memory_l2cap_channel_free(channel); btstack_memory_l2cap_channel_free(channel);
} }