diff options
author | Guy Harris <guy@alum.mit.edu> | 2012-06-17 01:32:50 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2012-06-17 01:32:50 +0000 |
commit | c63aa61658903b0203cbfe1596a970cf541425ad (patch) | |
tree | 4f19cff5e52cab740848359985fadec8002cb650 /ui/gtk/capture_file_dlg.c | |
parent | 5237a5efa28980a944083a6f5fef85bf1c8f69bc (diff) |
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).
svn path=/trunk/; revision=43300
Diffstat (limited to 'ui/gtk/capture_file_dlg.c')
-rw-r--r-- | ui/gtk/capture_file_dlg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index 43b822a027..28858d6e9b 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -1205,7 +1205,7 @@ set_file_type_list(GtkWidget *combo_box, capture_file *cf) guint i; int ft; - savable_file_types = wtap_get_savable_file_types(cf->cd_t, cf->lnk_t); + savable_file_types = wtap_get_savable_file_types(cf->cd_t, cf->linktypes); if (savable_file_types != NULL) { /* OK, we have at least one file type we can save this file as. |