![Moshe Kaplan](/assets/img/avatar_default.png)
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>
117 lines
3.2 KiB
C
117 lines
3.2 KiB
C
/* export_object_ui.c
|
|
* Common routines for tracking & saving objects found in streams of data
|
|
* Copyright 2007, Stephen Fisher (see AUTHORS file)
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <glib.h>
|
|
|
|
#include <epan/packet_info.h>
|
|
#include <epan/tap.h>
|
|
|
|
#include <wiretap/wtap.h>
|
|
|
|
#include <wsutil/file_util.h>
|
|
|
|
#include <ui/alert_box.h>
|
|
|
|
#include "export_object_ui.h"
|
|
|
|
gboolean
|
|
eo_save_entry(const gchar *save_as_filename, export_object_entry_t *entry, gboolean show_err)
|
|
{
|
|
int to_fd;
|
|
gint64 bytes_left;
|
|
int bytes_to_write;
|
|
ssize_t bytes_written;
|
|
guint8 *ptr;
|
|
int err;
|
|
|
|
to_fd = ws_open(save_as_filename, O_WRONLY | O_CREAT | O_EXCL |
|
|
O_BINARY, 0644);
|
|
if(to_fd == -1) { /* An error occurred */
|
|
if (show_err)
|
|
open_failure_alert_box(save_as_filename, errno, TRUE);
|
|
return FALSE;
|
|
}
|
|
|
|
/*
|
|
* The third argument to _write() on Windows is an unsigned int,
|
|
* so, on Windows, that's the size of the third argument to
|
|
* ws_write().
|
|
*
|
|
* The third argument to write() on UN*X is a size_t, although
|
|
* the return value is an ssize_t, so one probably shouldn't
|
|
* write more than the max value of an ssize_t.
|
|
*
|
|
* In either case, there's no guarantee that a gint64 such as
|
|
* payload_len can be passed to ws_write(), so we write in
|
|
* chunks of, at most 2^31 bytes.
|
|
*/
|
|
ptr = entry->payload_data;
|
|
bytes_left = entry->payload_len;
|
|
while (bytes_left != 0) {
|
|
if (bytes_left > 0x40000000)
|
|
bytes_to_write = 0x40000000;
|
|
else
|
|
bytes_to_write = (int)bytes_left;
|
|
bytes_written = ws_write(to_fd, ptr, bytes_to_write);
|
|
if(bytes_written <= 0) {
|
|
if (bytes_written < 0)
|
|
err = errno;
|
|
else
|
|
err = WTAP_ERR_SHORT_WRITE;
|
|
if (show_err)
|
|
write_failure_alert_box(save_as_filename, err);
|
|
ws_close(to_fd);
|
|
return FALSE;
|
|
}
|
|
bytes_left -= bytes_written;
|
|
ptr += bytes_written;
|
|
}
|
|
if (ws_close(to_fd) < 0) {
|
|
if (show_err)
|
|
write_failure_alert_box(save_as_filename, errno);
|
|
return FALSE;
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
/*
|
|
* 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:
|
|
*/
|