osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Bluetooth: Fix l2cap reassembly resuming old reassembly 

Fix l2cap reassembly resuming reassembly on old fragment that has
failed when a new packet arrives that matches the remaining
segmentation length of the failed reassembly.
Update the l2cap_index and set segmentation started to false so
that this does not happen anymore.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-12-01 09:37:43 +01:00 committed by AndersBroman
parent d104571e8a
commit a42bbbeff6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-btle.c
View File

@ -1598,10 +1598,13 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
} else {
/*
* Missing fragment for previous L2CAP and fragment start for this.
* Increase l2cap_index.
* Set more_fragments and increase l2cap_index to avoid reassembly.
*/
btle_frame_info->more_fragments = 1;
btle_frame_info->missing_start = 1;
btle_frame_info->l2cap_index = l2cap_index;
connection_info->direction_info[direction].l2cap_index = l2cap_index;
connection_info->direction_info[direction].segmentation_started = 0;
l2cap_index++;
}
if (connection_info->direction_info[direction].segment_len_rem > 0) {
@ -1620,6 +1623,8 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
btle_frame_info->more_fragments = 1;
btle_frame_info->missing_start = 1;
btle_frame_info->l2cap_index = l2cap_index;
connection_info->direction_info[direction].l2cap_index = l2cap_index;
connection_info->direction_info[direction].segmentation_started = 0;
l2cap_index++;
}
}