Commit graph

111 commits

Author SHA1 Message Date
Jörg Mayer
7949c7f31c char -> const char warning fixes
svn path=/trunk/; revision=15079
2005-07-26 08:01:16 +00:00
Guy Harris
7a6f0a102c When reassembling a packet, all data, including data with
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-25 18:03:19 +00:00
Guy Harris
72560a2e04 Fix indentation.
svn path=/trunk/; revision=15050
2005-07-24 22:01:14 +00:00
Guy Harris
72c01a62f8 "fragment_add_common()" isn't used outside this file - make it static.
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-24 17:48:10 +00:00
Gerald Combs
276f179b0b Don't crash if we're handed a zero-length fragment. Fixes bug 272. Although
we don't crash now, we still don't handle zero-length fragments correctly.

svn path=/trunk/; revision=14858
2005-07-05 20:04:03 +00:00
Ulf Lamping
56a9fe6d2a add a generated toplevel line between the connectionless DCE/RPC protocol and the defragmented DCE/RPC content, to better understand what's going on if defragmentation is done.
svn path=/trunk/; revision=14531
2005-06-02 20:55:58 +00:00
Ulf Lamping
e2c3b60280 add a generated toplevel line between the TCP protocol and the desegmented 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-06-02 18:52:55 +00:00
Gerald Combs
64cafdda21 From Peter Johansson: Fix a segmentation fault in the reassembly code.
Fix up the formatting a bit.

svn path=/trunk/; revision=14136
2005-04-19 14:17:22 +00:00
Gerald Combs
5eb73dd01b In fragment_unhash(), free our key data _after_ we remove the key from
the hash table so that fragment_equal() doesn't end up working with
recently-freed data.

svn path=/trunk/; revision=14096
2005-04-15 20:15:03 +00:00
Ulf Lamping
79daa1e80e use DISSECTOR_ASSERT instead of g_assert
svn path=/trunk/; revision=13871
2005-03-23 00:09:12 +00:00
Lars Roland
ec9ca01616 Move the following files from /trunk to /trunk/epan:
asn1.[ch]
follow.[ch]
ptvcursor.[ch]
reassemble.[ch]
xmlstub.[ch]

fix #include statements accordingly.

svn path=/trunk/; revision=13366
2005-02-09 23:38:00 +00:00
Renamed from reassemble.c (Browse further)