Wireshark · Wireshark-commits: [Wireshark-commits] rev 36131: /trunk/epan/ /trunk/epan/: reassemble.c reassemble_test.c

[morriss@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=36131

User: morriss
Date: 2011/03/03 12:22 PM

Log:
 When reassembling fragments, don't stop looking at fragments just because the
 current fragment pushes us past the reassembled size: it may be that the
 current fragment is a duplicate/retransmission and will be ignored.
 
 Also, if we detect a conflict between a previous and the current fragment,
 flag the current (conflicting) fragment as FD_OVERLAPCONFLICT.  Do *not* flag
 the fragment that got us into the reassembly routine (probably the final
 fragment): it is not (may not be) the guilty fragment.
 
 Clean up some spacing.
 
 Also add reassembly tests for duplicate/retransmitted fragments.

Directory: /trunk/epan/
  Changes    Path                 Action
  +39 -40    reassemble.c         Modified
  +203 -0    reassemble_test.c    Modified