diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2014-01-18 15:20:02 +0100 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-02-25 17:43:13 +0000 |
| commit | 579e7e19ce8e5f1a6e16b75f130ad4b001157ca5 (patch) | |
| tree | 423547b0256e93647f98710cf14e15e112f7f73f /ui/gtk/drag_and_drop.c | |
| parent | b6aae8d5c470aa681b70f33cad064dbb7045b3b7 (diff) | |
Wireshark: Add option to choose format type of capture file
The best heuristic can fail, so add possibility to manually choose
capture file format type, so not correctly recognize file format can be
loaded in Wireshark.
On the other side now it is possible to open capture file
as file format to be dissected.
Change-Id: I5a9f662b32ff7e042f753a92eaaa86c6e41f400a
Reviewed-on: https://code.wireshark.org/review/16
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'ui/gtk/drag_and_drop.c')
| -rw-r--r-- | ui/gtk/drag_and_drop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c index 93e438a698..78db218385 100644 --- a/ui/gtk/drag_and_drop.c +++ b/ui/gtk/drag_and_drop.c @@ -204,7 +204,7 @@ dnd_open_file_cmd(gchar *cf_names_freeme) if (in_file_count == 1) { /* open and read the capture file (this will close an existing file) */ - if (cf_open(&cfile, in_filenames[0], FALSE, &err) == CF_OK) { + if (cf_open(&cfile, in_filenames[0], WTAP_TYPE_AUTO, FALSE, &err) == CF_OK) { /* XXX - add this to the menu if the read fails? */ cf_read(&cfile, FALSE); add_menu_recent_capture_file(in_filenames[0]); @@ -219,7 +219,7 @@ dnd_open_file_cmd(gchar *cf_names_freeme) /* Merge succeeded; close the currently-open file and try to open the merged capture file. */ cf_close(&cfile); - if (cf_open(&cfile, tmpname, TRUE /* temporary file */, &err) == CF_OK) { + if (cf_open(&cfile, tmpname, WTAP_TYPE_AUTO, TRUE /* temporary file */, &err) == CF_OK) { g_free(tmpname); cf_read(&cfile, FALSE); } else { |