Wireshark-commits: [Wireshark-commits] master 579e7e1: Wireshark: Add option to choose format type
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=579e7e19ce8e5f1a6e16b75f130ad4b001157ca5
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
579e7e1 by Michal Labedzki (michal.labedzki@xxxxxxxxx):
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@xxxxxxxxx>
Reviewed-by: Hadriel Kaplan <hadrielk@xxxxxxxxx>
Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
Tested-by: Evan Huus <eapache@xxxxxxxxx>
Actions performed:
from b6aae8d Change libsmi url and Lua version in macosx-setup.sh
adds 579e7e1 Wireshark: Add option to choose format type of capture file
Summary of changes:
capinfos.c | 3 +-
capture.c | 4 +-
capture_info.c | 2 +-
captype.c | 3 +-
editcap.c | 3 +-
file.c | 10 +-
file.h | 3 +-
reordercap.c | 4 +-
tfshark.c | 8 +-
tshark.c | 10 +-
ui/gtk/capture_file_dlg.c | 31 ++++-
ui/gtk/drag_and_drop.c | 4 +-
ui/gtk/file_import_dlg.c | 2 +-
ui/gtk/fileset_dlg.c | 2 +-
ui/gtk/funnel_stat.c | 2 +-
ui/gtk/main.c | 4 +-
ui/gtk/main_menubar.c | 4 +-
ui/qt/capture_file_dialog.cpp | 18 ++-
ui/qt/capture_file_dialog.h | 5 +-
ui/qt/main.cpp | 2 +
ui/qt/main_window.cpp | 2 +-
ui/qt/main_window_slots.cpp | 5 +-
ui/tap_export_pdu.c | 2 +-
ui/win32/file_dlg_win32.c | 2 +-
wiretap/file_access.c | 272 +++++++++++++++++++----------------------
wiretap/merge.c | 2 +-
wiretap/wtap.h | 23 +++-
27 files changed, 242 insertions(+), 190 deletions(-)