summaryrefslogtreecommitdiff
path: root/epan/reassemble.c
AgeCommit message (Collapse)AuthorFilesLines
2017-01-29Use g_list_prepend, it's more efficient.AndersBroman1-1/+1
Change-Id: Ic13f60a3e700f3d8325063079f032eda47eaf22f Reviewed-on: https://code.wireshark.org/review/19848 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-29Register reassembly tablesMichael Mann1-3/+60
Register all reassembly tables with a central unit, allowing the central unit to have the callback that initializes and destroys the reassembly tables, rather than have dissectors do it individually. Change-Id: Ic92619c06fb5ba6f1c3012f613cae14982e101d4 Reviewed-on: https://code.wireshark.org/review/19834 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-22reassemble: fix no previous prototype for ‘reassembly_table_free’ ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: Idb4b821e013a79777897d2f837cb8c3861e3c85f Reviewed-on: https://code.wireshark.org/review/19724 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-21reassemble: add cleanup routine.Dario Lombardo1-0/+17
Change-Id: I948d342a29aacc2212076359e5b073113c50c5de Reviewed-on: https://code.wireshark.org/review/19697 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-10Initialize fd_head->frame in all cases where we allocate fd_head.Guy Harris1-4/+5
Also, sort the initializations of structure members by the order in the structure, to make it easier to check that we've initialized them all. Bug: 13231 Change-Id: Id2819940d916a5fd5a3f1bf2fc20bd3ee34a75f4 Reviewed-on: https://code.wireshark.org/review/19195 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-19Reassemble: fix premature freeJohn A. Thacker1-13/+17
Fix a memory error found by the buildbot and valgrind in my recent patch Bug: 13100 Change-Id: Ieb21aa25e048f90ce7192546b0ad3d4718ff07df Reviewed-on: https://code.wireshark.org/review/18877 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-03Fragmentation reassembly as in PPP MP (RFC 1990/2686)John A. Thacker1-0/+361
Add support for defragmentation of fragments that use the defragmentation scheme of PPP MP (RFC 1990). Instead of getting "sequence_number, fragment_number, last" as in other protocols, PPP MP provides a single sequence number that is effectively "seqnum + fragnum", though it provides flags for both the first and last fragment of a reassembly. See Appendix A of RFC 4623 (PWE3 Fragmentation and Reassembly) for a list of protocols that use this style, including PPP MP (RFC 1990), PWE3 MPLS (RFC 4385), L2TPv2 (RFC 2661), L2TPv3 (RFC 3931), ATM, and Frame Relay. Also add support for the Multi-class Extension to Multilink PPP (RFC 2686), which uses some of the previously reserved bits as classes that distinguish otherwise identical sequence numbers. Bug: 12548 Change-Id: Ic2ce3c50e61ab2eb50e4d92fd353ca4d2a48fe18 Reviewed-on: https://code.wireshark.org/review/16327 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-03reassemble: remove special treatment for truncated dataPeter Wu1-47/+1
Do not try to recover from truncated tvbs for fragment_add_seq-like functions: - If it is the first block and the dissector requested frag_data_len number of bytes, we should not lie and pretend that we are fully reassembled. - For other blocks, returning NULL as no reassembly was possible makes sense. But other fragments in the list should not be cleared as there may be partial fragments which were returned before. It seems that this special behavior was introduced in b2c11b5e13248b1c98ee5104eab411e842911e19 (freeing fragments and returning NULL as an optimization when fragments are deemed not needed anymore) and faeb2c2ee16e61e54c880163e98d6528dd0c5619 (for returning fd_head for the first fragment, "so the first fragment gets dissected as fragmented packet"). Now in theory unused fragments could stick around, but that also possible with the normal fragment_add functions. Bug: 11799 Change-Id: I20829c54e1b2eee25a91fe4de51b19b1458c7789 Reviewed-on: https://code.wireshark.org/review/14082 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-26Add free_address_wmem(), fix warnings [-Wcast-qual]João Valverde1-8/+8
Try to improve address API and also fix some constness warnings by not overloading the 'data' pointer to store malloc'ed buffers (use private pointer for that instead). Second try, now passing test suite. Change-Id: Idc101cd866b6d4f13500c9d59da5c7a38847fb7f Reviewed-on: https://code.wireshark.org/review/13946 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-24Extend reassembly documentationPeter Wu1-2/+4
Documentation changes only (comments and docbook). Update WSDG with the fragment_add_seq_check API that was introduced in Wireshark 1.10. Fix typos and clarify the many functions we have for adding reassembling fragments. Change-Id: I38715a8f58e9cf1fe3e34ee4b1a4ae339630282b Reviewed-on: https://code.wireshark.org/review/14066 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-10Suggest pushing a decision lower in the code.Guy Harris1-1/+7
That leaves less room for getting it wrong. Change-Id: Iea003fc102ccd14db2924b70fc685033ca34f291 Reviewed-on: https://code.wireshark.org/review/13863 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-08Revert "Add free_address_wmem() and other extensions to address API"João Valverde1-8/+8
This reverts commit 13ec77a9fc3af3b0b502820d0b55796c89997896. This commit introduces a segmentation fault for Lua code (uncovered by the test suite). Change-Id: Ibc273d1915cda9632697b9f138f0ae104d3fb65e Reviewed-on: https://code.wireshark.org/review/13813 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-07Add free_address_wmem() and other extensions to address APIJoão Valverde1-8/+8
Try to improve 'address' API (to be easier/safer) and also avoid some constness warnings by not overloading the 'data' pointer to store malloc'ed buffers (use private pointer for that instead). Change-Id: I7456516b12c67620ceadac447907c12f5905bd49 Reviewed-on: https://code.wireshark.org/review/13463 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-24Add the packet number to the packet_info structure, and use it.Guy Harris1-17/+17
That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-06reassemble: Add key destroy function to g_hash_tableJoão Valverde1-5/+9
Fixes memleak in reassemble.c 480 bytes in 60 blocks are definitely lost in loss record 3,010 of 3,059 at 0x4C28C10: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0xADA3328: g_malloc (in /usr/lib/libglib-2.0.so.0.4600.1) by 0xADBA512: g_slice_alloc (in /usr/lib/libglib-2.0.so.0.4600.1) by 0x6575C7D: fragment_reassembled (reassemble.c:804) by 0x6577785: fragment_add_seq_check_work (reassemble.c:2027) by 0x6577880: fragment_add_seq_next (reassemble.c:2068) by 0x6E614E6: dissect_sccp_message (packet-sccp.c:2875) by 0x6E63641: dissect_sccp (packet-sccp.c:3401) by 0x6546CF7: call_dissector_through_handle (packet.c:620) by 0x6546EA1: call_dissector_work (packet.c:706) by 0x6547A04: dissector_try_uint_new (packet.c:1163) by 0x6547A65: dissector_try_uint (packet.c:1189) Change-Id: I0117b48e1e5d5688c49f264f24387dd6de1d6e08 Reviewed-on: https://code.wireshark.org/review/11541 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04Don't include "file.h" if you don't need it.Guy Harris1-0/+2
It ends up dragging in libwireshark headers, which programs not linking with libwireshark shouldn't do. In particular, including <epan/address.h> causes some functions that refer to libwireshark functions to be defined if the compiler doesn't handle "static inline" the way GCC does, and you end up requiring libwireshark even though you shouldn't require it. Move plurality() to wsutil/str_util.h, so that non-libwireshark code can get it without include epan/packet.h. Fix includes as necessary. Change-Id: Ie4819719da4c2b349f61445112aa419e99b977d3 Reviewed-on: https://code.wireshark.org/review/11545 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-22Use address functions instead of ADDRESS macros in asn1 and epanGerald Combs1-8/+8
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-24Remove deprecated tvb_length callsEvan Huus1-7/+7
Trust that the files in epan/ immediately (not dissectors) know what they're doing so just blindly convert them to captured length. Change-Id: I872f7d58b2e15ae82c75fd56f4873996fbc97be7 Reviewed-on: https://code.wireshark.org/review/9083 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-21reassembly: address a 15-year old XXX commentEvan Huus1-2/+4
Question: "what if we didn't capture the entire fragment due to a too-short snapshot length?" Answer: An assertion fails and we leak a bunch of memory. Don't do that. Bug: 11129 Change-Id: I0adfb217f0e66ae8f5f6255a4caf7ff940826b59 Reviewed-on: https://code.wireshark.org/review/8128 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-03-18[Reassembly] Fix a reassembly case where the two fragments are in the sameAndersBroman1-1/+8
frame but in different SCTP DATA chunks, whitout the patch the message is reassembled in both chunks leading to duplicated upper layer PDU:s in the frame. Change-Id: Ie31142c38c728018178947544b571622447d8e8f Reviewed-on: https://code.wireshark.org/review/7716 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-18Remove some apparently-unnecessary includes of emem.h.Guy Harris1-1/+0
Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80 Reviewed-on: https://code.wireshark.org/review/6635 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-25reassembly: fix when fragment cut off by snapshotEvan Huus1-2/+7
Also add an assertion to tvb_generic_clone_offset_len so that it throws an error *before* allocating memory, as otherwise that memory is leaked. Bug: 10474 Change-Id: I5036cefac16841914a59670c64979cf599bf7969 Reviewed-on: https://code.wireshark.org/review/4234 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-16Fix spelling: cant-->can't, wont-->won't, etcBill Meier1-2/+2
Change-Id: Ia6c3e7a25615bf8e052c3bacf096d76df775c9c2 Reviewed-on: https://code.wireshark.org/review/4126 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-25Remove trailing whitespaceBill Meier1-7/+7
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 Reviewed-on: https://code.wireshark.org/review/385 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2013-11-10Add missing includes in order to remove exceptions.h from proto.h (next commit).Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=53230
2013-11-07Revert r53118 as it breaks reassemble_test.Michael Mann1-5/+5
svn path=/trunk/; revision=53130
2013-11-06Correctly report segments marked with REASSEMBLE_FLAGS_NO_FRAG_NUMBER. Bug ↵Michael Mann1-5/+5
9304 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9304) Instead of incrementing the offset for each new segment by one we add the length of the segment so that each segment is correctly shown in the segment list. It proves to be very useful to find which packet (segment) is causing an application dissector to go wrong. From Matthieu Patou svn path=/trunk/; revision=53118
2013-10-08Reorganize handling of incomplete fragments slightly. The logic hasn't changedEvan Huus1-9/+15
much, but I think this way's a little clearer, and it made it much easier to figure out where the memory leak was. Fixes the leaks from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9243 svn path=/trunk/; revision=52448
2013-10-01Remove check_col.Michael Mann1-5/+2
svn path=/trunk/; revision=52316
2013-09-13Explicitly include emem.h where it is neededJörg Mayer1-2/+1
svn path=/trunk/; revision=51997
2013-09-07- no need for a doubly-linked list of TVBs, single is simplerEvan Huus1-1/+3
- support merging chains in tvb_add_to_chain - when we have an old reassembled TVB, just merge the chains rather than freeing it (we may still need it as it may already be a data source) - modelines Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9027 #BACKPORT, but it's gonna be messy... svn path=/trunk/; revision=51825
2013-07-17Remove fragment_data, add fragment_head, fragment_item - for now alias it to ↵Jakub Zawadzki1-79/+81
the same structure. This is begin of work to split fragment head and fragments items. svn path=/trunk/; revision=50708
2013-07-14A bit more comment updating.Guy Harris1-1/+1
svn path=/trunk/; revision=50590
2013-07-14Fix a comment.Guy Harris1-4/+4
svn path=/trunk/; revision=50588
2013-07-14Cast the result of g_malloc(), to avoid warnings about trying to compileGuy Harris1-4/+4
this code as C++. Make pointers to raw packet data pointers to guint8, not pointers to char, as they're octets, not characters. svn path=/trunk/; revision=50583
2013-07-14Rewrite reassemble API to use TVBs instead of raw data.Jakub Zawadzki1-68/+69
(it seems to be working for TCP ^^) svn path=/trunk/; revision=50580
2013-06-04From Anthony Coddington:Anders Broman1-0/+6
show_fragment_seq_tree does not add reassembled data tree item https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8766 svn path=/trunk/; revision=49751
2013-04-22Fix some Dead Store (Dead initialization) Warning found by Clang Fix also ↵Alexis La Goutte1-10/+10
indent (Use tabs) svn path=/trunk/; revision=48983
2013-04-20Fix typo - we want to check if the pointer is NULL, not if the valueEvan Huus1-1/+1
pointed to is NULL. Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8599 svn path=/trunk/; revision=48943
2013-04-18When we throw a reassembly error, remember the error, so that, if weGuy Harris1-105/+286
revisit this reassembly (in a multi-pass program such as Wireshark, or TShark with -2), we'll throw the same error. In fragment_set_tot_len(), allow the length to be set to a value that's before the offset of existing fragments; we'll catch that later when the reassembly completes. This lets us handle some problems with DTLS less confusingly. When adding frames to an already-completed reassembly, check for fragments that overlap existing fragments or go past the end of the reassembly, and report errors. When completing a reassembly, make the buffer for the reassembled data big enough to contain the specified data length for the reassembly, even if that's less than the offset + length of the last fragment. Flag all fragments that go past that length as "too long", and only copy out what part of them fits, if any. That lets us flag the correct fragment or fragments as being "too long". When adding fragments, do some additional checks, even if we're not doing the first pass through the packets, so errors that show up in the first pass also show up on subsequent passes. svn path=/trunk/; revision=48909
2013-03-25Include a message with all ReassemblyError exceptions; they're expectedGuy Harris1-1/+1
to have a message indicating the precise error. svn path=/trunk/; revision=48554
2013-03-25From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8502Evan Huus1-2/+31
Allow reassembly of sequences when the sequence numbers do not count from 0. svn path=/trunk/; revision=48548
2013-03-24make local functions static.Anders Broman1-1/+1
svn path=/trunk/; revision=48523
2013-03-23Make reassembly_table_destroy() clear the function pointers and emptyGuy Harris1-0/+32
and destroy the reassembled table. svn path=/trunk/; revision=48492
2013-03-22Don't wire into the reassembly code the notion that reassemblies shouldGuy Harris1-463/+463
be done on flows from one address to another; reassembly for protocols running atop TCP should be done on flows from one TCP endpoint to another. We do this by: adding "reassembly table" as a data structure; associating hash tables for both in-progress reassemblies and completed reassemblies with that data structure (currently, not all reassemblies use the latter; they might keep completed reassemblies in the first table); having functions to create and destroy keys in that table; offering standard routines for doing address-based and address-and-port-based flow processing, so that dissectors not needing their own specialized flow processing can just use them. This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where the second YPALL response is processed as if it were a continuation of a previous response between different endpoints, even though said response is already reassembled), and also allows the DCE RPC-specific stuff to be moved out of epan/reassembly.c into the DCE RPC dissector. svn path=/trunk/; revision=48491
2013-03-15From beroset:Anders Broman1-23/+23
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48318
2013-03-06Followup to r48011, answering my own XXX comment:Evan Huus1-3/+1
No, ReportedBoundsError is not the right thing to throw, ReassemblyError is. That's why I added it in the first place! svn path=/trunk/; revision=48123
2013-03-02Define a new exception for reassembly errors, and throw it in several casesEvan Huus1-34/+47
instead of using DISSECTOR_ASSERT. When a dissector passes bad data to the reassembly machine, that isn't necessarily the dissector's fault - the data may come straight from the packet, and the dissector may not have enough information to know it's bad without telling the reassembly machine in the first place. Also fix a bug in the reassembly machine. If it were given a fragment and all of the following conditions were met: - the other associated fragments were already marked as done (reassembled) - the fragment went beyond the end of the conceptual reassembled buffer - the dissector had not set the PARTIAL_REASSEMBLY flag then the reassembly machine would incorrectly think there was an overlap and run past the end of the already-reassembled buffer. Should fix the rest of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8380 #BACKPORT This is probably too big and intrusive to backport directly, and parts of it will need adapting anyways since reassemble.c has changed. But the bug exists and crashes in 1.6 and 1.8, so we'll have to do something. svn path=/trunk/; revision=48011
2013-01-08From Evan:Martin Kaiser1-5/+33
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 svn path=/trunk/; revision=46999
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-22 00:14:24 +0000