Catch retransmission of FINs, so if we're doing "reassemble until end of

[metze/wireshark/wip.git] / summary.c

diff --git a/summary.c b/summary.c
index 9433fe8b0c54a806c3b6639508bfbe5b053404f8..dbec423b172ce6bee5aca781401e6ff18f6fd828 100644 (file)
--- a/summary.c
+++ b/summary.c
@@ -19,12 +19,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <wiretap/pcap-encap.h>
 
@@ -149,7 +147,8 @@ summary_fill_in(capture_file *cf, summary_tally *st)
   st->file_type = cf->cd_t;
   st->iscompressed = cf->iscompressed;
   st->is_tempfile = cf->is_tempfile;
-  st->encap_type = cf->lnk_t;
+  st->file_encap_type = cf->lnk_t;
+  st->packet_encap_types = cf->linktypes;
   st->has_snap = cf->has_snap;
   st->snap = cf->snap;
   st->elapsed_time = nstime_to_sec(&cf->elapsed_time);
@@ -197,7 +196,6 @@ summary_fill_in(capture_file *cf, summary_tally *st)
   g_free(idb_info);
 }
 
-
 #ifdef HAVE_LIBPCAP
 void
 summary_fill_in_capture(capture_file *cf,capture_options *capture_opts, summary_tally *st)
@@ -207,6 +205,9 @@ summary_fill_in_capture(capture_file *cf,capture_options *capture_opts, summary_
   guint i;
 
   if (st->ifaces->len == 0) {
+    /*
+     * XXX - do this only if we have a live capture.
+     */
     for (i = 0; i < capture_opts->all_ifaces->len; i++) {
       device = g_array_index(capture_opts->all_ifaces, interface_t, i);
       if (!device.selected) {