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>

1 files changed, 4 insertions, 1 deletions

diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h
index 54f9e1d341..becaed6a58 100644
--- a/ui/qt/capture_file_dialog.h
+++ b/ui/qt/capture_file_dialog.h
@@ -41,6 +41,7 @@
 #include <QRadioButton>
 #include <QCheckBox>
 #include <QDialogButtonBox>
+#include <QComboBox>
 
 class CaptureFileDialog : public QFileDialog
 {
@@ -87,6 +88,7 @@ private:
 
 #if !defined(Q_OS_WIN)
     void addMergeControls(QVBoxLayout &v_box);
+    void addFormatTypeSelector(QVBoxLayout &v_box);
     void addDisplayFilterEdit();
     void addPreview(QVBoxLayout &v_box);
     QString fileExtensionType(int et, bool extension_globs = true);
@@ -110,6 +112,7 @@ private:
     QRadioButton merge_chrono_;
     QRadioButton merge_append_;
 
+    QComboBox format_type_;
     QHash<QString, int>type_hash_;
 
     void addResolutionControls(QVBoxLayout &v_box);
@@ -143,7 +146,7 @@ signals:
 public slots:
 
     int exec();
-    int open(QString &file_name);
+    int open(QString &file_name, unsigned int &type);
     check_savability_t saveAs(QString &file_name, bool must_support_comments);
     check_savability_t exportSelectedPackets(QString &file_name, packet_range_t *range);
     int merge(QString &file_name);