Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] rev 43301: /trunk-1.8/ /trunk-1.8/ui/gtk/: capture_file_dlg.

Date: Sun, 17 Jun 2012 01:48:00 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=43301

User: guy
Date: 2012/06/16 06:48 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r43300 | guy | 2012-06-16 18:32:50 -0700 (Sat, 16 Jun 2012) | 16 lines
 
   Have wtap_get_savable_file_types() take an array of encapsulations and
   only return file types that could handle a single file with all those
   encapsulations - this means that
 
 	1) if there's more then one encapsulation, the file format has
   to handle per-packet encapsulation;
 
 	2) just because a file format handles per-packet encapsulation,
   that doesn't mean that it can handle the *particular* encapsulations
   being handed to it.
 
   This fixes some cases where we were claiming that a file could be saved
   in a format that doesn't actually support it (e.g., ISDN files being
   reported as savable in pcap-NG format - there's no LINKTYPE_ value for
   ISDN including B and D channels).
 
   ------------------------------------------------------------------------
   r43278 | guy | 2012-06-15 16:54:05 -0700 (Fri, 15 Jun 2012) | 7 lines
 
   For a capture file, keep an array of all encapsulation types seen.
 
   Show all of them in the summary dialog; we will be using it in the
   future to figure out what capture file formats we can write to (just
   because a capture file format supports per-packet encapsulations, that
   doesn't mean that it supports *all possible* encapsulations).

Directory: /trunk-1.8/ui/gtk/
  Changes    Path                  Action
  +1 -1      capture_file_dlg.c    Modified
  +11 -3     summary_dlg.c         Modified

Directory: /trunk-1.8/
  Changes    Path          Action
  +2 -1      cfile.h       Modified
  +44 -3     file.c        Modified
  +2 -2      summary.c     Modified
  +2 -1      summary.h     Modified

Directory: /trunk-1.8/wiretap/
  Changes    Path             Action
  +36 -13    file_access.c    Modified
  +3 -2      wtap.h           Modified