diff options
| author | Moshe Kaplan <me@moshekaplan.com> | 2016-11-03 09:33:48 -0700 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-11-10 14:36:00 +0000 |
| commit | ce98b6c90dcbd8e9468bbac0adf10a7d537afdcb (patch) | |
| tree | f5cb83863f46ecf3bcf258e66a937c5f83bd77f0 /ui/qt | |
| parent | faa5ba2e20516be8e8ca934c3f06244706e961b5 (diff) | |
| download | wireshark-ce98b6c90dcbd8e9468bbac0adf10a7d537afdcb.tar.gz | |
Enable exporting IMF traffic as an EML file
Change-Id: Ia56b38a770a148dd8bf030699615189601944cc2
Reviewed-on: https://code.wireshark.org/review/18656
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/export_object_dialog.cpp | 5 | ||||
| -rw-r--r-- | ui/qt/export_object_dialog.h | 2 | ||||
| -rw-r--r-- | ui/qt/main_window.h | 1 | ||||
| -rw-r--r-- | ui/qt/main_window.ui | 6 | ||||
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 5 |
5 files changed, 18 insertions, 1 deletions
diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp index 83aac4b6d0..29126334ca 100644 --- a/ui/qt/export_object_dialog.cpp +++ b/ui/qt/export_object_dialog.cpp @@ -93,6 +93,11 @@ ExportObjectDialog::ExportObjectDialog(QWidget &parent, CaptureFile &cf, ObjectT name_ = "HTTP"; tap_packet_ = eo_http_packet; break; + case Imf: + tap_name_ = "imf_eo"; + name_ = "IMF"; + tap_packet_ = eo_imf_packet; + break; case Smb: tap_name_ = "smb_eo"; name_ = "SMB"; diff --git a/ui/qt/export_object_dialog.h b/ui/qt/export_object_dialog.h index 507bfb9f75..9084017a80 100644 --- a/ui/qt/export_object_dialog.h +++ b/ui/qt/export_object_dialog.h @@ -57,7 +57,7 @@ class ExportObjectDialog : public WiresharkDialog Q_OBJECT public: - enum ObjectType { Dicom, Http, Smb, Tftp }; + enum ObjectType { Dicom, Http, Imf, Smb, Tftp }; explicit ExportObjectDialog(QWidget &parent, CaptureFile &cf, ObjectType object_type); ~ExportObjectDialog(); diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index b0965fe02f..5c2a77a28c 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -389,6 +389,7 @@ private slots: void on_actionFileExportPacketBytes_triggered(); void on_actionFileExportObjectsDICOM_triggered(); void on_actionFileExportObjectsHTTP_triggered(); + void on_actionFileExportObjectsIMF_triggered(); void on_actionFileExportObjectsSMB_triggered(); void on_actionFileExportObjectsTFTP_triggered(); void on_actionFilePrint_triggered(); diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 508b70a812..7c4085d6af 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -180,6 +180,7 @@ </property> <addaction name="actionFileExportObjectsDICOM"/> <addaction name="actionFileExportObjectsHTTP"/> + <addaction name="actionFileExportObjectsIMF"/> <addaction name="actionFileExportObjectsSMB"/> <addaction name="actionFileExportObjectsTFTP"/> </widget> @@ -1249,6 +1250,11 @@ <string>&HTTP…</string> </property> </action> + <action name="actionFileExportObjectsIMF"> + <property name="text"> + <string>&IMF…</string> + </property> + </action> <action name="actionFileExportObjectsDICOM"> <property name="text"> <string>&DICOM…</string> diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index b6ce13de5b..c42a8b4d59 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1878,6 +1878,11 @@ void MainWindow::on_actionFileExportObjectsHTTP_triggered() new ExportObjectDialog(*this, capture_file_, ExportObjectDialog::Http); } +void MainWindow::on_actionFileExportObjectsIMF_triggered() +{ + new ExportObjectDialog(*this, capture_file_, ExportObjectDialog::Imf); +} + void MainWindow::on_actionFileExportObjectsSMB_triggered() { new ExportObjectDialog(*this, capture_file_, ExportObjectDialog::Smb); |