diff options
author | Moshe Kaplan <me@moshekaplan.com> | 2016-11-24 09:37:01 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-12-02 16:07:35 +0000 |
commit | 20c57cb298e4f3b7ac66a22fb7477e4cf424a11b (patch) | |
tree | 3929a45a2f0df5182af007af697edfa9a55a4634 /ui/qt/export_object_action.h | |
parent | 9ca313cfbe4993a0a36520d216a3e4282b0b7b99 (diff) | |
download | wireshark-20c57cb298e4f3b7ac66a22fb7477e4cf424a11b.tar.gz |
Enable exporting objects with tshark
A new "--export-object <protocol>,<destdir>" option is added to tshark.
This required refactoring Export Object behavior in all GUIs to give the
export object handling to the dissector, rather than the ui layer.
Included in the refactoring was fixing some serious memory leaks in Qt
Export Object dialog, crash due to memory scope issues in GTK Export
Object dialog, and addition sorting column feature in Qt dialog (set
up by creating a widget to manage the items that were previously
leaking memory)
Bug: 9319
Ping-Bug: 13174
Change-Id: I515d7662fa1f150f672b1476716f347ec27deb9b
Reviewed-on: https://code.wireshark.org/review/18927
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt/export_object_action.h')
-rw-r--r-- | ui/qt/export_object_action.h | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/ui/qt/export_object_action.h b/ui/qt/export_object_action.h new file mode 100644 index 0000000000..5328f24b31 --- /dev/null +++ b/ui/qt/export_object_action.h @@ -0,0 +1,64 @@ +/* export_object_action.h + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef EXPORTOBJECTACTION_H +#define EXPORTOBJECTACTION_H + +#include "config.h" + +#include <glib.h> +#include <epan/packet_info.h> +#include <epan/export_object.h> + +#include <QAction> + +// Actions for "Export Objects" menu items. + +class ExportObjectAction : public QAction +{ + Q_OBJECT +public: + ExportObjectAction(QObject *parent, register_eo_t *eo = NULL); + + register_eo_t* exportObject() {return eo_;} + +public slots: + void captureFileOpened(); + void captureFileClosed(); + +private: + register_eo_t *eo_; +}; + +#endif // EXPORTOBJECTACTION_H + +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ |