path: root/cfile.h
diff options
authorHadriel Kaplan <hadrielk@yahoo.com>2014-03-20 12:57:29 -0400
committerAnders Broman <a.broman58@gmail.com>2014-03-21 17:51:45 +0000
commitd1873dbcc89eb3138027d8e5c5e4c5b12420e797 (patch)
tree3798641bfbe067ef123d9ba125371b7090e7c7fd /cfile.h
parent49be990fd3ec0faac89b0a0bcda9a3e4562820ab (diff)
Fix Bug 9903: 'Clicking reload-file ignores selected file format reader'
There's a relatively new feature in 1.11.3 to select a specific file format reader, instead of relying on magics or heuristics. If you select a file reader and open a file, open it, and then click the reload-file button or go to View->Reload or press the ctrl-R keymap, the file is reloaded but using the magic/heuristics again instead of the file format reader you previously chose. Likewise, the Lua relaod() function has the same issue (which is how I found this problem). I have tested this change by hand, using a Lua script, but I didn't add it to the testsuite because I need another change for my test script to work correctly. (an enhancement rather than a bug fix, which I'll submit separately) Change-Id: I48c2d9ea443e37fd9d41be43d6b6cd5a866d5b01 Reviewed-on: https://code.wireshark.org/review/764 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'cfile.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/cfile.h b/cfile.h
index f34c34ee14..40ae6057f0 100644
--- a/cfile.h
+++ b/cfile.h
@@ -72,6 +72,7 @@ typedef struct _capture_file {
gboolean unsaved_changes; /* Does the capture file have changes that have not been saved? */
gint64 f_datalen; /* Size of capture file data (uncompressed) */
guint16 cd_t; /* File type of capture file */
+ unsigned int open_type; /* open_routine index+1 used, if selected, or WTAP_TYPE_AUTO */
gboolean iscompressed; /* TRUE if the file is compressed */
int lnk_t; /* File link-layer type; could be WTAP_ENCAP_PER_PACKET */
GArray *linktypes; /* Array of packet link-layer types */