Wireshark-commits: [Wireshark-commits] rev 43863: /trunk-1.8/ /trunk-1.8/: file.c /trunk-1.8/wireta
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=43863
User: guy
Date: 2012/07/20 10:35 AM
Log:
Copy over r43847 from trunk:
------------------------------------------------------------------------
r43847 | guy | 2012-07-19 21:00:29 -0700 (Thu, 19 Jul 2012) | 21 lines
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.)
Rev library version stuff according to
http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
which, at least when building for OS X, does the right thing - the
library minor version number in the file name goes from 0 to 1, but the
major version is unchanged.
Directory: /trunk-1.8/
Changes Path Action
+12 -4 file.c Modified
Directory: /trunk-1.8/wiretap/
Changes Path Action
+1 -1 Makefile.am Modified
+32 -13 file_access.c Modified
+1 -0 wtap.def Modified
+6 -0 wtap.h Modified
