From 633de5c7d11a096c8529681d79d5a9ad491cb882 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Fri, 20 Jul 2012 04:00:29 +0000
Subject: Add a routine that, given a set of packet encapsulation types,
 returns the per-file encapsulation type needed to write out a set of packets
 with all those encapsulation types.  If there's only one such encapsulation
 type, that's the type, otherwise WTAP_ENCAP_PER_PACKET is needed.  Use that
 in wtap_dump_can_write_encaps().

Also use it in cf_save_packets() and cf_export_specified_packets(), so
that we can write out files with WTAP_ENCAP_PER_PACKET as the file
encapsulation type and only one actual per-packet encapsulation type in
some cases where that failed before.  This fixes the case that showed up
in bug 7505, although there are other cases where we *could* write out a
capture in a given file format but won't be able to do so; fixing those
will take more work.

#BACKPORT

(Note: this adds a routine to libwiretap, so, when backported, the
*minor* version of the library should be increased.  Code that worked
with the version of the library prior to this change will continue to
work, so there's no need to change the *major* version of the library.)

svn path=/trunk/; revision=43847
---
 wiretap/wtap.def | 1 +
 1 file changed, 1 insertion(+)

(limited to 'wiretap/wtap.def')

diff --git a/wiretap/wtap.def b/wiretap/wtap.def
index 7da50417a2..0ed9650392 100644
--- a/wiretap/wtap.def
+++ b/wiretap/wtap.def
@@ -35,6 +35,7 @@ wtap_dump_can_compress
 wtap_dump_close
 wtap_dump_fdopen
 wtap_dump_fdopen_ng
+wtap_dump_file_encap_type
 wtap_dump_flush
 wtap_dump_open
 wtap_dump_open_ng
-- 
cgit v1.2.3

