aboutsummaryrefslogtreecommitdiffstats
path: root/epan/reassemble.c
AgeCommit message (Collapse)AuthorFilesLines
2005-08-14remove two more GMemChunksRonnie Sahlberg1-18/+5
svn path=/trunk/; revision=15348
2005-07-29If we do reassembly and hand the packet to the dissector, and theGuy Harris1-0/+12
dissector says "sorry, I need even more data in this packet", don't flag that packet as being reassembled in that frame. Indicate that we should perhaps do all the "partial reassembly" stuff in "fragment_set_partial_assembly()", which would obviate the need for the hack in the TCP dissector. Clean up indentation. svn path=/trunk/; revision=15139
2005-07-26char -> const char warning fixesJörg Mayer1-1/+1
svn path=/trunk/; revision=15079
2005-07-25When reassembling a packet, all data, including data withGuy Harris1-14/+41
FD_NOT_MALLOCED set, has to be copied - all FD_NOT_MALLOCED means is that the fragment's data is part of the old reassembled data, rather than a malloced chunk of its own (this happens if, after reassembly, the dissector says more reassembly is necessary, as can happen, for example, in the case of HTTP and other protocols where reassembly continues until a terminator is seen). Not copying the data means that the reassembled data is, in part, whatever random junk happens to be in the newly-allocated buffer. Back out the change not to copy the data, but add some sanity checks, in the hopes of preventing the crash that caused the change not to copy the data to be added, and in the hopes of discovering the ultimate source of that crash and fixing it. svn path=/trunk/; revision=15057
2005-07-24Fix indentation.Guy Harris1-1/+1
svn path=/trunk/; revision=15050
2005-07-24"fragment_add_common()" isn't used outside this file - make it static.Guy Harris1-47/+44
Move to "show_fragment()" the code to append the fragment information to the top-level item. Fix indentation. svn path=/trunk/; revision=15042
2005-07-05Don't crash if we're handed a zero-length fragment. Fixes bug 272. AlthoughGerald Combs1-2/+3
we don't crash now, we still don't handle zero-length fragments correctly. svn path=/trunk/; revision=14858
2005-06-02add a generated toplevel line between the connectionless DCE/RPC protocol ↵Ulf Lamping1-6/+14
and the defragmented DCE/RPC content, to better understand what's going on if defragmentation is done. svn path=/trunk/; revision=14531
2005-06-02add a generated toplevel line between the TCP protocol and the desegmented ↵Ulf Lamping1-7/+16
content, to better understand what's going on while desegmenting. We'll have to add similar mechanisms for other protocols as well... svn path=/trunk/; revision=14527
2005-04-19From Peter Johansson: Fix a segmentation fault in the reassembly code.Gerald Combs1-6/+11
Fix up the formatting a bit. svn path=/trunk/; revision=14136
2005-04-15In fragment_unhash(), free our key data _after_ we remove the key fromGerald Combs1-5/+5
the hash table so that fragment_equal() doesn't end up working with recently-freed data. svn path=/trunk/; revision=14096
2005-03-23use DISSECTOR_ASSERT instead of g_assertUlf Lamping1-1/+1
svn path=/trunk/; revision=13871
2005-02-09Move the following files from /trunk to /trunk/epan:Lars Roland1-0/+1833
asn1.[ch] follow.[ch] ptvcursor.[ch] reassemble.[ch] xmlstub.[ch] fix #include statements accordingly. svn path=/trunk/; revision=13366