Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3315 -

make Save-As/Displayed/All-Packets save not only the displayed packets but
also any other packets needed (e.g., for reassembly) to fully dissect the
displayed packets.

This works only for the "All packets" case; choosing only the Selected packet,
the Marked packets, or a range of packets would require actually storing which
packets depend on which (too much memory) or going through the packet list many
times (too slow).  Also, this behavior is always the case: you can't save the
displayed packets without their dependencies (I don't see why this would be
desirable).

So far this is done for SCTP and things using the reassembly routines (TCP has
been tested).

The Win32 dialog was modified but hasn't been tested yet.

One confusing aspect of the UI is that the Displayed count in the Save-As
dialog does not match the number of displayed packets.  (I tried renaming the
button "Displayed + Dependencies" but it looked too big.)  The tooltip tries
to explain this and the fact that this works only in the All-Packets case;
suggestions for improvement are welcome.


Implementation details:

Dissectors (or the reassembly code) can list frames which were needed to
build the current frame's tree.  If the current frame passes the display
filter then each listed frame is marked as "depended upon" (this takes up the
last free frame_data flag).

When performing a Save-As/Displayed/All-Packets then choose packets which
passed the dfilter _or_ are depended upon.

svn path=/trunk/; revision=41216

1 files changed, 2 insertions, 0 deletions

diff --git a/packet-range.h b/packet-range.h
index 0a00af2e2e..fab651ca20 100644
--- a/packet-range.h
+++ b/packet-range.h
@@ -49,6 +49,7 @@ typedef struct packet_range_tag {
     packet_range_e  process;            /* which range to process */
     gboolean        process_filtered;   /* captured or filtered packets */
     gboolean        remove_ignored;     /* remove ignored packets */
+    gboolean        include_dependents;	/* True if packets which are dependents of others should be processed */
 
     /* user specified range(s) and, if null, error status */
     range_t         *user_range;
@@ -69,6 +70,7 @@ typedef struct packet_range_tag {
 
     /* current packet counts (displayed) */
     guint32  displayed_cnt;
+    guint32  displayed_plus_dependents_cnt;
     guint32  displayed_marked_cnt;
     guint32  displayed_mark_range_cnt;
     guint32  displayed_user_range_cnt;