Wireshark-commits: [Wireshark-commits] rev 47289: / /trunk-1.6/epan/dissectors/: packet-dtls.c /tru
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=47289
User: gerald
Date: 2013/01/25 04:36 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r46999 | martink | 2013-01-08 14:18:52 -0800 (Tue, 08 Jan 2013) | 9 lines
Changed paths:
M /trunk/epan/reassemble.c
From Evan:
sanity checks before setting a packet's total length in
fragment_set_tot_len()
(from me: check if fragments exist for the given id)
hopefully, this fixes #8111 and #8163 without causing troubles for other
protocols that use fragmentation and reassembly
------------------------------------------------------------------------
r47000 | martink | 2013-01-08 14:24:42 -0800 (Tue, 08 Jan 2013) | 6 lines
Changed paths:
M /trunk/epan/dissectors/packet-dtls.c
revert r46739
call fragment_add() before fragment_set_tot_len()
(the latter has no effect if no fragments are present, so we don't set
the total length correctly when it's in the first fragment)
------------------------------------------------------------------------
Directory: /trunk-1.6/epan/dissectors/
Changes Path Action
+2 -2 packet-dtls.c Modified
Directory: /trunk-1.6/epan/
Changes Path Action
+33 -5 reassemble.c Modified