osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

TCP: Don't reassemble OoO segments when TCP SEQ Analysis is not enabled. 

In rare circumstances where port numbers are reused and sequence
numbers are lower in the later conversations, disabling TCP
sequence numbers analysis while enabling out-of-order reassembly
was leading to reassembly inconsistency. Closes #15096.
This commit is contained in:
Eugene Adell 2021-06-06 00:11:21 +02:00 committed by Wireshark GitLab Utility
parent 7132fcaeb0
commit 8d27c5617d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-tcp.c
View File

@ -3291,7 +3291,7 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset,
proto_item *item;
struct tcp_multisegment_pdu *msp;
gboolean cleared_writable = col_get_writable(pinfo->cinfo, COL_PROTOCOL);
const gboolean reassemble_ooo = tcp_desegment && tcp_reassemble_out_of_order;
const gboolean reassemble_ooo = tcp_analyze_seq && tcp_desegment && tcp_reassemble_out_of_order;
again:
ipfd_head = NULL;