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 /file.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 'file.c')
-rw-r--r-- | file.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -336,12 +336,12 @@ ws_epan_new(capture_file *cf) } cf_status_t -cf_open(capture_file *cf, const char *fname, gboolean is_tempfile, int *err) +cf_open(capture_file *cf, const char *fname, unsigned int type, gboolean is_tempfile, int *err) { wtap *wth; gchar *err_info; - wth = wtap_open_offline(fname, err, &err_info, TRUE); + wth = wtap_open_offline(fname, type, err, &err_info, TRUE); if (wth == NULL) goto fail; @@ -4336,7 +4336,7 @@ rescan_file(capture_file *cf, const char *fname, gboolean is_tempfile, int *err) wtap_close(cf->wth); /* Open the new file. */ - cf->wth = wtap_open_offline(fname, err, &err_info, TRUE); + cf->wth = wtap_open_offline(fname, WTAP_TYPE_AUTO, err, &err_info, TRUE); if (cf->wth == NULL) { cf_open_failure_alert_box(fname, *err, err_info, FALSE, 0); return CF_READ_ERROR; @@ -4770,7 +4770,7 @@ cf_save_packets(capture_file *cf, const char *fname, guint save_format, the wtap structure, the filename, and the "is temporary" status applies to the new file; just update that. */ wtap_close(cf->wth); - cf->wth = wtap_open_offline(fname, &err, &err_info, TRUE); + cf->wth = wtap_open_offline(fname, WTAP_TYPE_AUTO, &err, &err_info, TRUE); if (cf->wth == NULL) { cf_open_failure_alert_box(fname, err, err_info, FALSE, 0); cf_close(cf); @@ -5212,7 +5212,7 @@ cf_reload(capture_file *cf) { filename = g_strdup(cf->filename); is_tempfile = cf->is_tempfile; cf->is_tempfile = FALSE; - if (cf_open(cf, filename, is_tempfile, &err) == CF_OK) { + if (cf_open(cf, filename, WTAP_TYPE_AUTO, is_tempfile, &err) == CF_OK) { switch (cf_read(cf, TRUE)) { case CF_READ_OK: |