Wireshark-commits: [Wireshark-commits] master 40951bf: [IP] IP fragment reassembly gets thrown off

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 21 Jan 2016 14:40:36 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=40951bf32e051ab7b408c123d181ba7bf2ddc06c
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

40951bf by AndersBroman (anders.broman@xxxxxxxxxxxx):

    [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 <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  dede3c8   Add VLAN ID to pinfo
    adds  40951bf   [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.


Summary of changes:
 epan/dissectors/packet-ip.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)