From 40951bf32e051ab7b408c123d181ba7bf2ddc06c Mon Sep 17 00:00:00 2001 From: AndersBroman Date: Thu, 21 Jan 2016 15:34:33 +0100 Subject: [IP] IP fragment reassembly gets thrown off if there is the same packets with different VLAN Ids in the trace in some cases. Add VLAN Id to the ID used to identify fragments. As discussed in https://code.wireshark.org/review/#/c/13452/ this may not be a complete solution but fixes the emediate problem. Change-Id: Id418304268d2bf4d0af863de11c4db02dc0854db Reviewed-on: https://code.wireshark.org/review/13470 Reviewed-by: Anders Broman --- epan/dissectors/packet-ip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 55b974361f..e56e9953f9 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2405,7 +2405,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* ipsum == 0) { ipfd_head = fragment_add_check(&ip_reassembly_table, tvb, offset, pinfo, - iph->ip_p ^ iph->ip_id ^ src32 ^ dst32, + iph->ip_p ^ iph->ip_id ^ src32 ^ dst32 ^ pinfo->vlan_id, NULL, (iph->ip_off & IP_OFFSET) * 8, iph->ip_len - hlen, -- cgit v1.2.3