1998-09-16 02:39:15 +00:00
|
|
|
/* file.c
|
|
|
|
* File I/O routines
|
|
|
|
*
|
2004-07-18 00:24:25 +00:00
|
|
|
* $Id$
|
1998-09-16 03:22:19 +00:00
|
|
|
*
|
2006-05-21 05:12:17 +00:00
|
|
|
* Wireshark - Network traffic analyzer
|
|
|
|
* By Gerald Combs <gerald@wireshark.org>
|
1998-09-16 02:39:15 +00:00
|
|
|
* Copyright 1998 Gerald Combs
|
2002-08-28 21:04:11 +00:00
|
|
|
*
|
1998-09-16 02:39:15 +00:00
|
|
|
* 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.
|
2002-08-28 21:04:11 +00:00
|
|
|
*
|
1998-09-16 02:39:15 +00:00
|
|
|
* 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.
|
2002-08-28 21:04:11 +00:00
|
|
|
*
|
1998-09-16 02:39:15 +00:00
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
2012-06-28 22:56:06 +00:00
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
1998-09-16 02:39:15 +00:00
|
|
|
*/
|
|
|
|
|
2012-09-20 01:29:52 +00:00
|
|
|
#include "config.h"
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-07-13 02:53:26 +00:00
|
|
|
#ifdef HAVE_UNISTD_H
|
1998-09-16 02:39:15 +00:00
|
|
|
#include <unistd.h>
|
1999-07-13 02:53:26 +00:00
|
|
|
#endif
|
|
|
|
|
1999-08-22 07:19:28 +00:00
|
|
|
#include <time.h>
|
|
|
|
|
1999-07-28 20:39:42 +00:00
|
|
|
#include <stdlib.h>
|
2000-02-03 06:35:27 +00:00
|
|
|
#include <stdio.h>
|
1998-09-27 22:12:47 +00:00
|
|
|
#include <string.h>
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
#include <ctype.h>
|
1998-09-16 02:39:15 +00:00
|
|
|
#include <errno.h>
|
1999-09-30 07:15:19 +00:00
|
|
|
#include <signal.h>
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2000-08-11 13:37:21 +00:00
|
|
|
#ifdef HAVE_FCNTL_H
|
|
|
|
#include <fcntl.h>
|
|
|
|
#endif
|
|
|
|
|
2013-07-16 02:35:33 +00:00
|
|
|
#include <wsutil/tempfile.h>
|
|
|
|
#include <wsutil/file_util.h>
|
2013-11-17 02:55:14 +00:00
|
|
|
#include <wsutil/filesystem.h>
|
2000-09-27 04:55:05 +00:00
|
|
|
|
2013-07-16 02:35:33 +00:00
|
|
|
#include <wiretap/merge.h>
|
|
|
|
|
2013-11-10 15:59:37 +00:00
|
|
|
#include <epan/exceptions.h>
|
2013-07-21 20:48:30 +00:00
|
|
|
#include <epan/epan-int.h>
|
2013-07-16 02:35:33 +00:00
|
|
|
#include <epan/epan.h>
|
2004-09-29 02:54:22 +00:00
|
|
|
#include <epan/column.h>
|
2002-01-21 07:37:49 +00:00
|
|
|
#include <epan/packet.h>
|
2009-07-01 17:39:19 +00:00
|
|
|
#include <epan/column-utils.h>
|
2013-07-16 02:35:33 +00:00
|
|
|
#include <epan/expert.h>
|
2004-09-27 22:55:15 +00:00
|
|
|
#include <epan/prefs.h>
|
2002-01-21 07:37:49 +00:00
|
|
|
#include <epan/dfilter/dfilter.h>
|
|
|
|
#include <epan/epan_dissect.h>
|
2004-09-29 00:06:36 +00:00
|
|
|
#include <epan/tap.h>
|
2004-07-18 18:06:47 +00:00
|
|
|
#include <epan/dissectors/packet-data.h>
|
2007-01-13 12:59:27 +00:00
|
|
|
#include <epan/dissectors/packet-ber.h>
|
2005-08-25 21:29:54 +00:00
|
|
|
#include <epan/timestamp.h>
|
2007-07-30 23:32:47 +00:00
|
|
|
#include <epan/dfilter/dfilter-macro.h>
|
2008-03-01 05:16:45 +00:00
|
|
|
#include <epan/strutil.h>
|
2011-03-24 22:47:57 +00:00
|
|
|
#include <epan/addr_resolv.h>
|
2004-06-30 06:58:59 +00:00
|
|
|
|
2013-07-16 02:35:33 +00:00
|
|
|
#include "color.h"
|
|
|
|
#include "color_filters.h"
|
|
|
|
#include "cfile.h"
|
|
|
|
#include "file.h"
|
|
|
|
#include "fileset.h"
|
|
|
|
#include "frame_tvbuff.h"
|
|
|
|
|
2012-01-16 01:07:52 +00:00
|
|
|
#include "ui/alert_box.h"
|
|
|
|
#include "ui/simple_dialog.h"
|
|
|
|
#include "ui/main_statusbar.h"
|
|
|
|
#include "ui/progress_dlg.h"
|
|
|
|
#include "ui/ui_util.h"
|
|
|
|
|
2013-07-12 03:50:50 +00:00
|
|
|
#include "version_info.h"
|
|
|
|
|
2013-04-13 18:24:06 +00:00
|
|
|
/* Needed for addrinfo */
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
|
|
# include <sys/types.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
|
|
# include <netinet/in.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_NETDB_H
|
|
|
|
# include <netdb.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_WINSOCK2_H
|
|
|
|
# include <winsock2.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(_WIN32) && defined(INET6)
|
|
|
|
# include <ws2tcpip.h>
|
|
|
|
#endif
|
|
|
|
|
2004-03-08 23:45:25 +00:00
|
|
|
#ifdef HAVE_LIBPCAP
|
2002-01-10 11:05:50 +00:00
|
|
|
gboolean auto_scroll_live;
|
2004-03-08 23:45:25 +00:00
|
|
|
#endif
|
2002-01-10 11:05:50 +00:00
|
|
|
|
2005-02-07 02:09:30 +00:00
|
|
|
static void cf_reset_state(capture_file *cf);
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
static int read_packet(capture_file *cf, dfilter_t *dfcode, epan_dissect_t *edt,
|
|
|
|
column_info *cinfo, gint64 offset);
|
1998-11-15 05:29:17 +00:00
|
|
|
|
2012-10-20 12:51:05 +00:00
|
|
|
static void rescan_packets(capture_file *cf, const char *action, const char *action_item, gboolean redissect);
|
2000-07-09 03:29:42 +00:00
|
|
|
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
typedef enum {
|
|
|
|
MR_NOTMATCHED,
|
|
|
|
MR_MATCHED,
|
|
|
|
MR_ERROR
|
|
|
|
} match_result;
|
|
|
|
static match_result match_protocol_tree(capture_file *cf, frame_data *fdata,
|
2009-09-21 15:50:15 +00:00
|
|
|
void *criterion);
|
2003-12-04 10:59:34 +00:00
|
|
|
static void match_subtree_text(proto_node *node, gpointer data);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
static match_result match_summary_line(capture_file *cf, frame_data *fdata,
|
2009-09-21 15:50:15 +00:00
|
|
|
void *criterion);
|
2012-12-15 01:04:39 +00:00
|
|
|
static match_result match_narrow_and_wide(capture_file *cf, frame_data *fdata,
|
2009-09-21 15:50:15 +00:00
|
|
|
void *criterion);
|
2012-12-15 01:04:39 +00:00
|
|
|
static match_result match_narrow(capture_file *cf, frame_data *fdata,
|
2009-09-21 15:50:15 +00:00
|
|
|
void *criterion);
|
2012-12-15 01:04:39 +00:00
|
|
|
static match_result match_wide(capture_file *cf, frame_data *fdata,
|
2009-09-21 15:50:15 +00:00
|
|
|
void *criterion);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
static match_result match_binary(capture_file *cf, frame_data *fdata,
|
2009-09-21 15:50:15 +00:00
|
|
|
void *criterion);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
static match_result match_dfilter(capture_file *cf, frame_data *fdata,
|
2009-09-21 15:50:15 +00:00
|
|
|
void *criterion);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
static match_result match_marked(capture_file *cf, frame_data *fdata,
|
|
|
|
void *criterion);
|
|
|
|
static match_result match_time_reference(capture_file *cf, frame_data *fdata,
|
2009-09-21 15:50:15 +00:00
|
|
|
void *criterion);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
static gboolean find_packet(capture_file *cf,
|
|
|
|
match_result (*match_function)(capture_file *, frame_data *, void *),
|
|
|
|
void *criterion, search_direction dir);
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
|
2013-08-01 20:59:38 +00:00
|
|
|
static const char *cf_get_user_packet_comment(capture_file *cf, const frame_data *fd);
|
|
|
|
|
2004-02-11 02:02:38 +00:00
|
|
|
static void cf_open_failure_alert_box(const char *filename, int err,
|
2009-09-21 15:50:15 +00:00
|
|
|
gchar *err_info, gboolean for_writing,
|
|
|
|
int file_type);
|
2012-06-17 22:32:03 +00:00
|
|
|
static void cf_rename_failure_alert_box(const char *filename, int err);
|
2004-02-11 02:02:38 +00:00
|
|
|
static void cf_close_failure_alert_box(const char *filename, int err);
|
2009-07-28 16:20:05 +00:00
|
|
|
static void ref_time_packets(capture_file *cf);
|
1999-08-28 01:51:58 +00:00
|
|
|
/* Update the progress bar this many times when reading a file. */
|
2009-09-21 15:50:15 +00:00
|
|
|
#define N_PROGBAR_UPDATES 100
|
2010-02-01 06:30:47 +00:00
|
|
|
/* We read around 200k/100ms don't update the progress bar more often than that */
|
2009-09-21 15:50:15 +00:00
|
|
|
#define MIN_QUANTUM 200000
|
2009-09-01 08:51:41 +00:00
|
|
|
#define MIN_NUMBER_OF_PACKET 1500
|
1999-08-05 16:46:04 +00:00
|
|
|
|
2011-03-22 21:07:00 +00:00
|
|
|
/*
|
|
|
|
* We could probably use g_signal_...() instead of the callbacks below but that
|
|
|
|
* would require linking our CLI programs to libgobject and creating an object
|
|
|
|
* instance for the signals.
|
|
|
|
*/
|
2008-04-12 15:16:52 +00:00
|
|
|
typedef struct {
|
2010-04-28 16:37:25 +00:00
|
|
|
cf_callback_t cb_fct;
|
2012-08-12 22:21:02 +00:00
|
|
|
gpointer user_data;
|
2008-04-12 15:16:52 +00:00
|
|
|
} cf_callback_data_t;
|
|
|
|
|
2008-06-24 08:05:45 +00:00
|
|
|
static GList *cf_callbacks = NULL;
|
2005-02-07 00:54:46 +00:00
|
|
|
|
2008-06-24 08:05:45 +00:00
|
|
|
static void
|
2005-02-07 00:54:46 +00:00
|
|
|
cf_callback_invoke(int event, gpointer data)
|
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
cf_callback_data_t *cb;
|
2012-08-12 22:21:02 +00:00
|
|
|
GList *cb_item = cf_callbacks;
|
2008-04-12 15:16:52 +00:00
|
|
|
|
2010-04-28 16:37:25 +00:00
|
|
|
/* there should be at least one interested */
|
|
|
|
g_assert(cb_item != NULL);
|
2008-04-12 15:16:52 +00:00
|
|
|
|
2012-08-12 22:21:02 +00:00
|
|
|
while (cb_item != NULL) {
|
2013-03-06 17:35:11 +00:00
|
|
|
cb = (cf_callback_data_t *)cb_item->data;
|
2010-04-28 16:37:25 +00:00
|
|
|
cb->cb_fct(event, data, cb->user_data);
|
|
|
|
cb_item = g_list_next(cb_item);
|
|
|
|
}
|
2005-02-07 00:54:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
cf_callback_add(cf_callback_t func, gpointer user_data)
|
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
cf_callback_data_t *cb;
|
2008-04-12 15:16:52 +00:00
|
|
|
|
2013-03-06 17:35:11 +00:00
|
|
|
cb = g_new(cf_callback_data_t,1);
|
2010-04-28 16:37:25 +00:00
|
|
|
cb->cb_fct = func;
|
|
|
|
cb->user_data = user_data;
|
2008-04-12 15:16:52 +00:00
|
|
|
|
2013-10-09 20:12:08 +00:00
|
|
|
cf_callbacks = g_list_prepend(cf_callbacks, cb);
|
2005-02-07 00:54:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2008-04-12 15:16:52 +00:00
|
|
|
cf_callback_remove(cf_callback_t func)
|
2005-02-07 00:54:46 +00:00
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
cf_callback_data_t *cb;
|
2012-08-12 22:21:02 +00:00
|
|
|
GList *cb_item = cf_callbacks;
|
2010-04-28 16:37:25 +00:00
|
|
|
|
2012-08-12 22:21:02 +00:00
|
|
|
while (cb_item != NULL) {
|
2013-03-06 17:35:11 +00:00
|
|
|
cb = (cf_callback_data_t *)cb_item->data;
|
2012-08-12 22:21:02 +00:00
|
|
|
if (cb->cb_fct == func) {
|
2010-04-28 16:37:25 +00:00
|
|
|
cf_callbacks = g_list_remove(cf_callbacks, cb);
|
|
|
|
g_free(cb);
|
|
|
|
return;
|
2008-04-12 15:16:52 +00:00
|
|
|
}
|
2010-04-28 16:37:25 +00:00
|
|
|
cb_item = g_list_next(cb_item);
|
|
|
|
}
|
2008-04-12 15:16:52 +00:00
|
|
|
|
2010-04-28 16:37:25 +00:00
|
|
|
g_assert_not_reached();
|
2005-02-07 00:54:46 +00:00
|
|
|
}
|
|
|
|
|
2005-08-25 21:29:54 +00:00
|
|
|
void
|
|
|
|
cf_timestamp_auto_precision(capture_file *cf)
|
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
int i;
|
|
|
|
int prec = timestamp_get_precision();
|
2009-09-21 15:50:15 +00:00
|
|
|
|
|
|
|
|
2010-04-28 16:37:25 +00:00
|
|
|
/* don't try to get the file's precision if none is opened */
|
2012-08-12 22:21:02 +00:00
|
|
|
if (cf->state == FILE_CLOSED) {
|
2010-04-28 16:37:25 +00:00
|
|
|
return;
|
|
|
|
}
|
2009-09-21 15:50:15 +00:00
|
|
|
|
2010-04-28 16:37:25 +00:00
|
|
|
/* if we are in auto mode, set precision of current file */
|
2012-08-12 22:21:02 +00:00
|
|
|
if (prec == TS_PREC_AUTO ||
|
2010-04-28 16:37:25 +00:00
|
|
|
prec == TS_PREC_AUTO_SEC ||
|
|
|
|
prec == TS_PREC_AUTO_DSEC ||
|
|
|
|
prec == TS_PREC_AUTO_CSEC ||
|
|
|
|
prec == TS_PREC_AUTO_MSEC ||
|
|
|
|
prec == TS_PREC_AUTO_USEC ||
|
|
|
|
prec == TS_PREC_AUTO_NSEC)
|
|
|
|
{
|
|
|
|
switch(wtap_file_tsprecision(cf->wth)) {
|
|
|
|
case(WTAP_FILE_TSPREC_SEC):
|
|
|
|
timestamp_set_precision(TS_PREC_AUTO_SEC);
|
|
|
|
break;
|
|
|
|
case(WTAP_FILE_TSPREC_DSEC):
|
|
|
|
timestamp_set_precision(TS_PREC_AUTO_DSEC);
|
|
|
|
break;
|
|
|
|
case(WTAP_FILE_TSPREC_CSEC):
|
|
|
|
timestamp_set_precision(TS_PREC_AUTO_CSEC);
|
|
|
|
break;
|
|
|
|
case(WTAP_FILE_TSPREC_MSEC):
|
|
|
|
timestamp_set_precision(TS_PREC_AUTO_MSEC);
|
|
|
|
break;
|
|
|
|
case(WTAP_FILE_TSPREC_USEC):
|
|
|
|
timestamp_set_precision(TS_PREC_AUTO_USEC);
|
|
|
|
break;
|
|
|
|
case(WTAP_FILE_TSPREC_NSEC):
|
|
|
|
timestamp_set_precision(TS_PREC_AUTO_NSEC);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_assert_not_reached();
|
2009-09-21 15:50:15 +00:00
|
|
|
}
|
2010-04-28 16:37:25 +00:00
|
|
|
}
|
2009-09-07 10:03:55 +00:00
|
|
|
/* Set the column widths of those columns that show the time in
|
|
|
|
"command-line-specified" format. */
|
|
|
|
for (i = 0; i < cf->cinfo.num_cols; i++) {
|
|
|
|
if (col_has_time_fmt(&cf->cinfo, i)) {
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_resize_column(i);
|
2009-09-21 15:50:15 +00:00
|
|
|
}
|
2009-09-07 10:03:55 +00:00
|
|
|
}
|
2005-08-25 21:29:54 +00:00
|
|
|
}
|
|
|
|
|
2009-09-07 21:07:51 +00:00
|
|
|
gulong
|
2013-08-14 04:14:36 +00:00
|
|
|
cf_get_computed_elapsed(capture_file *cf)
|
2009-09-07 21:07:51 +00:00
|
|
|
{
|
2013-08-14 04:14:36 +00:00
|
|
|
return cf->computed_elapsed;
|
2009-09-07 21:07:51 +00:00
|
|
|
}
|
|
|
|
|
2012-10-08 18:11:30 +00:00
|
|
|
/*
|
|
|
|
* GLIB_CHECK_VERSION(2,28,0) adds g_get_real_time which could minimize or
|
|
|
|
* replace this
|
|
|
|
*/
|
2013-08-14 04:14:36 +00:00
|
|
|
static void compute_elapsed(capture_file *cf, GTimeVal *start_time)
|
2009-09-07 21:07:51 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
gdouble delta_time;
|
|
|
|
GTimeVal time_now;
|
2009-09-07 21:07:51 +00:00
|
|
|
|
2010-04-28 16:37:25 +00:00
|
|
|
g_get_current_time(&time_now);
|
2009-09-07 21:07:51 +00:00
|
|
|
|
2010-04-28 16:37:25 +00:00
|
|
|
delta_time = (time_now.tv_sec - start_time->tv_sec) * 1e6 +
|
2009-09-07 21:07:51 +00:00
|
|
|
time_now.tv_usec - start_time->tv_usec;
|
|
|
|
|
2013-08-14 04:14:36 +00:00
|
|
|
cf->computed_elapsed = (gulong) (delta_time / 1000); /* ms */
|
2009-09-07 21:07:51 +00:00
|
|
|
}
|
2005-02-07 00:54:46 +00:00
|
|
|
|
2013-07-22 19:38:38 +00:00
|
|
|
static const nstime_t *
|
2013-07-21 20:48:30 +00:00
|
|
|
ws_get_frame_ts(void *data, guint32 frame_num)
|
|
|
|
{
|
|
|
|
capture_file *cf = (capture_file *) data;
|
|
|
|
|
2013-08-14 04:14:36 +00:00
|
|
|
if (cf->prev_dis && cf->prev_dis->num == frame_num)
|
|
|
|
return &cf->prev_dis->abs_ts;
|
2013-07-21 20:48:30 +00:00
|
|
|
|
2013-08-14 04:14:36 +00:00
|
|
|
if (cf->prev_cap && cf->prev_cap->num == frame_num)
|
|
|
|
return &cf->prev_cap->abs_ts;
|
2013-07-21 20:48:30 +00:00
|
|
|
|
|
|
|
if (cf->frames) {
|
|
|
|
frame_data *fd = frame_data_sequence_find(cf->frames, frame_num);
|
|
|
|
|
|
|
|
return (fd) ? &fd->abs_ts : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-08-01 20:59:38 +00:00
|
|
|
static const char *
|
|
|
|
ws_get_user_comment(void *data, const frame_data *fd)
|
|
|
|
{
|
|
|
|
capture_file *cf = (capture_file *) data;
|
|
|
|
|
|
|
|
return cf_get_user_packet_comment(cf, fd);
|
|
|
|
}
|
|
|
|
|
2013-07-23 23:45:24 +00:00
|
|
|
static epan_t *
|
2013-07-21 20:48:30 +00:00
|
|
|
ws_epan_new(capture_file *cf)
|
|
|
|
{
|
|
|
|
epan_t *epan = epan_new();
|
|
|
|
|
|
|
|
epan->data = cf;
|
|
|
|
epan->get_frame_ts = ws_get_frame_ts;
|
2013-07-22 19:38:38 +00:00
|
|
|
epan->get_interface_name = cap_file_get_interface_name;
|
2013-08-01 20:59:38 +00:00
|
|
|
epan->get_user_comment = ws_get_user_comment;
|
2013-07-21 20:48:30 +00:00
|
|
|
|
|
|
|
return epan;
|
|
|
|
}
|
|
|
|
|
2005-02-05 12:50:47 +00:00
|
|
|
cf_status_t
|
2005-02-05 11:00:04 +00:00
|
|
|
cf_open(capture_file *cf, const char *fname, gboolean is_tempfile, int *err)
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
wtap *wth;
|
|
|
|
gchar *err_info;
|
2005-04-29 14:51:52 +00:00
|
|
|
|
2005-02-04 18:44:44 +00:00
|
|
|
wth = wtap_open_offline(fname, err, &err_info, TRUE);
|
1999-08-15 06:59:13 +00:00
|
|
|
if (wth == NULL)
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
goto fail;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
/* The open succeeded. Close whatever capture file we had open,
|
|
|
|
and fill in the information for this file. */
|
2011-11-20 15:11:15 +00:00
|
|
|
cf_close(cf);
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
|
2013-06-16 00:20:00 +00:00
|
|
|
/* XXX - we really want to initialize this after we've read all
|
|
|
|
the packets, so we know how much we'll ultimately need. */
|
|
|
|
buffer_init(&cf->buf, 1500);
|
|
|
|
|
2013-08-07 16:14:44 +00:00
|
|
|
/* Create new epan session for dissection.
|
|
|
|
* (The old one was freed in cf_close().)
|
|
|
|
*/
|
2013-07-21 20:48:30 +00:00
|
|
|
cf->epan = ws_epan_new(cf);
|
2001-06-08 06:27:16 +00:00
|
|
|
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
/* We're about to start reading the file. */
|
|
|
|
cf->state = FILE_READ_IN_PROGRESS;
|
|
|
|
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
cf->wth = wth;
|
2005-08-19 01:17:24 +00:00
|
|
|
cf->f_datalen = 0;
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
/* Set the file name because we need it to set the follow stream filter.
|
|
|
|
XXX - is that still true? We need it for other reasons, though,
|
|
|
|
in any case. */
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
cf->filename = g_strdup(fname);
|
|
|
|
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
/* Indicate whether it's a permanent or temporary file. */
|
|
|
|
cf->is_tempfile = is_tempfile;
|
|
|
|
|
2012-05-20 08:56:06 +00:00
|
|
|
/* No user changes yet. */
|
|
|
|
cf->unsaved_changes = FALSE;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
2013-08-14 04:14:36 +00:00
|
|
|
cf->computed_elapsed = 0;
|
2009-09-07 21:07:51 +00:00
|
|
|
|
2013-11-08 09:53:01 +00:00
|
|
|
cf->cd_t = wtap_file_type_subtype(cf->wth);
|
2012-06-15 23:54:05 +00:00
|
|
|
cf->linktypes = g_array_sized_new(FALSE, FALSE, (guint) sizeof(int), 1);
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
cf->count = 0;
|
2012-06-20 01:11:01 +00:00
|
|
|
cf->packet_comment_count = 0;
|
2004-02-03 00:16:59 +00:00
|
|
|
cf->displayed_count = 0;
|
2001-12-06 02:21:26 +00:00
|
|
|
cf->marked_count = 0;
|
2009-12-17 01:18:14 +00:00
|
|
|
cf->ignored_count = 0;
|
2010-08-16 18:17:45 +00:00
|
|
|
cf->ref_time_count = 0;
|
2001-02-11 09:28:17 +00:00
|
|
|
cf->drops_known = FALSE;
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
cf->drops = 0;
|
|
|
|
cf->snap = wtap_snapshot_length(cf->wth);
|
Have Wiretap set the snapshot length to 0 if it can't be derived from
reading the capture file. Have callers of "wtap_snapshot_length()"
treat a value of 0 as "unknown", and default to WTAP_MAX_PACKET_SIZE (so
that, when writing a capture file in a format that *does* store the
snapshot length, we can at least put *something* in the file).
If we don't know the snapshot length of the current capture file, don't
display a value in the summary window.
Don't use "cfile.snap" as the snapshot length option when capturing -
doing so causes Ethereal to default, when capturing, to the snapshot
length of the last capture file that you read in, rather than to the
snapshot length of the last capture you did (or the initial default of
"no snapshot length").
Redo the "Capture Options" dialog box to group options into sections
with frames around them, and add units to the snapshot length, maximum
file size, and capture duration options, as per a suggestion by Ulf
Lamping. Also add units to the capture count option.
Make the snapshot length, capture count, maximum file size, and capture
duration options into a combination of a check box and a spin button.
If the check box is not checked, the limit in question is inactive
(snapshot length of 65535, no max packet count, no max file size, no max
capture duration); if it's checked, the spinbox specifies the limit.
Default all of the check boxes to "not checked" and all of the spin
boxes to small values.
Use "gtk_toggle_button_get_active()" rather than directly fetching the
state of a check box.
svn path=/trunk/; revision=4709
2002-02-08 10:07:41 +00:00
|
|
|
if (cf->snap == 0) {
|
|
|
|
/* Snapshot length not known. */
|
|
|
|
cf->has_snap = FALSE;
|
|
|
|
cf->snap = WTAP_MAX_PACKET_SIZE;
|
|
|
|
} else
|
|
|
|
cf->has_snap = TRUE;
|
2009-09-21 15:29:32 +00:00
|
|
|
|
2011-04-27 02:54:44 +00:00
|
|
|
/* Allocate a frame_data_sequence for the frames in this file */
|
|
|
|
cf->frames = new_frame_data_sequence();
|
|
|
|
|
2005-08-24 21:31:56 +00:00
|
|
|
nstime_set_zero(&cf->elapsed_time);
|
2013-08-14 04:14:36 +00:00
|
|
|
cf->ref = NULL;
|
|
|
|
cf->prev_dis = NULL;
|
|
|
|
cf->prev_cap = NULL;
|
|
|
|
cf->cum_bytes = 0;
|
2002-08-28 21:04:11 +00:00
|
|
|
|
2009-09-21 11:58:36 +00:00
|
|
|
/* Adjust timestamp precision if auto is selected, col width will be adjusted */
|
|
|
|
cf_timestamp_auto_precision(cf);
|
|
|
|
/* XXX needed ? */
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_queue_draw();
|
2012-09-26 23:33:11 +00:00
|
|
|
cf_callback_invoke(cf_cb_file_opened, cf);
|
2005-04-29 14:51:52 +00:00
|
|
|
|
2013-11-08 09:53:01 +00:00
|
|
|
if (cf->cd_t == WTAP_FILE_TYPE_SUBTYPE_BER) {
|
2007-01-13 12:59:27 +00:00
|
|
|
/* tell the BER dissector the file name */
|
|
|
|
ber_set_filename(cf->filename);
|
|
|
|
}
|
|
|
|
|
2011-03-24 22:47:57 +00:00
|
|
|
wtap_set_cb_new_ipv4(cf->wth, add_ipv4_name);
|
|
|
|
wtap_set_cb_new_ipv6(cf->wth, (wtap_new_ipv6_callback_t) add_ipv6_name);
|
|
|
|
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_OK;
|
Split "load_cap_file()" into "open_cap_file()" and "read_cap_file()".
The former, which used to be called by "load_cap_file()", now just opens
the file and, if the open succeeds, closes any capture file we
previously had open, reinitializes any protocols that need
reinitialization, and saves information about the new capture file in
the "capture_file" structure to which it was passed a pointer. The
latter reads the file already opened by "read_cap_file()".
For "File/Open", call "open_cap_file()" before dismissing the file
selection box; if it fails, "open_cap_file()" will have popped up a
message box complaining about it - just return, leaving the file
selection box open so the user can, after dismissing the message box,
either try again with a different file name, or dismiss the file
selection box. (Other file selection boxes should be made to work the
same way.) If "open_cap_file()" succeeds, dismiss the file selection
box, and read the capture file in.
svn path=/trunk/; revision=492
1999-08-15 00:26:11 +00:00
|
|
|
|
|
|
|
fail:
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_open_failure_alert_box(fname, *err, err_info, FALSE, 0);
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_ERROR;
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
|
2012-06-15 23:54:05 +00:00
|
|
|
/*
|
|
|
|
* Add an encapsulation type to cf->linktypes.
|
|
|
|
*/
|
2013-03-21 21:58:47 +00:00
|
|
|
static void
|
2012-06-15 23:54:05 +00:00
|
|
|
cf_add_encapsulation_type(capture_file *cf, int encap)
|
|
|
|
{
|
|
|
|
guint i;
|
|
|
|
|
|
|
|
for (i = 0; i < cf->linktypes->len; i++) {
|
|
|
|
if (g_array_index(cf->linktypes, gint, i) == encap)
|
|
|
|
return; /* it's already there */
|
|
|
|
}
|
|
|
|
/* It's not already there - add it. */
|
|
|
|
g_array_append_val(cf->linktypes, encap);
|
|
|
|
}
|
2005-04-29 14:51:52 +00:00
|
|
|
|
2005-02-07 02:09:30 +00:00
|
|
|
/*
|
|
|
|
* Reset the state for the currently closed file, but don't do the
|
|
|
|
* UI callbacks; this is for use in "cf_open()", where we don't
|
|
|
|
* want the UI to go from "file open" to "file closed" back to
|
|
|
|
* "file open", we want it to go from "old file open" to "new file
|
|
|
|
* open and being read".
|
2012-03-13 08:36:25 +00:00
|
|
|
*
|
|
|
|
* XXX - currently, cf_open() calls cf_close(), rather than
|
|
|
|
* cf_reset_state().
|
2005-02-07 02:09:30 +00:00
|
|
|
*/
|
|
|
|
static void
|
|
|
|
cf_reset_state(capture_file *cf)
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
{
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
/* Die if we're in the middle of reading a file. */
|
|
|
|
g_assert(cf->state != FILE_READ_IN_PROGRESS);
|
|
|
|
|
1998-11-12 00:06:47 +00:00
|
|
|
if (cf->wth) {
|
1999-06-19 01:14:51 +00:00
|
|
|
wtap_close(cf->wth);
|
|
|
|
cf->wth = NULL;
|
|
|
|
}
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
/* We have no file open... */
|
|
|
|
if (cf->filename != NULL) {
|
|
|
|
/* If it's a temporary file, remove it. */
|
|
|
|
if (cf->is_tempfile)
|
2008-05-22 15:46:27 +00:00
|
|
|
ws_unlink(cf->filename);
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
g_free(cf->filename);
|
|
|
|
cf->filename = NULL;
|
|
|
|
}
|
2012-05-20 08:56:06 +00:00
|
|
|
/* ...which means we have no changes to that file to save. */
|
|
|
|
cf->unsaved_changes = FALSE;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
2013-06-16 00:20:00 +00:00
|
|
|
/* Free up the packet buffer. */
|
|
|
|
buffer_free(&cf->buf);
|
|
|
|
|
2009-09-22 16:49:26 +00:00
|
|
|
dfilter_free(cf->rfcode);
|
|
|
|
cf->rfcode = NULL;
|
2011-04-27 03:13:03 +00:00
|
|
|
if (cf->frames != NULL) {
|
|
|
|
free_frame_data_sequence(cf->frames);
|
|
|
|
cf->frames = NULL;
|
|
|
|
}
|
2011-05-12 19:47:49 +00:00
|
|
|
#ifdef WANT_PACKET_EDITOR
|
|
|
|
if (cf->edited_frames) {
|
|
|
|
g_tree_destroy(cf->edited_frames);
|
|
|
|
cf->edited_frames = NULL;
|
|
|
|
}
|
|
|
|
#endif
|
2013-08-01 20:59:38 +00:00
|
|
|
if (cf->frames_user_comments) {
|
|
|
|
g_tree_destroy(cf->frames_user_comments);
|
|
|
|
cf->frames_user_comments = NULL;
|
|
|
|
}
|
2009-09-21 15:50:15 +00:00
|
|
|
cf_unselect_packet(cf); /* nothing to select */
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
cf->first_displayed = 0;
|
|
|
|
cf->last_displayed = 0;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2011-05-10 15:13:46 +00:00
|
|
|
/* No frames, no frame selected, no field in that frame selected. */
|
|
|
|
cf->count = 0;
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
cf->current_frame = 0;
|
2008-11-18 14:50:51 +00:00
|
|
|
cf->current_row = 0;
|
2003-09-24 00:47:37 +00:00
|
|
|
cf->finfo_selected = NULL;
|
|
|
|
|
2012-06-15 23:54:05 +00:00
|
|
|
/* No frame link-layer types, either. */
|
|
|
|
g_array_free(cf->linktypes, TRUE);
|
|
|
|
cf->linktypes = NULL;
|
|
|
|
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
/* Clear the packet list. */
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_freeze();
|
|
|
|
packet_list_clear();
|
|
|
|
packet_list_thaw();
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
2005-08-19 01:17:24 +00:00
|
|
|
cf->f_datalen = 0;
|
2005-08-24 21:31:56 +00:00
|
|
|
nstime_set_zero(&cf->elapsed_time);
|
2004-02-03 00:16:59 +00:00
|
|
|
|
2004-05-02 15:04:14 +00:00
|
|
|
reset_tap_listeners();
|
|
|
|
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
/* We have no file open. */
|
|
|
|
cf->state = FILE_CLOSED;
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
|
2005-02-07 02:09:30 +00:00
|
|
|
/* Reset everything to a pristine state */
|
|
|
|
void
|
|
|
|
cf_close(capture_file *cf)
|
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
if (cf->state != FILE_CLOSED) {
|
2012-03-13 08:36:25 +00:00
|
|
|
cf_callback_invoke(cf_cb_file_closing, cf);
|
2005-09-27 21:46:39 +00:00
|
|
|
|
2005-09-20 08:42:35 +00:00
|
|
|
/* close things, if not already closed before */
|
2009-06-06 00:12:43 +00:00
|
|
|
color_filters_cleanup();
|
|
|
|
cf_reset_state(cf);
|
2013-07-21 18:38:03 +00:00
|
|
|
epan_free(cf->epan);
|
|
|
|
cf->epan = NULL;
|
2005-09-27 21:46:39 +00:00
|
|
|
|
2012-03-13 08:36:25 +00:00
|
|
|
cf_callback_invoke(cf_cb_file_closed, cf);
|
|
|
|
}
|
2005-02-07 02:09:30 +00:00
|
|
|
}
|
|
|
|
|
2010-10-18 20:52:54 +00:00
|
|
|
static float
|
2010-10-18 21:36:41 +00:00
|
|
|
calc_progbar_val(capture_file *cf, gint64 size, gint64 file_pos, gchar *status_str, gulong status_size)
|
2010-10-18 20:52:54 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
float progbar_val;
|
2009-09-21 15:50:15 +00:00
|
|
|
|
2010-04-28 16:37:25 +00:00
|
|
|
progbar_val = (gfloat) file_pos / (gfloat) size;
|
|
|
|
if (progbar_val > 1.0) {
|
2010-10-18 20:52:54 +00:00
|
|
|
|
|
|
|
/* The file probably grew while we were reading it.
|
|
|
|
* Update file size, and try again.
|
|
|
|
*/
|
2010-04-28 16:37:25 +00:00
|
|
|
size = wtap_file_size(cf->wth, NULL);
|
2010-10-18 20:52:54 +00:00
|
|
|
|
2010-04-28 16:37:25 +00:00
|
|
|
if (size >= 0)
|
|
|
|
progbar_val = (gfloat) file_pos / (gfloat) size;
|
2010-10-18 20:52:54 +00:00
|
|
|
|
|
|
|
/* If it's still > 1, either "wtap_file_size()" failed (in which
|
|
|
|
* case there's not much we can do about it), or the file
|
|
|
|
* *shrank* (in which case there's not much we can do about
|
|
|
|
* it); just clip the progress value at 1.0.
|
|
|
|
*/
|
2010-04-28 16:37:25 +00:00
|
|
|
if (progbar_val > 1.0f)
|
|
|
|
progbar_val = 1.0f;
|
|
|
|
}
|
2010-10-18 20:52:54 +00:00
|
|
|
|
|
|
|
g_snprintf(status_str, status_size,
|
2011-09-21 18:55:03 +00:00
|
|
|
"%" G_GINT64_MODIFIER "dKB of %" G_GINT64_MODIFIER "dKB",
|
|
|
|
file_pos / 1024, size / 1024);
|
2010-10-18 20:52:54 +00:00
|
|
|
|
2010-04-28 16:37:25 +00:00
|
|
|
return progbar_val;
|
2009-09-01 08:51:41 +00:00
|
|
|
}
|
|
|
|
|
2005-02-04 20:54:12 +00:00
|
|
|
cf_read_status_t
|
2012-05-22 03:52:12 +00:00
|
|
|
cf_read(capture_file *cf, gboolean reloading)
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
int err;
|
|
|
|
gchar *err_info;
|
|
|
|
gchar *name_ptr;
|
2012-10-22 19:14:43 +00:00
|
|
|
progdlg_t *progbar = NULL;
|
2012-08-12 22:21:02 +00:00
|
|
|
gboolean stop_flag;
|
|
|
|
GTimeVal start_time;
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_t edt;
|
2012-08-12 22:21:02 +00:00
|
|
|
dfilter_t *dfcode;
|
2012-11-03 23:41:59 +00:00
|
|
|
volatile gboolean create_proto_tree;
|
2012-08-12 22:21:02 +00:00
|
|
|
guint tap_flags;
|
|
|
|
gboolean compiled;
|
2007-01-01 10:23:37 +00:00
|
|
|
|
|
|
|
/* Compile the current display filter.
|
2007-12-05 23:50:28 +00:00
|
|
|
* We assume this will not fail since cf->dfilter is only set in
|
2007-01-01 10:23:37 +00:00
|
|
|
* cf_filter IFF the filter was valid.
|
|
|
|
*/
|
2009-09-21 15:38:40 +00:00
|
|
|
compiled = dfilter_compile(cf->dfilter, &dfcode);
|
|
|
|
g_assert(!cf->dfilter || (compiled && dfcode));
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2009-06-05 22:42:47 +00:00
|
|
|
/* Get the union of the flags for all tap listeners. */
|
|
|
|
tap_flags = union_of_tap_listener_flags();
|
2012-10-20 12:51:34 +00:00
|
|
|
create_proto_tree =
|
|
|
|
(dfcode != NULL || have_filtering_tap_listeners() || (tap_flags & TL_REQUIRES_PROTO_TREE));
|
2009-06-05 22:42:47 +00:00
|
|
|
|
2002-09-04 22:15:39 +00:00
|
|
|
reset_tap_listeners();
|
1999-08-07 01:25:04 +00:00
|
|
|
|
2012-06-03 19:31:59 +00:00
|
|
|
name_ptr = g_filename_display_basename(cf->filename);
|
1999-08-28 01:51:58 +00:00
|
|
|
|
2012-05-22 03:52:12 +00:00
|
|
|
if (reloading)
|
|
|
|
cf_callback_invoke(cf_cb_file_reload_started, cf);
|
2009-12-14 22:05:29 +00:00
|
|
|
else
|
2012-05-22 03:52:12 +00:00
|
|
|
cf_callback_invoke(cf_cb_file_read_started, cf);
|
2009-12-14 22:05:29 +00:00
|
|
|
|
2012-06-15 23:54:05 +00:00
|
|
|
/* Record whether the file is compressed.
|
|
|
|
XXX - do we know this at open time? */
|
2012-05-24 05:05:29 +00:00
|
|
|
cf->iscompressed = wtap_iscompressed(cf->wth);
|
|
|
|
|
2012-06-05 02:49:56 +00:00
|
|
|
/* The packet list window will be empty until the file is completly loaded */
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_freeze();
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
|
2000-07-03 08:36:52 +00:00
|
|
|
stop_flag = FALSE;
|
2002-07-30 10:13:16 +00:00
|
|
|
g_get_current_time(&start_time);
|
2000-07-03 08:36:52 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_init(&edt, cf->epan, create_proto_tree, FALSE);
|
|
|
|
|
2012-10-22 19:44:51 +00:00
|
|
|
TRY {
|
|
|
|
#ifdef HAVE_LIBPCAP
|
|
|
|
int displayed_once = 0;
|
|
|
|
#endif
|
|
|
|
int count = 0;
|
2005-10-27 06:45:37 +00:00
|
|
|
|
2012-10-22 19:44:51 +00:00
|
|
|
gint64 size;
|
|
|
|
gint64 file_pos;
|
|
|
|
gint64 data_offset;
|
|
|
|
|
|
|
|
gint64 progbar_quantum;
|
|
|
|
gint64 progbar_nextstep;
|
|
|
|
float progbar_val;
|
2012-10-22 21:22:35 +00:00
|
|
|
gchar status_str[100];
|
|
|
|
|
|
|
|
column_info *cinfo;
|
|
|
|
|
|
|
|
cinfo = (tap_flags & TL_REQUIRES_COLUMNS) ? &cf->cinfo : NULL;
|
2012-10-22 19:44:51 +00:00
|
|
|
|
|
|
|
/* Find the size of the file. */
|
|
|
|
size = wtap_file_size(cf->wth, NULL);
|
|
|
|
|
|
|
|
/* Update the progress bar when it gets to this value. */
|
|
|
|
progbar_nextstep = 0;
|
|
|
|
/* When we reach the value that triggers a progress bar update,
|
|
|
|
bump that value by this amount. */
|
|
|
|
if (size >= 0) {
|
|
|
|
progbar_quantum = size/N_PROGBAR_UPDATES;
|
|
|
|
if (progbar_quantum < MIN_QUANTUM)
|
2012-11-25 18:35:41 +00:00
|
|
|
progbar_quantum = MIN_QUANTUM;
|
2012-10-22 19:44:51 +00:00
|
|
|
}else
|
|
|
|
progbar_quantum = 0;
|
|
|
|
|
|
|
|
while ((wtap_read(cf->wth, &err, &err_info, &data_offset))) {
|
|
|
|
if (size >= 0) {
|
2012-11-25 18:35:41 +00:00
|
|
|
count++;
|
|
|
|
file_pos = wtap_read_so_far(cf->wth);
|
|
|
|
|
|
|
|
/* Create the progress bar if necessary.
|
|
|
|
* Check whether it should be created or not every MIN_NUMBER_OF_PACKET
|
|
|
|
*/
|
|
|
|
if ((progbar == NULL) && !(count % MIN_NUMBER_OF_PACKET)) {
|
|
|
|
progbar_val = calc_progbar_val(cf, size, file_pos, status_str, sizeof(status_str));
|
|
|
|
if (reloading)
|
|
|
|
progbar = delayed_create_progress_dlg(cf->window, "Reloading", name_ptr,
|
|
|
|
TRUE, &stop_flag, &start_time, progbar_val);
|
|
|
|
else
|
|
|
|
progbar = delayed_create_progress_dlg(cf->window, "Loading", name_ptr,
|
|
|
|
TRUE, &stop_flag, &start_time, progbar_val);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
|
|
|
|
when we update it, we have to run the GTK+ main loop to get it
|
|
|
|
to repaint what's pending, and doing so may involve an "ioctl()"
|
|
|
|
to see if there's any pending input from an X server, and doing
|
|
|
|
that for every packet can be costly, especially on a big file. */
|
|
|
|
if (file_pos >= progbar_nextstep) {
|
|
|
|
if (progbar != NULL) {
|
|
|
|
progbar_val = calc_progbar_val(cf, size, file_pos, status_str, sizeof(status_str));
|
|
|
|
/* update the packet bar content on the first run or frequently on very large files */
|
2011-04-27 09:20:02 +00:00
|
|
|
#ifdef HAVE_LIBPCAP
|
2012-11-25 18:35:41 +00:00
|
|
|
if (progbar_quantum > 500000 || displayed_once == 0) {
|
|
|
|
if ((auto_scroll_live || displayed_once == 0 || cf->displayed_count < 1000) && cf->count != 0) {
|
|
|
|
displayed_once = 1;
|
|
|
|
packets_bar_update();
|
|
|
|
}
|
|
|
|
}
|
2011-04-27 09:20:02 +00:00
|
|
|
#endif /* HAVE_LIBPCAP */
|
2012-11-25 18:35:41 +00:00
|
|
|
update_progress_dlg(progbar, progbar_val, status_str);
|
|
|
|
}
|
|
|
|
progbar_nextstep += progbar_quantum;
|
|
|
|
}
|
2005-08-20 02:14:01 +00:00
|
|
|
}
|
2000-07-03 08:36:52 +00:00
|
|
|
|
2012-10-22 19:44:51 +00:00
|
|
|
if (stop_flag) {
|
2012-11-25 18:35:41 +00:00
|
|
|
/* Well, the user decided to abort the read. He/She will be warned and
|
|
|
|
it might be enough for him/her to work with the already loaded
|
|
|
|
packets.
|
|
|
|
This is especially true for very large capture files, where you don't
|
|
|
|
want to wait loading the whole file (which may last minutes or even
|
|
|
|
hours even on fast machines) just to see that it was the wrong file. */
|
|
|
|
break;
|
2012-10-22 19:44:51 +00:00
|
|
|
}
|
2013-10-20 13:22:48 +00:00
|
|
|
read_packet(cf, dfcode, &edt, cinfo, data_offset);
|
2012-12-15 01:04:39 +00:00
|
|
|
}
|
2012-10-22 19:44:51 +00:00
|
|
|
}
|
2012-10-22 19:14:43 +00:00
|
|
|
CATCH(OutOfMemoryError) {
|
|
|
|
simple_message_box(ESD_TYPE_ERROR, NULL,
|
|
|
|
"Some infos / workarounds can be found at:\n"
|
|
|
|
"http://wiki.wireshark.org/KnownBugs/OutOfMemory",
|
|
|
|
"Sorry, but Wireshark has run out of memory and has to terminate now!");
|
2012-06-17 22:32:03 +00:00
|
|
|
#if 0
|
2012-10-22 19:14:43 +00:00
|
|
|
/* Could we close the current capture and free up memory from that? */
|
2012-06-17 22:32:03 +00:00
|
|
|
#else
|
2012-10-22 19:14:43 +00:00
|
|
|
/* we have to terminate, as we cannot recover from the memory error */
|
|
|
|
exit(1);
|
2012-06-17 22:32:03 +00:00
|
|
|
#endif
|
2007-01-01 10:23:37 +00:00
|
|
|
}
|
2012-10-22 19:14:43 +00:00
|
|
|
ENDTRY;
|
2007-01-01 10:23:37 +00:00
|
|
|
|
2012-06-03 22:03:05 +00:00
|
|
|
/* Free the display name */
|
|
|
|
g_free(name_ptr);
|
|
|
|
|
2007-01-01 10:23:37 +00:00
|
|
|
/* Cleanup and release all dfilter resources */
|
2012-08-12 22:21:02 +00:00
|
|
|
if (dfcode != NULL) {
|
2007-01-01 10:23:37 +00:00
|
|
|
dfilter_free(dfcode);
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
}
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_cleanup(&edt);
|
|
|
|
|
2002-07-30 10:13:16 +00:00
|
|
|
/* We're done reading the file; destroy the progress bar if it was created. */
|
2005-08-06 18:40:03 +00:00
|
|
|
if (progbar != NULL)
|
2002-07-30 10:13:16 +00:00
|
|
|
destroy_progress_dlg(progbar);
|
2000-07-03 08:36:52 +00:00
|
|
|
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
/* We're done reading sequentially through the file. */
|
|
|
|
cf->state = FILE_READ_DONE;
|
|
|
|
|
2011-04-12 17:37:05 +00:00
|
|
|
/* Close the sequential I/O side, to free up memory it requires. */
|
|
|
|
wtap_sequential_close(cf->wth);
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
|
2002-01-05 04:12:17 +00:00
|
|
|
/* Allow the protocol dissectors to free up memory that they
|
|
|
|
* don't need after the sequential run-through of the packets. */
|
|
|
|
postseq_cleanup_all_protocols();
|
|
|
|
|
2009-09-06 18:25:23 +00:00
|
|
|
/* compute the time it took to load the file */
|
2013-08-14 04:14:36 +00:00
|
|
|
compute_elapsed(cf, &start_time);
|
2009-08-28 05:19:52 +00:00
|
|
|
|
1999-12-04 11:32:25 +00:00
|
|
|
/* Set the file encapsulation type now; we don't know what it is until
|
|
|
|
we've looked at all the packets, as we don't know until then whether
|
|
|
|
there's more than one type (and thus whether it's
|
|
|
|
WTAP_ENCAP_PER_PACKET). */
|
|
|
|
cf->lnk_t = wtap_file_encap(cf->wth);
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
|
2011-04-27 02:54:44 +00:00
|
|
|
cf->current_frame = frame_data_sequence_find(cf->frames, cf->first_displayed);
|
2008-11-18 14:50:51 +00:00
|
|
|
cf->current_row = 0;
|
|
|
|
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_thaw();
|
2012-05-22 03:52:12 +00:00
|
|
|
if (reloading)
|
|
|
|
cf_callback_invoke(cf_cb_file_reload_finished, cf);
|
2010-04-28 16:37:25 +00:00
|
|
|
else
|
2012-05-22 03:52:12 +00:00
|
|
|
cf_callback_invoke(cf_cb_file_read_finished, cf);
|
1999-08-10 07:16:47 +00:00
|
|
|
|
2000-01-25 01:05:06 +00:00
|
|
|
/* If we have any displayed packets to select, select the first of those
|
|
|
|
packets by making the first row the selected row. */
|
2012-08-12 22:21:02 +00:00
|
|
|
if (cf->first_displayed != 0) {
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_select_first_row();
|
2009-07-24 08:10:33 +00:00
|
|
|
}
|
2000-01-18 08:38:18 +00:00
|
|
|
|
2012-08-12 22:21:02 +00:00
|
|
|
if (stop_flag) {
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_message_box(ESD_TYPE_WARN, NULL,
|
2010-04-28 16:37:25 +00:00
|
|
|
"The remaining packets in the file were discarded.\n"
|
|
|
|
"\n"
|
|
|
|
"As a lot of packets from the original file will be missing,\n"
|
|
|
|
"remember to be careful when saving the current content to a file.\n",
|
2012-06-17 22:32:03 +00:00
|
|
|
"File loading was cancelled!");
|
2005-11-08 22:24:53 +00:00
|
|
|
return CF_READ_ERROR;
|
|
|
|
}
|
|
|
|
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
if (err != 0) {
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
/* Put up a message box noting that the read failed somewhere along
|
|
|
|
the line. Don't throw out the stuff we managed to read, though,
|
|
|
|
if any. */
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
switch (err) {
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
|
2012-02-16 18:58:40 +00:00
|
|
|
case WTAP_ERR_UNSUPPORTED:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"The capture file contains record data that Wireshark doesn't support.\n(%s)",
|
2012-02-16 18:58:40 +00:00
|
|
|
err_info);
|
|
|
|
g_free(err_info);
|
|
|
|
break;
|
|
|
|
|
2000-02-19 08:00:08 +00:00
|
|
|
case WTAP_ERR_UNSUPPORTED_ENCAP:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2010-04-28 16:37:25 +00:00
|
|
|
"The capture file has a packet with a network type that Wireshark doesn't support.\n(%s)",
|
|
|
|
err_info);
|
2004-10-28 01:52:05 +00:00
|
|
|
g_free(err_info);
|
2000-02-19 08:00:08 +00:00
|
|
|
break;
|
|
|
|
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
case WTAP_ERR_CANT_READ:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"An attempt to read from the capture file failed for"
|
|
|
|
" some unknown reason.");
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case WTAP_ERR_SHORT_READ:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"The capture file appears to have been cut short"
|
|
|
|
" in the middle of a packet.");
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
break;
|
|
|
|
|
2011-12-13 09:53:50 +00:00
|
|
|
case WTAP_ERR_BAD_FILE:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2010-04-28 16:37:25 +00:00
|
|
|
"The capture file appears to be damaged or corrupt.\n(%s)",
|
|
|
|
err_info);
|
2004-10-28 01:52:05 +00:00
|
|
|
g_free(err_info);
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
break;
|
|
|
|
|
2011-04-21 09:41:52 +00:00
|
|
|
case WTAP_ERR_DECOMPRESS:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2011-04-21 09:41:52 +00:00
|
|
|
"The compressed capture file appears to be damaged or corrupt.\n"
|
|
|
|
"(%s)", err_info);
|
|
|
|
g_free(err_info);
|
|
|
|
break;
|
|
|
|
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
default:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2010-04-28 16:37:25 +00:00
|
|
|
"An error occurred while reading the"
|
|
|
|
" capture file: %s.", wtap_strerror(err));
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
break;
|
|
|
|
}
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_READ_ERROR;
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
} else
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_READ_OK;
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
|
1999-07-13 02:53:26 +00:00
|
|
|
#ifdef HAVE_LIBPCAP
|
2005-02-04 20:54:12 +00:00
|
|
|
cf_read_status_t
|
2012-10-22 21:22:35 +00:00
|
|
|
cf_continue_tail(capture_file *cf, volatile int to_read, int *err)
|
1999-11-29 01:54:01 +00:00
|
|
|
{
|
2012-11-03 23:41:59 +00:00
|
|
|
gchar *err_info;
|
|
|
|
int newly_displayed_packets = 0;
|
|
|
|
dfilter_t *dfcode;
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_t edt;
|
|
|
|
gboolean create_proto_tree;
|
2012-11-03 23:41:59 +00:00
|
|
|
guint tap_flags;
|
|
|
|
gboolean compiled;
|
2007-01-01 10:23:37 +00:00
|
|
|
|
|
|
|
/* Compile the current display filter.
|
2007-12-05 23:50:28 +00:00
|
|
|
* We assume this will not fail since cf->dfilter is only set in
|
2007-01-01 10:23:37 +00:00
|
|
|
* cf_filter IFF the filter was valid.
|
|
|
|
*/
|
2009-09-21 15:38:40 +00:00
|
|
|
compiled = dfilter_compile(cf->dfilter, &dfcode);
|
|
|
|
g_assert(!cf->dfilter || (compiled && dfcode));
|
1999-11-29 01:54:01 +00:00
|
|
|
|
2009-06-05 22:42:47 +00:00
|
|
|
/* Get the union of the flags for all tap listeners. */
|
|
|
|
tap_flags = union_of_tap_listener_flags();
|
2012-10-20 12:51:34 +00:00
|
|
|
create_proto_tree =
|
|
|
|
(dfcode != NULL || have_filtering_tap_listeners() || (tap_flags & TL_REQUIRES_PROTO_TREE));
|
2009-06-05 22:42:47 +00:00
|
|
|
|
2002-10-14 19:59:51 +00:00
|
|
|
*err = 0;
|
|
|
|
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_check_end();
|
2010-02-17 23:03:41 +00:00
|
|
|
/* Don't freeze/thaw the list when doing live capture */
|
2012-09-04 02:35:25 +00:00
|
|
|
/*packet_list_freeze();*/
|
1999-11-29 01:54:01 +00:00
|
|
|
|
2005-10-06 00:55:21 +00:00
|
|
|
/*g_log(NULL, G_LOG_LEVEL_MESSAGE, "cf_continue_tail: %u new: %u", cf->count, to_read);*/
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_init(&edt, cf->epan, create_proto_tree, FALSE);
|
|
|
|
|
2012-10-22 19:44:51 +00:00
|
|
|
TRY {
|
|
|
|
gint64 data_offset = 0;
|
2012-10-22 21:22:35 +00:00
|
|
|
column_info *cinfo;
|
|
|
|
|
|
|
|
cinfo = (tap_flags & TL_REQUIRES_COLUMNS) ? &cf->cinfo : NULL;
|
2012-10-22 19:44:51 +00:00
|
|
|
|
|
|
|
while (to_read != 0) {
|
|
|
|
wtap_cleareof(cf->wth);
|
|
|
|
if (!wtap_read(cf->wth, err, &err_info, &data_offset)) {
|
2012-11-25 18:35:41 +00:00
|
|
|
break;
|
2012-10-22 19:44:51 +00:00
|
|
|
}
|
|
|
|
if (cf->state == FILE_READ_ABORTED) {
|
2012-11-25 18:35:41 +00:00
|
|
|
/* Well, the user decided to exit Wireshark. Break out of the
|
|
|
|
loop, and let the code below (which is called even if there
|
|
|
|
aren't any packets left to read) exit. */
|
|
|
|
break;
|
2012-10-22 19:44:51 +00:00
|
|
|
}
|
2013-10-20 13:22:48 +00:00
|
|
|
if (read_packet(cf, dfcode, &edt, (column_info *) cinfo, data_offset) != -1) {
|
2012-11-25 18:35:41 +00:00
|
|
|
newly_displayed_packets++;
|
2012-10-22 19:44:51 +00:00
|
|
|
}
|
|
|
|
to_read--;
|
2007-01-15 05:16:13 +00:00
|
|
|
}
|
2012-10-22 19:14:43 +00:00
|
|
|
}
|
|
|
|
CATCH(OutOfMemoryError) {
|
|
|
|
simple_message_box(ESD_TYPE_ERROR, NULL,
|
|
|
|
"Some infos / workarounds can be found at:\n"
|
|
|
|
"http://wiki.wireshark.org/KnownBugs/OutOfMemory",
|
|
|
|
"Sorry, but Wireshark has run out of memory and has to terminate now!");
|
2012-06-17 22:32:03 +00:00
|
|
|
#if 0
|
2012-10-22 19:14:43 +00:00
|
|
|
/* Could we close the current capture and free up memory from that? */
|
|
|
|
return CF_READ_ABORTED;
|
2012-06-17 22:32:03 +00:00
|
|
|
#else
|
2012-10-22 19:14:43 +00:00
|
|
|
/* we have to terminate, as we cannot recover from the memory error */
|
|
|
|
exit(1);
|
2012-06-17 22:32:03 +00:00
|
|
|
#endif
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
}
|
2012-10-22 19:14:43 +00:00
|
|
|
ENDTRY;
|
1999-11-29 01:54:01 +00:00
|
|
|
|
2012-06-03 23:38:11 +00:00
|
|
|
/* Update the file encapsulation; it might have changed based on the
|
|
|
|
packets we've read. */
|
|
|
|
cf->lnk_t = wtap_file_encap(cf->wth);
|
|
|
|
|
2007-01-01 10:23:37 +00:00
|
|
|
/* Cleanup and release all dfilter resources */
|
2012-08-12 22:21:02 +00:00
|
|
|
if (dfcode != NULL) {
|
2007-01-01 10:23:37 +00:00
|
|
|
dfilter_free(dfcode);
|
|
|
|
}
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_cleanup(&edt);
|
|
|
|
|
2006-04-27 18:46:05 +00:00
|
|
|
/*g_log(NULL, G_LOG_LEVEL_MESSAGE, "cf_continue_tail: count %u state: %u err: %u",
|
2010-04-28 16:37:25 +00:00
|
|
|
cf->count, cf->state, *err);*/
|
2005-10-06 00:55:21 +00:00
|
|
|
|
2010-02-01 06:30:47 +00:00
|
|
|
/* Don't freeze/thaw the list when doing live capture */
|
2012-09-04 02:35:25 +00:00
|
|
|
/*packet_list_thaw();*/
|
2009-09-22 18:51:33 +00:00
|
|
|
/* With the new packet list the first packet
|
|
|
|
* isn't automatically selected.
|
|
|
|
*/
|
2012-08-12 22:21:02 +00:00
|
|
|
if (!cf->current_frame)
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_select_first_row();
|
2006-10-29 12:51:15 +00:00
|
|
|
|
2007-12-05 23:50:28 +00:00
|
|
|
/* moving to the end of the packet list - if the user requested so and
|
2009-09-02 17:15:20 +00:00
|
|
|
we have some new packets. */
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
if (newly_displayed_packets && auto_scroll_live && cf->count != 0)
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_moveto_end();
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
|
|
|
|
if (cf->state == FILE_READ_ABORTED) {
|
2006-05-28 20:28:20 +00:00
|
|
|
/* Well, the user decided to exit Wireshark. Return CF_READ_ABORTED
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
so that our caller can kill off the capture child process;
|
|
|
|
this will cause an EOF on the pipe from the child, so
|
2003-09-15 22:48:42 +00:00
|
|
|
"cf_finish_tail()" will be called, and it will clean up
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
and exit. */
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_READ_ABORTED;
|
2000-09-17 07:58:39 +00:00
|
|
|
} else if (*err != 0) {
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
/* We got an error reading the capture file.
|
2005-10-06 00:55:21 +00:00
|
|
|
XXX - pop up a dialog box instead? */
|
2012-09-20 21:16:26 +00:00
|
|
|
g_warning("Error \"%s\" while reading: \"%s\" (\"%s\")",
|
|
|
|
wtap_strerror(*err), err_info, cf->filename);
|
|
|
|
g_free(err_info);
|
2005-10-06 00:55:21 +00:00
|
|
|
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_READ_ERROR;
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
} else
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_READ_OK;
|
1999-11-29 01:54:01 +00:00
|
|
|
}
|
|
|
|
|
2010-05-27 23:55:04 +00:00
|
|
|
void
|
|
|
|
cf_fake_continue_tail(capture_file *cf) {
|
|
|
|
cf->state = FILE_READ_DONE;
|
|
|
|
}
|
|
|
|
|
2005-02-04 20:54:12 +00:00
|
|
|
cf_read_status_t
|
2003-09-15 22:48:42 +00:00
|
|
|
cf_finish_tail(capture_file *cf, int *err)
|
1999-11-29 01:54:01 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
gchar *err_info;
|
|
|
|
gint64 data_offset;
|
|
|
|
dfilter_t *dfcode;
|
2012-10-20 12:51:34 +00:00
|
|
|
column_info *cinfo;
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_t edt;
|
2012-10-20 12:51:34 +00:00
|
|
|
gboolean create_proto_tree;
|
2012-08-12 22:21:02 +00:00
|
|
|
guint tap_flags;
|
|
|
|
gboolean compiled;
|
2007-01-01 10:23:37 +00:00
|
|
|
|
|
|
|
/* Compile the current display filter.
|
2007-12-05 23:50:28 +00:00
|
|
|
* We assume this will not fail since cf->dfilter is only set in
|
2007-01-01 10:23:37 +00:00
|
|
|
* cf_filter IFF the filter was valid.
|
|
|
|
*/
|
2009-09-21 15:38:40 +00:00
|
|
|
compiled = dfilter_compile(cf->dfilter, &dfcode);
|
|
|
|
g_assert(!cf->dfilter || (compiled && dfcode));
|
2005-04-12 00:54:52 +00:00
|
|
|
|
2009-06-05 22:42:47 +00:00
|
|
|
/* Get the union of the flags for all tap listeners. */
|
|
|
|
tap_flags = union_of_tap_listener_flags();
|
2012-10-20 12:51:34 +00:00
|
|
|
cinfo = (tap_flags & TL_REQUIRES_COLUMNS) ? &cf->cinfo : NULL;
|
|
|
|
create_proto_tree =
|
|
|
|
(dfcode != NULL || have_filtering_tap_listeners() || (tap_flags & TL_REQUIRES_PROTO_TREE));
|
2009-06-05 22:42:47 +00:00
|
|
|
|
2012-08-12 22:21:02 +00:00
|
|
|
if (cf->wth == NULL) {
|
2005-04-12 00:54:52 +00:00
|
|
|
cf_close(cf);
|
|
|
|
return CF_READ_ERROR;
|
|
|
|
}
|
|
|
|
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_check_end();
|
2010-02-17 23:03:41 +00:00
|
|
|
/* Don't freeze/thaw the list when doing live capture */
|
2012-09-04 02:35:25 +00:00
|
|
|
/*packet_list_freeze();*/
|
1999-11-29 01:54:01 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_init(&edt, cf->epan, create_proto_tree, FALSE);
|
|
|
|
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
while ((wtap_read(cf->wth, err, &err_info, &data_offset))) {
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
if (cf->state == FILE_READ_ABORTED) {
|
|
|
|
/* Well, the user decided to abort the read. Break out of the
|
|
|
|
loop, and let the code below (which is called even if there
|
2012-06-15 23:54:05 +00:00
|
|
|
aren't any packets left to read) exit. */
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
break;
|
|
|
|
}
|
2013-10-20 13:22:48 +00:00
|
|
|
read_packet(cf, dfcode, &edt, cinfo, data_offset);
|
2007-01-01 10:23:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Cleanup and release all dfilter resources */
|
2012-08-12 22:21:02 +00:00
|
|
|
if (dfcode != NULL) {
|
2007-01-01 10:23:37 +00:00
|
|
|
dfilter_free(dfcode);
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
}
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_cleanup(&edt);
|
|
|
|
|
2010-02-17 23:03:41 +00:00
|
|
|
/* Don't freeze/thaw the list when doing live capture */
|
2012-09-04 02:35:25 +00:00
|
|
|
/*packet_list_thaw();*/
|
2005-10-06 00:55:21 +00:00
|
|
|
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
if (cf->state == FILE_READ_ABORTED) {
|
|
|
|
/* Well, the user decided to abort the read. We're only called
|
|
|
|
when the child capture process closes the pipe to us (meaning
|
|
|
|
it's probably exited), so we can just close the capture
|
2005-02-05 13:44:27 +00:00
|
|
|
file; we return CF_READ_ABORTED so our caller can do whatever
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
is appropriate when that happens. */
|
2003-09-15 22:48:42 +00:00
|
|
|
cf_close(cf);
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_READ_ABORTED;
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
}
|
1999-11-29 01:54:01 +00:00
|
|
|
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
if (auto_scroll_live && cf->count != 0)
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_moveto_end();
|
1999-11-29 01:54:01 +00:00
|
|
|
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
/* We're done reading sequentially through the file. */
|
|
|
|
cf->state = FILE_READ_DONE;
|
|
|
|
|
2000-05-18 09:09:50 +00:00
|
|
|
/* We're done reading sequentially through the file; close the
|
2011-04-12 17:37:05 +00:00
|
|
|
sequential I/O side, to free up memory it requires. */
|
|
|
|
wtap_sequential_close(cf->wth);
|
2000-05-18 09:09:50 +00:00
|
|
|
|
2002-01-05 04:12:17 +00:00
|
|
|
/* Allow the protocol dissectors to free up memory that they
|
|
|
|
* don't need after the sequential run-through of the packets. */
|
|
|
|
postseq_cleanup_all_protocols();
|
|
|
|
|
2012-06-03 23:38:11 +00:00
|
|
|
/* Update the file encapsulation; it might have changed based on the
|
|
|
|
packets we've read. */
|
1999-12-04 11:32:25 +00:00
|
|
|
cf->lnk_t = wtap_file_encap(cf->wth);
|
|
|
|
|
2012-06-24 15:08:41 +00:00
|
|
|
/* Update the details in the file-set dialog, as the capture file
|
|
|
|
* has likely grown since we first stat-ed it */
|
|
|
|
fileset_update_file(cf->filename);
|
|
|
|
|
2000-09-17 07:58:39 +00:00
|
|
|
if (*err != 0) {
|
Add routines to Wiretap to allow a client of Wiretap to get:
a pointer to the "wtap_pkthdr" structure for an open capture
file;
a pointer to the "wtap_pseudo_header" union for an open capture
file;
a pointer to the packet buffer for an open capture file;
so that a program using "wtap_read()" in a loop can get at those items.
Keep, in a "capture_file" structure, an indicator of whether:
no file is open;
a file is open, and being read;
a file is open, and is being read, but the user tried to quit
out of reading the file (e.g., by doing "File/Quit");
a file is open, and has been completely read.
Abort if we try to close a capture that's being read if the user hasn't
tried to quit out of the read.
Have "File/Quit" check if a file is being read; if so, just set the
state indicator to "user tried to quit out of it", so that the code
reading the file can do what's appropriate to clean up, rather than
closing the file out from under that code and causing crashes.
Have "read_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
close the capture and return an indication that the read was aborted by
the user. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "continue_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
return an indication that the read was aborted by the user if that
happened. Otherwise, return an indication of whether the read
completely succeeded or failed in the middle (and, if it failed, return
the error code through a pointer).
Have "finish_tail_cap_file()" read the capture file with a loop using
"wtap_read()", rather than by using "wtap_loop()"; have it check after
reading each packet whether the user tried to abort the read and, if so,
quit the loop, and after the loop finishes (even if it read no packets),
close the capture and return an indication that the read was aborted by
the user if that happened. Otherwise, return an indication of whether
the read completely succeeded or failed in the middle (and, if it
failed, return the error code through a pointer).
Have their callers check whether the read was aborted or not and, if it
was, bail out in the appropriate fashion (exit if it's reading a file
specified by "-r" on the command line; exit the main loop if it's
reading a file specified with File->Open; kill the capture child if it's
"continue_tail_cap_file()"; exit the main loop if it's
"finish_tail_cap_file()".
svn path=/trunk/; revision=2095
2000-06-27 07:13:42 +00:00
|
|
|
/* We got an error reading the capture file.
|
|
|
|
XXX - pop up a dialog box? */
|
2012-09-20 21:16:26 +00:00
|
|
|
|
|
|
|
g_warning("Error \"%s\" while reading: \"%s\" (\"%s\")",
|
|
|
|
wtap_strerror(*err), err_info, cf->filename);
|
|
|
|
g_free(err_info);
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_READ_ERROR;
|
2004-02-03 17:59:01 +00:00
|
|
|
} else {
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_READ_OK;
|
2004-02-03 17:59:01 +00:00
|
|
|
}
|
1999-05-11 18:51:10 +00:00
|
|
|
}
|
1999-09-19 15:54:54 +00:00
|
|
|
#endif /* HAVE_LIBPCAP */
|
1999-05-11 18:51:10 +00:00
|
|
|
|
2012-06-03 22:03:05 +00:00
|
|
|
gchar *
|
2003-09-15 22:16:08 +00:00
|
|
|
cf_get_display_name(capture_file *cf)
|
|
|
|
{
|
2012-06-03 22:03:05 +00:00
|
|
|
gchar *displayname;
|
2003-09-15 22:16:08 +00:00
|
|
|
|
|
|
|
/* Return a name to use in displays */
|
2003-09-15 23:28:07 +00:00
|
|
|
if (!cf->is_tempfile) {
|
2003-09-15 22:16:08 +00:00
|
|
|
/* Get the last component of the file name, and use that. */
|
2012-08-12 22:21:02 +00:00
|
|
|
if (cf->filename) {
|
2012-06-03 19:31:59 +00:00
|
|
|
displayname = g_filename_display_basename(cf->filename);
|
2003-10-26 03:09:03 +00:00
|
|
|
} else {
|
2012-06-03 22:03:05 +00:00
|
|
|
displayname=g_strdup("(No file)");
|
2003-10-26 03:09:03 +00:00
|
|
|
}
|
2003-09-15 22:16:08 +00:00
|
|
|
} else {
|
2012-06-03 18:48:51 +00:00
|
|
|
/* The file we read is a temporary file from a live capture or
|
|
|
|
a merge operation; we don't mention its name, but, if it's
|
|
|
|
from a capture, give the source of the capture. */
|
2010-04-01 21:55:01 +00:00
|
|
|
if (cf->source) {
|
2012-06-03 22:03:05 +00:00
|
|
|
displayname = g_strdup(cf->source);
|
2010-04-01 21:55:01 +00:00
|
|
|
} else {
|
2012-06-03 22:03:05 +00:00
|
|
|
displayname = g_strdup("(Untitled)");
|
2010-04-01 21:55:01 +00:00
|
|
|
}
|
2003-09-15 22:16:08 +00:00
|
|
|
}
|
|
|
|
return displayname;
|
|
|
|
}
|
|
|
|
|
2010-04-01 21:55:01 +00:00
|
|
|
void cf_set_tempfile_source(capture_file *cf, gchar *source) {
|
|
|
|
if (cf->source) {
|
|
|
|
g_free(cf->source);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (source) {
|
|
|
|
cf->source = g_strdup(source);
|
|
|
|
} else {
|
|
|
|
cf->source = g_strdup("");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const gchar *cf_get_tempfile_source(capture_file *cf) {
|
|
|
|
if (!cf->source) {
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
|
|
|
return cf->source;
|
|
|
|
}
|
|
|
|
|
2005-02-04 01:29:29 +00:00
|
|
|
/* XXX - use a macro instead? */
|
|
|
|
int
|
2006-01-22 16:26:41 +00:00
|
|
|
cf_get_packet_count(capture_file *cf)
|
2005-02-04 01:29:29 +00:00
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
return cf->count;
|
2005-02-04 01:29:29 +00:00
|
|
|
}
|
|
|
|
|
2006-01-22 16:26:41 +00:00
|
|
|
/* XXX - use a macro instead? */
|
|
|
|
void
|
|
|
|
cf_set_packet_count(capture_file *cf, int packet_count)
|
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
cf->count = packet_count;
|
2006-01-22 16:26:41 +00:00
|
|
|
}
|
|
|
|
|
2005-02-04 01:29:29 +00:00
|
|
|
/* XXX - use a macro instead? */
|
|
|
|
gboolean
|
|
|
|
cf_is_tempfile(capture_file *cf)
|
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
return cf->is_tempfile;
|
2005-02-04 01:29:29 +00:00
|
|
|
}
|
|
|
|
|
2005-03-28 14:39:31 +00:00
|
|
|
void cf_set_tempfile(capture_file *cf, gboolean is_tempfile)
|
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
cf->is_tempfile = is_tempfile;
|
2005-03-28 14:39:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-04 01:29:29 +00:00
|
|
|
/* XXX - use a macro instead? */
|
|
|
|
void cf_set_drops_known(capture_file *cf, gboolean drops_known)
|
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
cf->drops_known = drops_known;
|
2005-02-04 01:29:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX - use a macro instead? */
|
|
|
|
void cf_set_drops(capture_file *cf, guint32 drops)
|
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
cf->drops = drops;
|
2005-02-04 01:29:29 +00:00
|
|
|
}
|
|
|
|
|
2005-02-28 22:46:49 +00:00
|
|
|
/* XXX - use a macro instead? */
|
|
|
|
gboolean cf_get_drops_known(capture_file *cf)
|
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
return cf->drops_known;
|
2005-02-28 22:46:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX - use a macro instead? */
|
|
|
|
guint32 cf_get_drops(capture_file *cf)
|
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
return cf->drops;
|
2005-02-28 22:46:49 +00:00
|
|
|
}
|
|
|
|
|
2005-02-04 08:27:41 +00:00
|
|
|
void cf_set_rfcode(capture_file *cf, dfilter_t *rfcode)
|
|
|
|
{
|
2010-04-28 16:37:25 +00:00
|
|
|
cf->rfcode = rfcode;
|
2005-02-04 08:27:41 +00:00
|
|
|
}
|
|
|
|
|
We can't trust "cf->current_frame" to refer to the frame that was
selected before we started re-colorizing or re-filtering the display, as
when the first row is added to the clist, that may be selected and thus
made the current frame.
This means that we can't find the row corresponding to the
previously-selected frame, if any, by checking as each packet is
colorized/filtered and see whether its "frame_data" structure is equal
to "cf->current_frame", as that'll always say that the first frame in
the display is the selected frame.
Instead, we recored the value of "cf->current_frame" before we do
anything to the clist, have "add_packet_to_packet_list()" return either
the row number of the frame (if it passed the filter and thus was added
to the clist) or -1 (if it didn't pass the filter and thus wasn't added
to the clist), and, after "add_packet_to_packet_list()", if the current
frame is the one that was the selected row, remember its row number (if
any), and, when we're finished colorizing/filtering the display, make
that row the current row if it's not -1 (-1 means that the selected row
didn't pass the filter).
Also, don't do that until after we've thawed the clist, as the vertical
adjustment for the clist doesn't reflect reality until then, and
attempting to go to a given row won't work right until the vertical
adjustment for the clist reflects reality.
Shove all the code to set the selected and focus rows, and to make said
row visible, into a routine, so the "Find Frame" and "Go To Frame" code
can use it as well.
svn path=/trunk/; revision=1959
2000-05-15 01:50:16 +00:00
|
|
|
static int
|
2000-05-18 09:09:50 +00:00
|
|
|
add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_t *edt, dfilter_t *dfcode, column_info *cinfo,
|
2013-06-16 00:20:00 +00:00
|
|
|
struct wtap_pkthdr *phdr, const guint8 *buf, gboolean add_to_packet_list)
|
1999-08-14 04:23:22 +00:00
|
|
|
{
|
2012-11-03 20:51:19 +00:00
|
|
|
gint row = -1;
|
2009-08-10 20:52:56 +00:00
|
|
|
|
2009-09-22 14:41:30 +00:00
|
|
|
frame_data_set_before_dissect(fdata, &cf->elapsed_time,
|
2013-08-14 04:14:36 +00:00
|
|
|
&cf->ref, cf->prev_dis);
|
|
|
|
cf->prev_cap = fdata;
|
2009-09-21 19:30:06 +00:00
|
|
|
|
2012-11-03 20:51:19 +00:00
|
|
|
if (dfcode != NULL) {
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_prime_dfilter(edt, dfcode);
|
2012-11-03 20:51:19 +00:00
|
|
|
}
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
/* Dissect the frame. */
|
|
|
|
epan_dissect_run_with_taps(edt, phdr, frame_tvbuff_new(fdata, buf), fdata, cinfo);
|
2009-09-21 12:14:11 +00:00
|
|
|
|
2012-10-20 12:51:05 +00:00
|
|
|
/* If we don't have a display filter, set "passed_dfilter" to 1. */
|
2009-09-21 12:14:11 +00:00
|
|
|
if (dfcode != NULL) {
|
2013-10-20 13:22:48 +00:00
|
|
|
fdata->flags.passed_dfilter = dfilter_apply_edt(dfcode, edt) ? 1 : 0;
|
2012-02-28 03:19:49 +00:00
|
|
|
|
2012-10-20 12:51:05 +00:00
|
|
|
if (fdata->flags.passed_dfilter) {
|
|
|
|
/* This frame passed the display filter but it may depend on other
|
|
|
|
* (potentially not displayed) frames. Find those frames and mark them
|
|
|
|
* as depended upon.
|
|
|
|
*/
|
2013-10-20 13:22:48 +00:00
|
|
|
g_slist_foreach(edt->pi.dependent_frames, find_and_mark_frame_depended_upon, cf->frames);
|
2009-09-21 12:14:11 +00:00
|
|
|
}
|
2012-05-22 01:59:34 +00:00
|
|
|
} else
|
2009-09-21 12:14:11 +00:00
|
|
|
fdata->flags.passed_dfilter = 1;
|
|
|
|
|
2012-08-12 22:21:02 +00:00
|
|
|
if (fdata->flags.passed_dfilter || fdata->flags.ref_time)
|
2010-06-26 21:03:01 +00:00
|
|
|
cf->displayed_count++;
|
|
|
|
|
2009-09-21 12:14:11 +00:00
|
|
|
if (add_to_packet_list) {
|
|
|
|
/* We fill the needed columns from new_packet_list */
|
2013-11-24 12:49:50 +00:00
|
|
|
row = packet_list_append(cinfo, fdata);
|
2009-09-21 12:14:11 +00:00
|
|
|
}
|
|
|
|
|
2012-08-12 22:21:02 +00:00
|
|
|
if (fdata->flags.passed_dfilter || fdata->flags.ref_time)
|
2009-09-21 12:14:11 +00:00
|
|
|
{
|
2013-08-14 04:14:36 +00:00
|
|
|
frame_data_set_after_dissect(fdata, &cf->cum_bytes);
|
|
|
|
cf->prev_dis = fdata;
|
2009-09-21 20:17:59 +00:00
|
|
|
|
2009-09-21 12:14:11 +00:00
|
|
|
/* If we haven't yet seen the first frame, this is it.
|
|
|
|
|
|
|
|
XXX - we must do this before we add the row to the display,
|
|
|
|
as, if the display's GtkCList's selection mode is
|
|
|
|
GTK_SELECTION_BROWSE, when the first entry is added to it,
|
|
|
|
"cf_select_packet()" will be called, and it will fetch the row
|
|
|
|
data for the 0th row, and will get a null pointer rather than
|
|
|
|
"fdata", as "gtk_clist_append()" won't yet have returned and
|
|
|
|
thus "gtk_clist_set_row_data()" won't yet have been called.
|
|
|
|
|
|
|
|
We thus need to leave behind bread crumbs so that
|
|
|
|
"cf_select_packet()" can find this frame. See the comment
|
|
|
|
in "cf_select_packet()". */
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
if (cf->first_displayed == 0)
|
|
|
|
cf->first_displayed = fdata->num;
|
2009-09-21 12:14:11 +00:00
|
|
|
|
|
|
|
/* This is the last frame we've seen so far. */
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
cf->last_displayed = fdata->num;
|
2009-09-21 12:14:11 +00:00
|
|
|
}
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_reset(edt);
|
2009-09-21 12:14:11 +00:00
|
|
|
return row;
|
|
|
|
}
|
|
|
|
|
2006-11-05 13:47:17 +00:00
|
|
|
/* read in a new packet */
|
|
|
|
/* returns the row of the new packet in the packet list or -1 if not displayed */
|
|
|
|
static int
|
2013-10-20 13:22:48 +00:00
|
|
|
read_packet(capture_file *cf, dfilter_t *dfcode, epan_dissect_t *edt,
|
|
|
|
column_info *cinfo, gint64 offset)
|
We can't trust "cf->current_frame" to refer to the frame that was
selected before we started re-colorizing or re-filtering the display, as
when the first row is added to the clist, that may be selected and thus
made the current frame.
This means that we can't find the row corresponding to the
previously-selected frame, if any, by checking as each packet is
colorized/filtered and see whether its "frame_data" structure is equal
to "cf->current_frame", as that'll always say that the first frame in
the display is the selected frame.
Instead, we recored the value of "cf->current_frame" before we do
anything to the clist, have "add_packet_to_packet_list()" return either
the row number of the frame (if it passed the filter and thus was added
to the clist) or -1 (if it didn't pass the filter and thus wasn't added
to the clist), and, after "add_packet_to_packet_list()", if the current
frame is the one that was the selected row, remember its row number (if
any), and, when we're finished colorizing/filtering the display, make
that row the current row if it's not -1 (-1 means that the selected row
didn't pass the filter).
Also, don't do that until after we've thawed the clist, as the vertical
adjustment for the clist doesn't reflect reality until then, and
attempting to go to a given row won't work right until the vertical
adjustment for the clist reflects reality.
Shove all the code to set the selected and focus rows, and to make said
row visible, into a routine, so the "Find Frame" and "Go To Frame" code
can use it as well.
svn path=/trunk/; revision=1959
2000-05-15 01:50:16 +00:00
|
|
|
{
|
2012-10-16 21:50:57 +00:00
|
|
|
struct wtap_pkthdr *phdr = wtap_phdr(cf->wth);
|
2013-06-16 00:20:00 +00:00
|
|
|
const guint8 *buf = wtap_buf_ptr(cf->wth);
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
frame_data fdlocal;
|
|
|
|
guint32 framenum;
|
1999-06-19 01:14:51 +00:00
|
|
|
frame_data *fdata;
|
2013-12-05 21:35:25 +00:00
|
|
|
gboolean passed;
|
2009-09-22 16:39:48 +00:00
|
|
|
int row = -1;
|
1999-09-23 04:39:01 +00:00
|
|
|
|
2012-06-15 23:54:05 +00:00
|
|
|
/* Add this packet's link-layer encapsulation type to cf->linktypes, if
|
|
|
|
it's not already there.
|
2012-07-19 21:49:52 +00:00
|
|
|
XXX - yes, this is O(N), so if every packet had a different
|
2012-06-15 23:54:05 +00:00
|
|
|
link-layer encapsulation type, it'd be O(N^2) to read the file, but
|
|
|
|
there are probably going to be a small number of encapsulation types
|
|
|
|
in a file. */
|
|
|
|
cf_add_encapsulation_type(cf, phdr->pkt_encap);
|
|
|
|
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
/* The frame number of this packet is one more than the count of
|
2012-06-05 02:49:56 +00:00
|
|
|
frames in the file so far. */
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
framenum = cf->count + 1;
|
2009-09-22 14:41:30 +00:00
|
|
|
|
2013-08-14 04:14:36 +00:00
|
|
|
frame_data_init(&fdlocal, framenum, phdr, offset, cf->cum_bytes);
|
2007-04-03 21:17:13 +00:00
|
|
|
|
1999-08-08 01:29:24 +00:00
|
|
|
passed = TRUE;
|
1999-08-15 19:18:46 +00:00
|
|
|
if (cf->rfcode) {
|
2013-10-20 17:53:55 +00:00
|
|
|
epan_dissect_t rf_edt;
|
2013-10-20 13:22:48 +00:00
|
|
|
|
2013-10-20 17:53:55 +00:00
|
|
|
epan_dissect_init(&rf_edt, cf->epan, TRUE, FALSE);
|
|
|
|
epan_dissect_prime_dfilter(&rf_edt, cf->rfcode);
|
|
|
|
epan_dissect_run(&rf_edt, phdr, frame_tvbuff_new(&fdlocal, buf), &fdlocal, NULL);
|
|
|
|
passed = dfilter_apply_edt(cf->rfcode, &rf_edt);
|
|
|
|
epan_dissect_cleanup(&rf_edt);
|
2002-08-28 21:04:11 +00:00
|
|
|
}
|
2009-09-21 04:29:25 +00:00
|
|
|
|
1999-08-08 01:29:24 +00:00
|
|
|
if (passed) {
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
/* This does a shallow copy of fdlocal, which is good enough. */
|
2011-04-27 02:54:44 +00:00
|
|
|
fdata = frame_data_sequence_add(cf->frames, &fdlocal);
|
2009-09-22 16:39:48 +00:00
|
|
|
|
2011-04-27 02:54:44 +00:00
|
|
|
cf->count++;
|
2013-08-01 20:59:38 +00:00
|
|
|
if (phdr->opt_comment != NULL)
|
2012-06-20 01:11:01 +00:00
|
|
|
cf->packet_comment_count++;
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
cf->f_datalen = offset + fdlocal.cap_len;
|
2009-09-21 15:23:33 +00:00
|
|
|
|
2012-09-28 10:08:17 +00:00
|
|
|
if (!cf->redissecting) {
|
2013-10-20 13:22:48 +00:00
|
|
|
row = add_packet_to_packet_list(fdata, cf, edt, dfcode,
|
|
|
|
cinfo, phdr, buf, TRUE);
|
2008-09-30 15:45:20 +00:00
|
|
|
}
|
2000-04-03 08:42:45 +00:00
|
|
|
}
|
2006-11-05 13:47:17 +00:00
|
|
|
|
|
|
|
return row;
|
1999-07-11 08:40:52 +00:00
|
|
|
}
|
|
|
|
|
2005-02-05 13:44:27 +00:00
|
|
|
cf_status_t
|
2005-02-17 03:05:54 +00:00
|
|
|
cf_merge_files(char **out_filenamep, int in_file_count,
|
2004-10-27 23:45:10 +00:00
|
|
|
char *const *in_filenames, int file_type, gboolean do_append)
|
2004-10-27 23:28:37 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
merge_in_file_t *in_files, *in_file;
|
|
|
|
char *out_filename;
|
|
|
|
char *tmpname;
|
|
|
|
int out_fd;
|
|
|
|
wtap_dumper *pdh;
|
|
|
|
int open_err, read_err, write_err, close_err;
|
|
|
|
gchar *err_info;
|
|
|
|
int err_fileno;
|
|
|
|
int i;
|
|
|
|
gboolean got_read_error = FALSE, got_write_error = FALSE;
|
|
|
|
gint64 data_offset;
|
|
|
|
progdlg_t *progbar = NULL;
|
|
|
|
gboolean stop_flag;
|
|
|
|
gint64 f_len, file_pos;
|
|
|
|
float progbar_val;
|
|
|
|
GTimeVal start_time;
|
|
|
|
gchar status_str[100];
|
|
|
|
gint64 progbar_nextstep;
|
|
|
|
gint64 progbar_quantum;
|
|
|
|
gchar *display_basename;
|
|
|
|
int selected_frame_type;
|
|
|
|
gboolean fake_interface_ids = FALSE;
|
2004-10-27 23:45:10 +00:00
|
|
|
|
|
|
|
/* open the input files */
|
2004-10-28 01:06:11 +00:00
|
|
|
if (!merge_open_in_files(in_file_count, in_filenames, &in_files,
|
2004-10-29 00:36:52 +00:00
|
|
|
&open_err, &err_info, &err_fileno)) {
|
2008-01-24 19:09:30 +00:00
|
|
|
g_free(in_files);
|
2004-10-29 00:36:52 +00:00
|
|
|
cf_open_failure_alert_box(in_filenames[err_fileno], open_err, err_info,
|
|
|
|
FALSE, 0);
|
2005-02-05 13:44:27 +00:00
|
|
|
return CF_ERROR;
|
2004-10-27 23:45:10 +00:00
|
|
|
}
|
2004-10-27 23:28:37 +00:00
|
|
|
|
2005-02-17 03:05:54 +00:00
|
|
|
if (*out_filenamep != NULL) {
|
|
|
|
out_filename = *out_filenamep;
|
2008-05-22 15:46:27 +00:00
|
|
|
out_fd = ws_open(out_filename, O_CREAT|O_TRUNC|O_BINARY, 0600);
|
2005-02-17 03:05:54 +00:00
|
|
|
if (out_fd == -1)
|
|
|
|
open_err = errno;
|
|
|
|
} else {
|
2009-07-01 23:36:51 +00:00
|
|
|
out_fd = create_tempfile(&tmpname, "wireshark");
|
2005-02-17 03:05:54 +00:00
|
|
|
if (out_fd == -1)
|
|
|
|
open_err = errno;
|
|
|
|
out_filename = g_strdup(tmpname);
|
|
|
|
*out_filenamep = out_filename;
|
|
|
|
}
|
|
|
|
if (out_fd == -1) {
|
|
|
|
err_info = NULL;
|
|
|
|
merge_close_in_files(in_file_count, in_files);
|
2008-01-24 19:09:30 +00:00
|
|
|
g_free(in_files);
|
2005-02-17 03:05:54 +00:00
|
|
|
cf_open_failure_alert_box(out_filename, open_err, NULL, TRUE, file_type);
|
|
|
|
return CF_ERROR;
|
|
|
|
}
|
|
|
|
|
2012-08-08 14:06:29 +00:00
|
|
|
selected_frame_type = merge_select_frame_type(in_file_count, in_files);
|
|
|
|
|
|
|
|
/* If we are trying to merge a number of libpcap files with different encapsulation types
|
|
|
|
* change the output file type to pcapng and create SHB and IDB:s for the new file use the
|
|
|
|
* interface index stored in in_files per file to change the phdr before writing the datablock.
|
|
|
|
* XXX should it be an option to convert to pcapng?
|
|
|
|
*
|
|
|
|
* We need something similar when merging pcapng files possibly with an option to say
|
|
|
|
* the same interface(s) used in all in files. SHBs comments should be merged together.
|
|
|
|
*/
|
2013-11-08 09:53:01 +00:00
|
|
|
if ((selected_frame_type == WTAP_ENCAP_PER_PACKET)&&(file_type == WTAP_FILE_TYPE_SUBTYPE_PCAP)) {
|
2012-08-12 22:21:02 +00:00
|
|
|
/* Write output in pcapng format */
|
|
|
|
wtapng_section_t *shb_hdr;
|
|
|
|
wtapng_iface_descriptions_t *idb_inf, *idb_inf_merge_file;
|
|
|
|
wtapng_if_descr_t int_data, *file_int_data;
|
|
|
|
GString *comment_gstr;
|
|
|
|
|
|
|
|
fake_interface_ids = TRUE;
|
|
|
|
/* Create SHB info */
|
2012-11-25 18:35:41 +00:00
|
|
|
shb_hdr = wtap_file_get_shb_info(in_files[0].wth);
|
2012-08-08 14:06:29 +00:00
|
|
|
comment_gstr = g_string_new("");
|
2012-08-12 22:21:02 +00:00
|
|
|
g_string_append_printf(comment_gstr, "%s \n",shb_hdr->opt_comment);
|
2012-08-08 14:06:29 +00:00
|
|
|
g_string_append_printf(comment_gstr, "File created by merging: \n");
|
2013-11-08 09:53:01 +00:00
|
|
|
file_type = WTAP_FILE_TYPE_SUBTYPE_PCAPNG;
|
2012-08-08 14:06:29 +00:00
|
|
|
|
|
|
|
for (i = 0; i < in_file_count; i++) {
|
|
|
|
g_string_append_printf(comment_gstr, "File%d: %s \n",i+1,in_files[i].filename);
|
|
|
|
}
|
|
|
|
shb_hdr->section_length = -1;
|
|
|
|
/* options */
|
2012-08-12 22:21:02 +00:00
|
|
|
shb_hdr->opt_comment = g_string_free(comment_gstr, FALSE); /* NULL if not available */
|
|
|
|
shb_hdr->shb_hardware = NULL; /* NULL if not available, UTF-8 string containing the */
|
|
|
|
/* description of the hardware used to create this section. */
|
|
|
|
shb_hdr->shb_os = NULL; /* NULL if not available, UTF-8 string containing the name */
|
|
|
|
/* of the operating system used to create this section. */
|
|
|
|
shb_hdr->shb_user_appl = "Wireshark"; /* NULL if not available, UTF-8 string containing the name */
|
|
|
|
/* of the application used to create this section. */
|
|
|
|
|
|
|
|
/* create fake IDB info */
|
|
|
|
idb_inf = g_new(wtapng_iface_descriptions_t,1);
|
|
|
|
idb_inf->number_of_interfaces = in_file_count; /* TODO make this the number of DIFFERENT encapsulation types
|
|
|
|
* check that snaplength is the same too?
|
|
|
|
*/
|
|
|
|
idb_inf->interface_data = g_array_new(FALSE, FALSE, sizeof(wtapng_if_descr_t));
|
|
|
|
|
|
|
|
for (i = 0; i < in_file_count; i++) {
|
|
|
|
idb_inf_merge_file = wtap_file_get_idb_info(in_files[i].wth);
|
|
|
|
/* read the interface data from the in file to our combined interfca data */
|
|
|
|
file_int_data = &g_array_index (idb_inf_merge_file->interface_data, wtapng_if_descr_t, 0);
|
|
|
|
int_data.wtap_encap = file_int_data->wtap_encap;
|
|
|
|
int_data.time_units_per_second = file_int_data->time_units_per_second;
|
|
|
|
int_data.link_type = file_int_data->link_type;
|
|
|
|
int_data.snap_len = file_int_data->snap_len;
|
|
|
|
int_data.if_name = g_strdup(file_int_data->if_name);
|
|
|
|
int_data.opt_comment = NULL;
|
|
|
|
int_data.if_description = NULL;
|
|
|
|
int_data.if_speed = 0;
|
|
|
|
int_data.if_tsresol = 6;
|
|
|
|
int_data.if_filter_str = NULL;
|
|
|
|
int_data.bpf_filter_len = 0;
|
|
|
|
int_data.if_filter_bpf_bytes = NULL;
|
|
|
|
int_data.if_os = NULL;
|
|
|
|
int_data.if_fcslen = -1;
|
|
|
|
int_data.num_stat_entries = 0; /* Number of ISB:s */
|
|
|
|
int_data.interface_statistics = NULL;
|
|
|
|
|
|
|
|
g_array_append_val(idb_inf->interface_data, int_data);
|
|
|
|
g_free(idb_inf_merge_file);
|
|
|
|
|
|
|
|
/* Set fake interface Id in per file data */
|
|
|
|
in_files[i].interface_id = i;
|
|
|
|
}
|
|
|
|
|
|
|
|
pdh = wtap_dump_fdopen_ng(out_fd, file_type,
|
|
|
|
selected_frame_type,
|
|
|
|
merge_max_snapshot_length(in_file_count, in_files),
|
|
|
|
FALSE /* compressed */, shb_hdr, idb_inf /* wtapng_iface_descriptions_t *idb_inf */, &open_err);
|
|
|
|
|
|
|
|
if (pdh == NULL) {
|
|
|
|
ws_close(out_fd);
|
|
|
|
merge_close_in_files(in_file_count, in_files);
|
|
|
|
g_free(in_files);
|
|
|
|
cf_open_failure_alert_box(out_filename, open_err, err_info, TRUE,
|
|
|
|
file_type);
|
|
|
|
return CF_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
pdh = wtap_dump_fdopen(out_fd, file_type,
|
|
|
|
selected_frame_type,
|
|
|
|
merge_max_snapshot_length(in_file_count, in_files),
|
|
|
|
FALSE /* compressed */, &open_err);
|
|
|
|
if (pdh == NULL) {
|
|
|
|
ws_close(out_fd);
|
|
|
|
merge_close_in_files(in_file_count, in_files);
|
|
|
|
g_free(in_files);
|
|
|
|
cf_open_failure_alert_box(out_filename, open_err, err_info, TRUE,
|
|
|
|
file_type);
|
|
|
|
return CF_ERROR;
|
|
|
|
}
|
2004-10-27 23:45:10 +00:00
|
|
|
}
|
2004-10-27 23:28:37 +00:00
|
|
|
|
2004-10-29 00:36:52 +00:00
|
|
|
/* Get the sum of the sizes of all the files. */
|
|
|
|
f_len = 0;
|
|
|
|
for (i = 0; i < in_file_count; i++)
|
|
|
|
f_len += in_files[i].size;
|
|
|
|
|
|
|
|
/* Update the progress bar when it gets to this value. */
|
|
|
|
progbar_nextstep = 0;
|
|
|
|
/* When we reach the value that triggers a progress bar update,
|
|
|
|
bump that value by this amount. */
|
|
|
|
progbar_quantum = f_len/N_PROGBAR_UPDATES;
|
2005-10-27 20:18:50 +00:00
|
|
|
/* Progress so far. */
|
2009-04-21 16:57:52 +00:00
|
|
|
progbar_val = 0.0f;
|
2004-10-29 00:36:52 +00:00
|
|
|
|
|
|
|
stop_flag = FALSE;
|
|
|
|
g_get_current_time(&start_time);
|
|
|
|
|
2004-10-27 23:45:10 +00:00
|
|
|
/* do the merge (or append) */
|
2004-10-29 00:36:52 +00:00
|
|
|
for (;;) {
|
|
|
|
if (do_append)
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
in_file = merge_append_read_packet(in_file_count, in_files, &read_err,
|
|
|
|
&err_info);
|
2004-10-29 00:36:52 +00:00
|
|
|
else
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
in_file = merge_read_packet(in_file_count, in_files, &read_err,
|
|
|
|
&err_info);
|
|
|
|
if (in_file == NULL) {
|
2011-11-21 06:26:03 +00:00
|
|
|
/* EOF */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (read_err != 0) {
|
|
|
|
/* I/O error reading from in_file */
|
|
|
|
got_read_error = TRUE;
|
2004-10-29 00:36:52 +00:00
|
|
|
break;
|
|
|
|
}
|
2004-10-27 23:28:37 +00:00
|
|
|
|
2004-10-29 00:36:52 +00:00
|
|
|
/* Get the sum of the data offsets in all of the files. */
|
|
|
|
data_offset = 0;
|
|
|
|
for (i = 0; i < in_file_count; i++)
|
|
|
|
data_offset += in_files[i].data_offset;
|
|
|
|
|
2005-10-27 06:45:37 +00:00
|
|
|
/* Create the progress bar if necessary.
|
|
|
|
We check on every iteration of the loop, so that it takes no
|
|
|
|
longer than the standard time to create it (otherwise, for a
|
|
|
|
large file, we might take considerably longer than that standard
|
|
|
|
time in order to get to the next progress bar step). */
|
|
|
|
if (progbar == NULL) {
|
2012-07-19 21:49:52 +00:00
|
|
|
progbar = delayed_create_progress_dlg(NULL, "Merging", "files",
|
2005-11-12 11:05:02 +00:00
|
|
|
FALSE, &stop_flag, &start_time, progbar_val);
|
2005-10-27 06:45:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
|
|
|
|
when we update it, we have to run the GTK+ main loop to get it
|
|
|
|
to repaint what's pending, and doing so may involve an "ioctl()"
|
|
|
|
to see if there's any pending input from an X server, and doing
|
|
|
|
that for every packet can be costly, especially on a big file. */
|
2004-10-29 00:36:52 +00:00
|
|
|
if (data_offset >= progbar_nextstep) {
|
|
|
|
/* Get the sum of the seek positions in all of the files. */
|
|
|
|
file_pos = 0;
|
|
|
|
for (i = 0; i < in_file_count; i++)
|
2011-05-09 05:30:59 +00:00
|
|
|
file_pos += wtap_read_so_far(in_files[i].wth);
|
2005-10-27 20:18:50 +00:00
|
|
|
progbar_val = (gfloat) file_pos / (gfloat) f_len;
|
2009-04-21 16:57:52 +00:00
|
|
|
if (progbar_val > 1.0f) {
|
2004-10-29 00:36:52 +00:00
|
|
|
/* Some file probably grew while we were reading it.
|
|
|
|
That "shouldn't happen", so we'll just clip the progress
|
|
|
|
value at 1.0. */
|
2009-04-21 16:57:52 +00:00
|
|
|
progbar_val = 1.0f;
|
2004-10-29 00:36:52 +00:00
|
|
|
}
|
|
|
|
if (progbar != NULL) {
|
|
|
|
g_snprintf(status_str, sizeof(status_str),
|
2007-05-29 18:52:42 +00:00
|
|
|
"%" G_GINT64_MODIFIER "dKB of %" G_GINT64_MODIFIER "dKB",
|
2005-08-19 19:40:00 +00:00
|
|
|
file_pos / 1024, f_len / 1024);
|
2005-10-27 20:18:50 +00:00
|
|
|
update_progress_dlg(progbar, progbar_val, status_str);
|
2004-10-29 00:36:52 +00:00
|
|
|
}
|
|
|
|
progbar_nextstep += progbar_quantum;
|
|
|
|
}
|
|
|
|
|
2005-11-12 11:05:02 +00:00
|
|
|
if (stop_flag) {
|
|
|
|
/* Well, the user decided to abort the merge. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2013-11-08 09:53:01 +00:00
|
|
|
/* If we have WTAP_ENCAP_PER_PACKET and the infiles are of type
|
|
|
|
* WTAP_FILE_TYPE_SUBTYPE_PCAP, we need to set the interface id
|
|
|
|
* in the paket header = the interface index we used in the IDBs
|
|
|
|
* interface description for this file(encapsulation type).
|
2012-08-12 22:21:02 +00:00
|
|
|
*/
|
|
|
|
if (fake_interface_ids) {
|
|
|
|
struct wtap_pkthdr *phdr;
|
|
|
|
|
|
|
|
phdr = wtap_phdr(in_file->wth);
|
|
|
|
phdr->interface_id = in_file->interface_id;
|
|
|
|
phdr->presence_flags = phdr->presence_flags | WTAP_HAS_INTERFACE_ID;
|
|
|
|
}
|
2012-10-16 21:50:57 +00:00
|
|
|
if (!wtap_dump(pdh, wtap_phdr(in_file->wth),
|
2012-08-12 22:21:02 +00:00
|
|
|
wtap_buf_ptr(in_file->wth), &write_err)) {
|
2004-10-29 00:36:52 +00:00
|
|
|
got_write_error = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2004-10-28 01:52:05 +00:00
|
|
|
|
2004-10-29 00:36:52 +00:00
|
|
|
/* We're done merging the files; destroy the progress bar if it was created. */
|
|
|
|
if (progbar != NULL)
|
|
|
|
destroy_progress_dlg(progbar);
|
2004-10-28 01:52:05 +00:00
|
|
|
|
2004-10-29 00:36:52 +00:00
|
|
|
merge_close_in_files(in_file_count, in_files);
|
|
|
|
if (!got_read_error && !got_write_error) {
|
|
|
|
if (!wtap_dump_close(pdh, &write_err))
|
|
|
|
got_write_error = TRUE;
|
|
|
|
} else
|
|
|
|
wtap_dump_close(pdh, &close_err);
|
2004-10-28 01:52:05 +00:00
|
|
|
|
2004-10-29 00:36:52 +00:00
|
|
|
if (got_read_error) {
|
2004-10-28 01:52:05 +00:00
|
|
|
/*
|
|
|
|
* Find the file on which we got the error, and report the error.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < in_file_count; i++) {
|
2004-10-29 00:36:52 +00:00
|
|
|
if (in_files[i].state == GOT_ERROR) {
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
/* Put up a message box noting that a read failed somewhere along
|
|
|
|
the line. */
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename = g_filename_display_basename(in_files[i].filename);
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
switch (read_err) {
|
|
|
|
|
|
|
|
case WTAP_ERR_UNSUPPORTED_ENCAP:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"The capture file %s has a packet with a network type that Wireshark doesn't support.\n(%s)",
|
|
|
|
display_basename, err_info);
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
g_free(err_info);
|
|
|
|
break;
|
2009-09-21 15:50:15 +00:00
|
|
|
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
case WTAP_ERR_CANT_READ:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"An attempt to read from the capture file %s failed for"
|
|
|
|
" some unknown reason.", display_basename);
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
break;
|
2009-09-21 15:50:15 +00:00
|
|
|
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
case WTAP_ERR_SHORT_READ:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"The capture file %s appears to have been cut short"
|
|
|
|
" in the middle of a packet.", display_basename);
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
break;
|
2009-09-21 15:50:15 +00:00
|
|
|
|
2011-12-13 09:53:50 +00:00
|
|
|
case WTAP_ERR_BAD_FILE:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"The capture file %s appears to be damaged or corrupt.\n(%s)",
|
|
|
|
display_basename, err_info);
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
g_free(err_info);
|
|
|
|
break;
|
2009-09-21 15:50:15 +00:00
|
|
|
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
case WTAP_ERR_DECOMPRESS:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"The compressed capture file %s appears to be damaged or corrupt.\n"
|
|
|
|
"(%s)", display_basename, err_info);
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
g_free(err_info);
|
|
|
|
break;
|
2011-04-21 09:41:52 +00:00
|
|
|
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
default:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
"An error occurred while reading the"
|
2012-06-17 22:32:03 +00:00
|
|
|
" capture file %s: %s.",
|
|
|
|
display_basename, wtap_strerror(read_err));
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-06-17 22:32:03 +00:00
|
|
|
g_free(display_basename);
|
2004-10-28 01:52:05 +00:00
|
|
|
}
|
|
|
|
}
|
2004-10-29 00:36:52 +00:00
|
|
|
}
|
2004-10-27 23:45:10 +00:00
|
|
|
|
2004-10-29 00:36:52 +00:00
|
|
|
if (got_write_error) {
|
|
|
|
/* Put up an alert box for the write error. */
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
if (write_err < 0) {
|
|
|
|
/* Wiretap error. */
|
|
|
|
switch (write_err) {
|
|
|
|
|
|
|
|
case WTAP_ERR_UNSUPPORTED_ENCAP:
|
|
|
|
/*
|
|
|
|
* This is a problem with the particular frame we're writing;
|
|
|
|
* note that, and give the frame number.
|
|
|
|
*/
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename = g_filename_display_basename(in_file->filename);
|
|
|
|
simple_error_message_box(
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
"Frame %u of \"%s\" has a network type that can't be saved in a \"%s\" file.",
|
2012-06-17 22:32:03 +00:00
|
|
|
in_file->packet_num, display_basename,
|
2013-11-08 09:53:01 +00:00
|
|
|
wtap_file_type_subtype_string(file_type));
|
2012-06-17 22:32:03 +00:00
|
|
|
g_free(display_basename);
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename = g_filename_display_basename(out_filename);
|
|
|
|
simple_error_message_box(
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
"An error occurred while writing to the file \"%s\": %s.",
|
|
|
|
out_filename, wtap_strerror(write_err));
|
2012-06-17 22:32:03 +00:00
|
|
|
g_free(display_basename);
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* OS error. */
|
|
|
|
write_failure_alert_box(out_filename, write_err);
|
|
|
|
}
|
2004-10-28 01:52:05 +00:00
|
|
|
}
|
2004-10-29 00:36:52 +00:00
|
|
|
|
2005-11-12 11:05:02 +00:00
|
|
|
if (got_read_error || got_write_error || stop_flag) {
|
|
|
|
/* Callers aren't expected to treat an error or an explicit abort
|
|
|
|
differently - we put up error dialogs ourselves, so they don't
|
|
|
|
have to. */
|
|
|
|
return CF_ERROR;
|
|
|
|
} else
|
2008-05-30 07:15:05 +00:00
|
|
|
return CF_OK;
|
2004-10-27 23:28:37 +00:00
|
|
|
}
|
|
|
|
|
2005-02-05 12:50:47 +00:00
|
|
|
cf_status_t
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_filter_packets(capture_file *cf, gchar *dftext, gboolean force)
|
1999-07-11 08:40:52 +00:00
|
|
|
{
|
2005-08-06 14:03:14 +00:00
|
|
|
const char *filter_new = dftext ? dftext : "";
|
|
|
|
const char *filter_old = cf->dfilter ? cf->dfilter : "";
|
2012-08-12 22:21:02 +00:00
|
|
|
dfilter_t *dfcode;
|
|
|
|
GTimeVal start_time;
|
2004-01-26 06:43:00 +00:00
|
|
|
|
2004-02-23 22:48:52 +00:00
|
|
|
/* if new filter equals old one, do nothing unless told to do so */
|
|
|
|
if (!force && strcmp(filter_new, filter_old) == 0) {
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_OK;
|
2004-01-26 06:43:00 +00:00
|
|
|
}
|
1999-08-05 16:46:04 +00:00
|
|
|
|
2007-01-01 10:23:37 +00:00
|
|
|
dfcode=NULL;
|
|
|
|
|
1999-10-11 06:39:26 +00:00
|
|
|
if (dftext == NULL) {
|
2007-01-01 10:23:37 +00:00
|
|
|
/* The new filter is an empty filter (i.e., display all packets).
|
|
|
|
* so leave dfcode==NULL
|
|
|
|
*/
|
1999-10-11 06:39:26 +00:00
|
|
|
} else {
|
1999-07-11 08:40:52 +00:00
|
|
|
/*
|
Clean up the handling of filter strings:
have "filter_packets()" make a copy of the filter string handed
to it, as it may save the filter string in the "capture_file"
structure, and the caller of "filter_packets()" shouldn't have
to worry about the string it passed to "filter_packets()" being
stashed away somewhere so that it can't just free that string or
change it;
have callers of "filter_packets()" free up the string they
handed to it, if the string was allocated and they're done with
it;
plug some memory leaks in "match_selected_cb_do()".
Check for an illegal "action" argument being passed to
"match_selected_cb_do()".
Move some keys out of "keys.h" into "gtk/main.c", as they're only used
in "gtk/main.c".
Make the pointer to the filter list a data item for the combo box, as
it's a copy of the list of strings for the combo box, rather than
attaching it to the widgets that activate the filter (a pointer to the
combo box *itself* is a data item for those widgets).
In "filter_activate_cb()", make a copy of the text from the text entry
field as soon as we fetch it, and use that copy. Free that copy if
we didn't add the filter to the filter list.
Don't make a copy of the entire filter list and use that to set the
combo box's list of items - just use the list itself. Also, when the
list is changed, make the new value the data for the combo box (the list
pointer will actually not be changed, because we happen to be using
"g_list_append()", but let's not rely on that).
svn path=/trunk/; revision=5368
2002-05-03 03:24:47 +00:00
|
|
|
* We have a filter; make a copy of it (as we'll be saving it),
|
|
|
|
* and try to compile it.
|
1999-07-11 08:40:52 +00:00
|
|
|
*/
|
Clean up the handling of filter strings:
have "filter_packets()" make a copy of the filter string handed
to it, as it may save the filter string in the "capture_file"
structure, and the caller of "filter_packets()" shouldn't have
to worry about the string it passed to "filter_packets()" being
stashed away somewhere so that it can't just free that string or
change it;
have callers of "filter_packets()" free up the string they
handed to it, if the string was allocated and they're done with
it;
plug some memory leaks in "match_selected_cb_do()".
Check for an illegal "action" argument being passed to
"match_selected_cb_do()".
Move some keys out of "keys.h" into "gtk/main.c", as they're only used
in "gtk/main.c".
Make the pointer to the filter list a data item for the combo box, as
it's a copy of the list of strings for the combo box, rather than
attaching it to the widgets that activate the filter (a pointer to the
combo box *itself* is a data item for those widgets).
In "filter_activate_cb()", make a copy of the text from the text entry
field as soon as we fetch it, and use that copy. Free that copy if
we didn't add the filter to the filter list.
Don't make a copy of the entire filter list and use that to set the
combo box's list of items - just use the list itself. Also, when the
list is changed, make the new value the data for the combo box (the list
pointer will actually not be changed, because we happen to be using
"g_list_append()", but let's not rely on that).
svn path=/trunk/; revision=5368
2002-05-03 03:24:47 +00:00
|
|
|
dftext = g_strdup(dftext);
|
2001-02-01 20:21:25 +00:00
|
|
|
if (!dfilter_compile(dftext, &dfcode)) {
|
1999-10-12 05:01:07 +00:00
|
|
|
/* The attempt failed; report an error. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_message_box(ESD_TYPE_ERROR, NULL,
|
2004-02-11 00:55:28 +00:00
|
|
|
"See the help for a description of the display filter syntax.",
|
2012-06-17 22:32:03 +00:00
|
|
|
"\"%s\" isn't a valid display filter: %s",
|
2012-07-21 00:12:21 +00:00
|
|
|
dftext, dfilter_error_msg);
|
2004-01-26 06:43:00 +00:00
|
|
|
g_free(dftext);
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_ERROR;
|
1999-07-11 08:40:52 +00:00
|
|
|
}
|
1999-10-11 06:39:26 +00:00
|
|
|
|
|
|
|
/* Was it empty? */
|
1999-10-12 05:01:07 +00:00
|
|
|
if (dfcode == NULL) {
|
|
|
|
/* Yes - free the filter text, and set it to null. */
|
1999-10-11 06:39:26 +00:00
|
|
|
g_free(dftext);
|
|
|
|
dftext = NULL;
|
|
|
|
}
|
1999-07-07 22:52:57 +00:00
|
|
|
}
|
1999-06-22 03:39:07 +00:00
|
|
|
|
1999-10-11 06:39:26 +00:00
|
|
|
/* We have a valid filter. Replace the current filter. */
|
2009-03-15 18:08:46 +00:00
|
|
|
g_free(cf->dfilter);
|
1999-10-11 06:39:26 +00:00
|
|
|
cf->dfilter = dftext;
|
2010-03-15 06:28:01 +00:00
|
|
|
g_get_current_time(&start_time);
|
|
|
|
|
1999-10-11 06:39:26 +00:00
|
|
|
|
2000-08-24 06:45:37 +00:00
|
|
|
/* Now rescan the packet list, applying the new filter, but not
|
|
|
|
throwing away information constructed on a previous pass. */
|
2002-08-28 10:07:37 +00:00
|
|
|
if (dftext == NULL) {
|
2012-10-20 12:51:05 +00:00
|
|
|
rescan_packets(cf, "Resetting", "Filter", FALSE);
|
2002-08-28 10:07:37 +00:00
|
|
|
} else {
|
2012-10-20 12:51:05 +00:00
|
|
|
rescan_packets(cf, "Filtering", dftext, FALSE);
|
2002-08-28 10:07:37 +00:00
|
|
|
}
|
2007-01-01 10:23:37 +00:00
|
|
|
|
|
|
|
/* Cleanup and release all dfilter resources */
|
2009-09-22 16:49:26 +00:00
|
|
|
dfilter_free(dfcode);
|
|
|
|
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_OK;
|
1999-10-11 06:39:26 +00:00
|
|
|
}
|
|
|
|
|
2003-09-12 02:48:23 +00:00
|
|
|
void
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_reftime_packets(capture_file *cf)
|
2003-09-12 02:48:23 +00:00
|
|
|
{
|
2009-07-28 16:20:05 +00:00
|
|
|
ref_time_packets(cf);
|
2003-09-12 02:48:23 +00:00
|
|
|
}
|
|
|
|
|
2000-07-09 03:29:42 +00:00
|
|
|
void
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_redissect_packets(capture_file *cf)
|
2000-07-09 03:29:42 +00:00
|
|
|
{
|
2013-08-13 02:18:04 +00:00
|
|
|
if (cf->state != FILE_CLOSED) {
|
|
|
|
rescan_packets(cf, "Reprocessing", "all packets", TRUE);
|
|
|
|
}
|
2000-07-09 03:29:42 +00:00
|
|
|
}
|
|
|
|
|
From Jakub Zawadzki:
New functions: cf_read_frame_r, cf_read_frame
It's much easier to write:
cf_read_frame (cf, fdata, &err, &err_info)
Than:
wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header, cf->pd,
fdata->cap_len, &err, &err_info)
svn path=/trunk/; revision=32980
2010-05-26 19:11:23 +00:00
|
|
|
gboolean
|
2013-08-01 20:59:38 +00:00
|
|
|
cf_read_frame_r(capture_file *cf, const frame_data *fdata,
|
2013-06-16 00:20:00 +00:00
|
|
|
struct wtap_pkthdr *phdr, Buffer *buf)
|
From Jakub Zawadzki:
New functions: cf_read_frame_r, cf_read_frame
It's much easier to write:
cf_read_frame (cf, fdata, &err, &err_info)
Than:
wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header, cf->pd,
fdata->cap_len, &err, &err_info)
svn path=/trunk/; revision=32980
2010-05-26 19:11:23 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
int err;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
gchar *err_info;
|
2012-06-17 22:32:03 +00:00
|
|
|
gchar *display_basename;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
|
2011-05-12 19:47:49 +00:00
|
|
|
#ifdef WANT_PACKET_EDITOR
|
|
|
|
/* if fdata->file_off == -1 it means packet was edited, and we must find data inside edited_frames tree */
|
|
|
|
if (G_UNLIKELY(fdata->file_off == -1)) {
|
|
|
|
const modified_frame_data *frame = (const modified_frame_data *) g_tree_lookup(cf->edited_frames, GINT_TO_POINTER(fdata->num));
|
|
|
|
|
|
|
|
if (!frame) {
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box("fdata->file_off == -1, but can't find modified frame!");
|
2011-05-12 19:47:49 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2012-10-16 21:50:57 +00:00
|
|
|
*phdr = frame->phdr;
|
2013-06-25 21:45:56 +00:00
|
|
|
buffer_assure_space(buf, frame->phdr.caplen);
|
|
|
|
memcpy(buffer_start_ptr(buf), frame->pd, frame->phdr.caplen);
|
2011-05-12 19:47:49 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-06-16 00:20:00 +00:00
|
|
|
if (!wtap_seek_read(cf->wth, fdata->file_off, phdr, buf,
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
fdata->cap_len, &err, &err_info)) {
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename = g_filename_display_basename(cf->filename);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
switch (err) {
|
|
|
|
|
|
|
|
case WTAP_ERR_UNSUPPORTED_ENCAP:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box("The file \"%s\" has a packet with a network type that Wireshark doesn't support.\n(%s)",
|
|
|
|
display_basename, err_info);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
g_free(err_info);
|
|
|
|
break;
|
|
|
|
|
2011-12-13 09:53:50 +00:00
|
|
|
case WTAP_ERR_BAD_FILE:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box("An error occurred while reading from the file \"%s\": %s.\n(%s)",
|
|
|
|
display_basename, wtap_strerror(err), err_info);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
g_free(err_info);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"An error occurred while reading from the file \"%s\": %s.",
|
|
|
|
display_basename, wtap_strerror(err));
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-06-17 22:32:03 +00:00
|
|
|
g_free(display_basename);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
From Jakub Zawadzki:
New functions: cf_read_frame_r, cf_read_frame
It's much easier to write:
cf_read_frame (cf, fdata, &err, &err_info)
Than:
wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header, cf->pd,
fdata->cap_len, &err, &err_info)
svn path=/trunk/; revision=32980
2010-05-26 19:11:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
cf_read_frame(capture_file *cf, frame_data *fdata)
|
From Jakub Zawadzki:
New functions: cf_read_frame_r, cf_read_frame
It's much easier to write:
cf_read_frame (cf, fdata, &err, &err_info)
Than:
wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header, cf->pd,
fdata->cap_len, &err, &err_info)
svn path=/trunk/; revision=32980
2010-05-26 19:11:23 +00:00
|
|
|
{
|
2013-06-16 00:20:00 +00:00
|
|
|
return cf_read_frame_r(cf, fdata, &cf->phdr, &cf->buf);
|
From Jakub Zawadzki:
New functions: cf_read_frame_r, cf_read_frame
It's much easier to write:
cf_read_frame (cf, fdata, &err, &err_info)
Than:
wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header, cf->pd,
fdata->cap_len, &err, &err_info)
svn path=/trunk/; revision=32980
2010-05-26 19:11:23 +00:00
|
|
|
}
|
|
|
|
|
2000-07-09 03:29:42 +00:00
|
|
|
/* Rescan the list of packets, reconstructing the CList.
|
|
|
|
|
|
|
|
"action" describes why we're doing this; it's used in the progress
|
|
|
|
dialog box.
|
|
|
|
|
2002-08-28 10:07:37 +00:00
|
|
|
"action_item" describes what we're doing; it's used in the progress
|
|
|
|
dialog box.
|
|
|
|
|
2000-08-24 06:45:37 +00:00
|
|
|
"redissect" is TRUE if we need to make the dissectors reconstruct
|
|
|
|
any state information they have (because a preference that affects
|
|
|
|
some dissector has changed, meaning some dissector might construct
|
|
|
|
its state differently from the way it was constructed the last time). */
|
2000-07-09 03:29:42 +00:00
|
|
|
static void
|
2012-10-20 12:51:05 +00:00
|
|
|
rescan_packets(capture_file *cf, const char *action, const char *action_item, gboolean redissect)
|
1999-10-11 06:39:26 +00:00
|
|
|
{
|
2011-04-25 05:33:07 +00:00
|
|
|
/* Rescan packets new packet list */
|
|
|
|
guint32 framenum;
|
2000-05-12 22:03:59 +00:00
|
|
|
frame_data *fdata;
|
2002-07-30 10:13:16 +00:00
|
|
|
progdlg_t *progbar = NULL;
|
|
|
|
gboolean stop_flag;
|
2002-08-28 10:07:37 +00:00
|
|
|
int count;
|
2003-09-25 08:20:01 +00:00
|
|
|
frame_data *selected_frame, *preceding_frame, *following_frame, *prev_frame;
|
2009-09-21 17:32:35 +00:00
|
|
|
int selected_frame_num, preceding_frame_num, following_frame_num, prev_frame_num;
|
2003-09-25 08:20:01 +00:00
|
|
|
gboolean selected_frame_seen;
|
2005-10-27 20:18:50 +00:00
|
|
|
float progbar_val;
|
2002-07-30 10:13:16 +00:00
|
|
|
GTimeVal start_time;
|
2002-08-28 10:07:37 +00:00
|
|
|
gchar status_str[100];
|
2004-01-09 21:38:21 +00:00
|
|
|
int progbar_nextstep;
|
|
|
|
int progbar_quantum;
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_t edt;
|
2012-08-12 22:21:02 +00:00
|
|
|
dfilter_t *dfcode;
|
2012-10-20 12:51:34 +00:00
|
|
|
column_info *cinfo;
|
|
|
|
gboolean create_proto_tree;
|
2009-06-05 22:42:47 +00:00
|
|
|
guint tap_flags;
|
2009-09-21 17:32:35 +00:00
|
|
|
gboolean add_to_packet_list = FALSE;
|
2012-08-12 22:21:02 +00:00
|
|
|
gboolean compiled;
|
2012-09-28 10:08:17 +00:00
|
|
|
guint32 frames_count;
|
2007-01-01 10:23:37 +00:00
|
|
|
|
|
|
|
/* Compile the current display filter.
|
2007-12-05 23:50:28 +00:00
|
|
|
* We assume this will not fail since cf->dfilter is only set in
|
2007-01-01 10:23:37 +00:00
|
|
|
* cf_filter IFF the filter was valid.
|
|
|
|
*/
|
2009-09-21 15:38:40 +00:00
|
|
|
compiled = dfilter_compile(cf->dfilter, &dfcode);
|
|
|
|
g_assert(!cf->dfilter || (compiled && dfcode));
|
We can't trust "cf->current_frame" to refer to the frame that was
selected before we started re-colorizing or re-filtering the display, as
when the first row is added to the clist, that may be selected and thus
made the current frame.
This means that we can't find the row corresponding to the
previously-selected frame, if any, by checking as each packet is
colorized/filtered and see whether its "frame_data" structure is equal
to "cf->current_frame", as that'll always say that the first frame in
the display is the selected frame.
Instead, we recored the value of "cf->current_frame" before we do
anything to the clist, have "add_packet_to_packet_list()" return either
the row number of the frame (if it passed the filter and thus was added
to the clist) or -1 (if it didn't pass the filter and thus wasn't added
to the clist), and, after "add_packet_to_packet_list()", if the current
frame is the one that was the selected row, remember its row number (if
any), and, when we're finished colorizing/filtering the display, make
that row the current row if it's not -1 (-1 means that the selected row
didn't pass the filter).
Also, don't do that until after we've thawed the clist, as the vertical
adjustment for the clist doesn't reflect reality until then, and
attempting to go to a given row won't work right until the vertical
adjustment for the clist reflects reality.
Shove all the code to set the selected and focus rows, and to make said
row visible, into a routine, so the "Find Frame" and "Go To Frame" code
can use it as well.
svn path=/trunk/; revision=1959
2000-05-15 01:50:16 +00:00
|
|
|
|
2009-06-05 22:42:47 +00:00
|
|
|
/* Get the union of the flags for all tap listeners. */
|
|
|
|
tap_flags = union_of_tap_listener_flags();
|
2012-10-20 12:51:34 +00:00
|
|
|
cinfo = (tap_flags & TL_REQUIRES_COLUMNS) ? &cf->cinfo : NULL;
|
|
|
|
create_proto_tree =
|
|
|
|
(dfcode != NULL || have_filtering_tap_listeners() || (tap_flags & TL_REQUIRES_PROTO_TREE));
|
2009-06-05 22:42:47 +00:00
|
|
|
|
2002-09-04 22:15:39 +00:00
|
|
|
reset_tap_listeners();
|
We can't trust "cf->current_frame" to refer to the frame that was
selected before we started re-colorizing or re-filtering the display, as
when the first row is added to the clist, that may be selected and thus
made the current frame.
This means that we can't find the row corresponding to the
previously-selected frame, if any, by checking as each packet is
colorized/filtered and see whether its "frame_data" structure is equal
to "cf->current_frame", as that'll always say that the first frame in
the display is the selected frame.
Instead, we recored the value of "cf->current_frame" before we do
anything to the clist, have "add_packet_to_packet_list()" return either
the row number of the frame (if it passed the filter and thus was added
to the clist) or -1 (if it didn't pass the filter and thus wasn't added
to the clist), and, after "add_packet_to_packet_list()", if the current
frame is the one that was the selected row, remember its row number (if
any), and, when we're finished colorizing/filtering the display, make
that row the current row if it's not -1 (-1 means that the selected row
didn't pass the filter).
Also, don't do that until after we've thawed the clist, as the vertical
adjustment for the clist doesn't reflect reality until then, and
attempting to go to a given row won't work right until the vertical
adjustment for the clist reflects reality.
Shove all the code to set the selected and focus rows, and to make said
row visible, into a routine, so the "Find Frame" and "Go To Frame" code
can use it as well.
svn path=/trunk/; revision=1959
2000-05-15 01:50:16 +00:00
|
|
|
/* Which frame, if any, is the currently selected frame?
|
|
|
|
XXX - should the selected frame or the focus frame be the "current"
|
|
|
|
frame, that frame being the one from which "Find Frame" searches
|
|
|
|
start? */
|
|
|
|
selected_frame = cf->current_frame;
|
|
|
|
|
2010-08-27 15:01:28 +00:00
|
|
|
/* Mark frame num as not found */
|
2009-09-21 17:32:35 +00:00
|
|
|
selected_frame_num = -1;
|
1999-10-11 06:39:26 +00:00
|
|
|
|
2009-07-29 21:32:49 +00:00
|
|
|
/* Freeze the packet list while we redo it, so we don't get any
|
|
|
|
screen updates while it happens. */
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_freeze();
|
2009-07-29 21:32:49 +00:00
|
|
|
|
2000-08-24 06:45:37 +00:00
|
|
|
if (redissect) {
|
|
|
|
/* We need to re-initialize all the state information that protocols
|
|
|
|
keep, because some preference that controls a dissector has changed,
|
|
|
|
which might cause the state information to be constructed differently
|
|
|
|
by that dissector. */
|
|
|
|
|
2012-09-28 10:08:17 +00:00
|
|
|
/* We might receive new packets while redissecting, and we don't
|
|
|
|
want to dissect those before their time. */
|
|
|
|
cf->redissecting = TRUE;
|
|
|
|
|
2013-07-21 18:38:03 +00:00
|
|
|
/* 'reset' dissection session */
|
|
|
|
epan_free(cf->epan);
|
2013-07-21 20:48:30 +00:00
|
|
|
cf->epan = ws_epan_new(cf);
|
2009-07-26 10:34:07 +00:00
|
|
|
|
2009-09-21 17:32:35 +00:00
|
|
|
/* We need to redissect the packets so we have to discard our old
|
|
|
|
* packet list store. */
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_clear();
|
2009-09-21 17:32:35 +00:00
|
|
|
add_to_packet_list = TRUE;
|
2000-08-24 06:45:37 +00:00
|
|
|
}
|
|
|
|
|
1999-11-06 06:28:07 +00:00
|
|
|
/* We don't yet know which will be the first and last frames displayed. */
|
Store the frame_data structures in a tree, rather than a linked list.
This lets us get rid of the per-frame_data-structure prev and next
pointers, saving memory (at least according to Activity Monitor's report
of the virtual address space size on my Snow Leopard machine, it's a
noticeable saving), and lets us look up frame_data structures by frame
number in O(log2(number of frames)) time rather than O(number of frames)
time. It seems to take more CPU time when reading in the file, but
seems to go from "finished reading in all the packets" to "displaying
the packets" faster and seems to free up the frame_data structures
faster when closing the file.
It *is* doing more copying, currently, as we now don't allocate the
frame_data structure until after the packet has passed the read filter,
so that might account for the additional CPU time.
(Oh, and, for what it's worth, on an LP64 platform, a frame_data
structure is exactly 128 bytes long. However, there's more stuff to
remove, so the power-of-2 size is not guaranteed to remain, and it's not
a power-of-2 size on an ILP32 platform.)
It also means we don't need GLib 2.10 or later for the two-pass mode in
TShark.
It also means some code in the TCP dissector that was checking
pinfo->fd->next to see if it's NULL, in order to see if this is the last
packet in the file, no longer works, but that wasn't guaranteed to work
anyway:
we might be doing a one-pass read through the capture in TShark;
we might be dissecting the frame while we're reading in the
packets for the first time in Wireshark;
we might be doing a live capture in Wireshark;
in which case packets might be prematurely considered "the last packet".
#if 0 the no-longer-working tests, pending figuring out a better way of
doing it.
svn path=/trunk/; revision=36849
2011-04-25 19:01:05 +00:00
|
|
|
cf->first_displayed = 0;
|
|
|
|
cf->last_displayed = 0;
|
1999-11-06 06:28:07 +00:00
|
|
|
|
2004-02-03 00:16:59 +00:00
|
|
|
/* We currently don't display any packets */
|
|
|
|
cf->displayed_count = 0;
|
|
|
|
|
2000-07-09 03:29:42 +00:00
|
|
|
/* Iterate through the list of frames. Call a routine for each frame
|
|
|
|
to check whether it should be displayed and, if so, add it to
|
|
|
|
the display list. */
|
2013-08-14 04:14:36 +00:00
|
|
|
cf->ref = NULL;
|
|
|
|
cf->prev_dis = NULL;
|
|
|
|
cf->prev_cap = NULL;
|
|
|
|
cf->cum_bytes = 0;
|
1999-08-05 16:46:04 +00:00
|
|
|
|
1999-08-28 01:51:58 +00:00
|
|
|
/* Update the progress bar when it gets to this value. */
|
2004-01-09 21:38:21 +00:00
|
|
|
progbar_nextstep = 0;
|
1999-08-28 01:51:58 +00:00
|
|
|
/* When we reach the value that triggers a progress bar update,
|
|
|
|
bump that value by this amount. */
|
2004-01-09 21:38:21 +00:00
|
|
|
progbar_quantum = cf->count/N_PROGBAR_UPDATES;
|
2000-01-08 23:49:33 +00:00
|
|
|
/* Count of packets at which we've looked. */
|
|
|
|
count = 0;
|
2005-10-27 20:18:50 +00:00
|
|
|
/* Progress so far. */
|
2009-04-21 16:57:52 +00:00
|
|
|
progbar_val = 0.0f;
|
2000-01-08 23:49:33 +00:00
|
|
|
|
2000-07-03 08:36:52 +00:00
|
|
|
stop_flag = FALSE;
|
2002-07-30 10:13:16 +00:00
|
|
|
g_get_current_time(&start_time);
|
1999-08-28 01:51:58 +00:00
|
|
|
|
2009-09-21 17:32:35 +00:00
|
|
|
/* no previous row yet */
|
|
|
|
prev_frame_num = -1;
|
2003-09-25 08:20:01 +00:00
|
|
|
prev_frame = NULL;
|
|
|
|
|
2009-09-21 17:32:35 +00:00
|
|
|
preceding_frame_num = -1;
|
2003-09-25 08:20:01 +00:00
|
|
|
preceding_frame = NULL;
|
2009-09-21 17:32:35 +00:00
|
|
|
following_frame_num = -1;
|
2003-09-25 08:20:01 +00:00
|
|
|
following_frame = NULL;
|
|
|
|
|
|
|
|
selected_frame_seen = FALSE;
|
|
|
|
|
2012-09-28 10:08:17 +00:00
|
|
|
frames_count = cf->count;
|
2013-10-20 13:22:48 +00:00
|
|
|
|
|
|
|
epan_dissect_init(&edt, cf->epan, create_proto_tree, FALSE);
|
|
|
|
|
2012-09-28 10:08:17 +00:00
|
|
|
for (framenum = 1; framenum <= frames_count; framenum++) {
|
2011-04-27 02:54:44 +00:00
|
|
|
fdata = frame_data_sequence_find(cf->frames, framenum);
|
2011-04-25 05:33:07 +00:00
|
|
|
|
2005-10-27 06:45:37 +00:00
|
|
|
/* Create the progress bar if necessary.
|
|
|
|
We check on every iteration of the loop, so that it takes no
|
|
|
|
longer than the standard time to create it (otherwise, for a
|
|
|
|
large file, we might take considerably longer than that standard
|
|
|
|
time in order to get to the next progress bar step). */
|
|
|
|
if (progbar == NULL)
|
2012-07-19 21:49:52 +00:00
|
|
|
progbar = delayed_create_progress_dlg(cf->window, action, action_item, TRUE,
|
2005-11-12 11:05:02 +00:00
|
|
|
&stop_flag, &start_time,
|
|
|
|
progbar_val);
|
2005-10-27 06:45:37 +00:00
|
|
|
|
1999-08-28 01:51:58 +00:00
|
|
|
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
|
|
|
|
when we update it, we have to run the GTK+ main loop to get it
|
|
|
|
to repaint what's pending, and doing so may involve an "ioctl()"
|
|
|
|
to see if there's any pending input from an X server, and doing
|
|
|
|
that for every packet can be costly, especially on a big file. */
|
2004-01-09 21:38:21 +00:00
|
|
|
if (count >= progbar_nextstep) {
|
1999-08-28 01:51:58 +00:00
|
|
|
/* let's not divide by zero. I should never be started
|
2000-01-08 23:49:33 +00:00
|
|
|
* with count == 0, so let's assert that
|
1999-08-28 01:51:58 +00:00
|
|
|
*/
|
2000-01-08 23:49:33 +00:00
|
|
|
g_assert(cf->count > 0);
|
2012-09-28 10:08:17 +00:00
|
|
|
progbar_val = (gfloat) count / frames_count;
|
1999-08-28 01:51:58 +00:00
|
|
|
|
2002-08-28 10:07:37 +00:00
|
|
|
if (progbar != NULL) {
|
|
|
|
g_snprintf(status_str, sizeof(status_str),
|
2012-09-28 10:08:17 +00:00
|
|
|
"%4u of %u frames", count, frames_count);
|
2005-10-27 20:18:50 +00:00
|
|
|
update_progress_dlg(progbar, progbar_val, status_str);
|
2002-08-28 10:07:37 +00:00
|
|
|
}
|
2002-07-30 10:13:16 +00:00
|
|
|
|
2004-01-09 21:38:21 +00:00
|
|
|
progbar_nextstep += progbar_quantum;
|
2000-07-03 08:36:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (stop_flag) {
|
|
|
|
/* Well, the user decided to abort the filtering. Just stop.
|
|
|
|
|
|
|
|
XXX - go back to the previous filter? Users probably just
|
2011-03-22 03:56:39 +00:00
|
|
|
want not to wait for a filtering operation to finish;
|
|
|
|
unless we cancel by having no filter, reverting to the
|
|
|
|
previous filter will probably be even more expensive than
|
|
|
|
continuing the filtering, as it involves going back to the
|
|
|
|
beginning and filtering, and even with no filter we currently
|
|
|
|
have to re-generate the entire clist, which is also expensive.
|
|
|
|
|
|
|
|
I'm not sure what Network Monitor does, but it doesn't appear
|
|
|
|
to give you an unfiltered display if you cancel. */
|
2000-07-03 08:36:52 +00:00
|
|
|
break;
|
1999-08-28 01:51:58 +00:00
|
|
|
}
|
|
|
|
|
2000-01-08 23:49:33 +00:00
|
|
|
count++;
|
1999-08-10 04:13:37 +00:00
|
|
|
|
2000-08-24 06:45:37 +00:00
|
|
|
if (redissect) {
|
|
|
|
/* Since all state for the frame was destroyed, mark the frame
|
2000-09-12 03:27:00 +00:00
|
|
|
* as not visited, free the GSList referring to the state
|
2000-08-24 09:16:39 +00:00
|
|
|
* data (the per-frame data itself was freed by
|
2009-09-21 17:32:35 +00:00
|
|
|
* "init_dissection()"), and null out the GSList pointer. */
|
2013-03-15 18:04:50 +00:00
|
|
|
frame_data_reset(fdata);
|
2012-09-28 10:08:17 +00:00
|
|
|
frames_count = cf->count;
|
2000-09-11 07:33:56 +00:00
|
|
|
}
|
|
|
|
|
2012-10-20 12:51:05 +00:00
|
|
|
/* Frame dependencies from the previous dissection/filtering are no longer valid. */
|
|
|
|
fdata->flags.dependent_of_displayed = 0;
|
2012-05-22 01:59:34 +00:00
|
|
|
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
if (!cf_read_frame(cf, fdata))
|
|
|
|
break; /* error reading the frame */
|
1999-08-10 04:13:37 +00:00
|
|
|
|
2003-09-25 08:20:01 +00:00
|
|
|
/* If the previous frame is displayed, and we haven't yet seen the
|
|
|
|
selected frame, remember that frame - it's the closest one we've
|
|
|
|
yet seen before the selected frame. */
|
2009-09-21 17:32:35 +00:00
|
|
|
if (prev_frame_num != -1 && !selected_frame_seen && prev_frame->flags.passed_dfilter) {
|
|
|
|
preceding_frame_num = prev_frame_num;
|
2003-09-25 08:20:01 +00:00
|
|
|
preceding_frame = prev_frame;
|
|
|
|
}
|
2013-10-20 13:22:48 +00:00
|
|
|
|
|
|
|
add_packet_to_packet_list(fdata, cf, &edt, dfcode,
|
2013-06-16 00:20:00 +00:00
|
|
|
cinfo, &cf->phdr,
|
|
|
|
buffer_start_ptr(&cf->buf),
|
2009-08-14 05:49:57 +00:00
|
|
|
add_to_packet_list);
|
2003-09-25 08:20:01 +00:00
|
|
|
|
|
|
|
/* If this frame is displayed, and this is the first frame we've
|
|
|
|
seen displayed after the selected frame, remember this frame -
|
|
|
|
it's the closest one we've yet seen at or after the selected
|
|
|
|
frame. */
|
2009-09-21 17:32:35 +00:00
|
|
|
if (fdata->flags.passed_dfilter && selected_frame_seen && following_frame_num == -1) {
|
|
|
|
following_frame_num = fdata->num;
|
2003-09-25 08:20:01 +00:00
|
|
|
following_frame = fdata;
|
|
|
|
}
|
|
|
|
if (fdata == selected_frame) {
|
|
|
|
selected_frame_seen = TRUE;
|
2009-09-21 17:32:35 +00:00
|
|
|
if (fdata->flags.passed_dfilter)
|
|
|
|
selected_frame_num = fdata->num;
|
2003-09-25 08:20:01 +00:00
|
|
|
}
|
|
|
|
|
2009-09-21 17:32:35 +00:00
|
|
|
/* Remember this frame - it'll be the previous frame
|
2003-09-25 08:20:01 +00:00
|
|
|
on the next pass through the loop. */
|
2009-09-21 17:32:35 +00:00
|
|
|
prev_frame_num = fdata->num;
|
2003-09-25 08:20:01 +00:00
|
|
|
prev_frame = fdata;
|
1999-08-10 04:13:37 +00:00
|
|
|
}
|
2002-08-28 21:04:11 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_cleanup(&edt);
|
|
|
|
|
2008-09-30 15:45:20 +00:00
|
|
|
/* We are done redissecting the packet list. */
|
2012-09-28 10:08:17 +00:00
|
|
|
cf->redissecting = FALSE;
|
2008-09-30 15:45:20 +00:00
|
|
|
|
2000-08-24 09:16:39 +00:00
|
|
|
if (redissect) {
|
2012-09-28 10:08:17 +00:00
|
|
|
frames_count = cf->count;
|
2000-08-24 09:16:39 +00:00
|
|
|
/* Clear out what remains of the visited flags and per-frame data
|
|
|
|
pointers.
|
|
|
|
|
|
|
|
XXX - that may cause various forms of bogosity when dissecting
|
|
|
|
these frames, as they won't have been seen by this sequential
|
|
|
|
pass, but the only alternative I see is to keep scanning them
|
|
|
|
even though the user requested that the scan stop, and that
|
2006-05-28 20:28:20 +00:00
|
|
|
would leave the user stuck with an Wireshark grinding on
|
2000-08-24 09:16:39 +00:00
|
|
|
until it finishes. Should we just stick them with that? */
|
2012-09-28 10:08:17 +00:00
|
|
|
for (; framenum <= frames_count; framenum++) {
|
2011-04-27 02:54:44 +00:00
|
|
|
fdata = frame_data_sequence_find(cf->frames, framenum);
|
2013-03-15 18:04:50 +00:00
|
|
|
frame_data_reset(fdata);
|
2000-08-24 09:16:39 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-07-30 10:13:16 +00:00
|
|
|
/* We're done filtering the packets; destroy the progress bar if it
|
|
|
|
was created. */
|
|
|
|
if (progbar != NULL)
|
|
|
|
destroy_progress_dlg(progbar);
|
1999-07-11 08:40:52 +00:00
|
|
|
|
We can't trust "cf->current_frame" to refer to the frame that was
selected before we started re-colorizing or re-filtering the display, as
when the first row is added to the clist, that may be selected and thus
made the current frame.
This means that we can't find the row corresponding to the
previously-selected frame, if any, by checking as each packet is
colorized/filtered and see whether its "frame_data" structure is equal
to "cf->current_frame", as that'll always say that the first frame in
the display is the selected frame.
Instead, we recored the value of "cf->current_frame" before we do
anything to the clist, have "add_packet_to_packet_list()" return either
the row number of the frame (if it passed the filter and thus was added
to the clist) or -1 (if it didn't pass the filter and thus wasn't added
to the clist), and, after "add_packet_to_packet_list()", if the current
frame is the one that was the selected row, remember its row number (if
any), and, when we're finished colorizing/filtering the display, make
that row the current row if it's not -1 (-1 means that the selected row
didn't pass the filter).
Also, don't do that until after we've thawed the clist, as the vertical
adjustment for the clist doesn't reflect reality until then, and
attempting to go to a given row won't work right until the vertical
adjustment for the clist reflects reality.
Shove all the code to set the selected and focus rows, and to make said
row visible, into a routine, so the "Find Frame" and "Go To Frame" code
can use it as well.
svn path=/trunk/; revision=1959
2000-05-15 01:50:16 +00:00
|
|
|
/* Unfreeze the packet list. */
|
2009-09-21 17:32:35 +00:00
|
|
|
if (!add_to_packet_list)
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_recreate_visible_rows();
|
We can't trust "cf->current_frame" to refer to the frame that was
selected before we started re-colorizing or re-filtering the display, as
when the first row is added to the clist, that may be selected and thus
made the current frame.
This means that we can't find the row corresponding to the
previously-selected frame, if any, by checking as each packet is
colorized/filtered and see whether its "frame_data" structure is equal
to "cf->current_frame", as that'll always say that the first frame in
the display is the selected frame.
Instead, we recored the value of "cf->current_frame" before we do
anything to the clist, have "add_packet_to_packet_list()" return either
the row number of the frame (if it passed the filter and thus was added
to the clist) or -1 (if it didn't pass the filter and thus wasn't added
to the clist), and, after "add_packet_to_packet_list()", if the current
frame is the one that was the selected row, remember its row number (if
any), and, when we're finished colorizing/filtering the display, make
that row the current row if it's not -1 (-1 means that the selected row
didn't pass the filter).
Also, don't do that until after we've thawed the clist, as the vertical
adjustment for the clist doesn't reflect reality until then, and
attempting to go to a given row won't work right until the vertical
adjustment for the clist reflects reality.
Shove all the code to set the selected and focus rows, and to make said
row visible, into a routine, so the "Find Frame" and "Go To Frame" code
can use it as well.
svn path=/trunk/; revision=1959
2000-05-15 01:50:16 +00:00
|
|
|
|
2010-03-15 06:28:01 +00:00
|
|
|
/* Compute the time it took to filter the file */
|
2013-08-14 04:14:36 +00:00
|
|
|
compute_elapsed(cf, &start_time);
|
2010-03-15 06:28:01 +00:00
|
|
|
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_thaw();
|
2009-09-21 17:32:35 +00:00
|
|
|
|
|
|
|
if (selected_frame_num == -1) {
|
2003-09-25 08:20:01 +00:00
|
|
|
/* The selected frame didn't pass the filter. */
|
|
|
|
if (selected_frame == NULL) {
|
|
|
|
/* That's because there *was* no selected frame. Make the first
|
|
|
|
displayed frame the current frame. */
|
2009-09-21 17:32:35 +00:00
|
|
|
selected_frame_num = 0;
|
2003-09-25 08:20:01 +00:00
|
|
|
} else {
|
|
|
|
/* Find the nearest displayed frame to the selected frame (whether
|
|
|
|
it's before or after that frame) and make that the current frame.
|
|
|
|
If the next and previous displayed frames are equidistant from the
|
|
|
|
selected frame, choose the next one. */
|
|
|
|
g_assert(following_frame == NULL ||
|
|
|
|
following_frame->num >= selected_frame->num);
|
|
|
|
g_assert(preceding_frame == NULL ||
|
|
|
|
preceding_frame->num <= selected_frame->num);
|
2003-09-25 08:31:52 +00:00
|
|
|
if (following_frame == NULL) {
|
|
|
|
/* No frame after the selected frame passed the filter, so we
|
|
|
|
have to select the last displayed frame before the selected
|
|
|
|
frame. */
|
2009-09-21 17:32:35 +00:00
|
|
|
selected_frame_num = preceding_frame_num;
|
|
|
|
selected_frame = preceding_frame;
|
2003-09-25 08:31:52 +00:00
|
|
|
} else if (preceding_frame == NULL) {
|
|
|
|
/* No frame before the selected frame passed the filter, so we
|
|
|
|
have to select the first displayed frame after the selected
|
|
|
|
frame. */
|
2009-09-21 17:32:35 +00:00
|
|
|
selected_frame_num = following_frame_num;
|
|
|
|
selected_frame = following_frame;
|
2007-01-11 06:36:14 +00:00
|
|
|
} else {
|
|
|
|
/* Frames before and after the selected frame passed the filter, so
|
2009-09-21 15:50:15 +00:00
|
|
|
we'll select the previous frame */
|
2009-09-21 17:32:35 +00:00
|
|
|
selected_frame_num = preceding_frame_num;
|
|
|
|
selected_frame = preceding_frame;
|
2003-09-25 08:20:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2003-09-24 00:47:37 +00:00
|
|
|
|
2009-09-21 17:32:35 +00:00
|
|
|
if (selected_frame_num == -1) {
|
2003-09-25 08:20:01 +00:00
|
|
|
/* There are no frames displayed at all. */
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_unselect_packet(cf);
|
2003-09-25 08:20:01 +00:00
|
|
|
} else {
|
|
|
|
/* Either the frame that was selected passed the filter, or we've
|
|
|
|
found the nearest displayed frame to that frame. Select it, make
|
|
|
|
it the focus row, and make it visible. */
|
2009-11-10 20:16:14 +00:00
|
|
|
/* Set to invalid to force update of packet list and packet details */
|
|
|
|
cf->current_row = -1;
|
2009-09-21 17:32:35 +00:00
|
|
|
if (selected_frame_num == 0) {
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_select_first_row();
|
2009-09-21 17:32:35 +00:00
|
|
|
}else{
|
2012-09-04 02:35:25 +00:00
|
|
|
if (!packet_list_select_row_from_data(selected_frame)) {
|
2011-04-24 21:02:55 +00:00
|
|
|
/* We didn't find a row corresponding to this frame.
|
|
|
|
This means that the frame isn't being displayed currently,
|
|
|
|
so we can't select it. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_message_box(ESD_TYPE_INFO, NULL,
|
|
|
|
"The capture file is probably not fully dissected.",
|
|
|
|
"End of capture exceeded!");
|
2011-04-24 21:02:55 +00:00
|
|
|
}
|
2008-12-10 11:05:45 +00:00
|
|
|
}
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
}
|
2007-01-01 10:23:37 +00:00
|
|
|
|
|
|
|
/* Cleanup and release all dfilter resources */
|
2009-09-22 16:49:26 +00:00
|
|
|
dfilter_free(dfcode);
|
1999-06-22 03:39:07 +00:00
|
|
|
}
|
2009-09-21 14:13:46 +00:00
|
|
|
|
|
|
|
|
2009-07-28 16:20:05 +00:00
|
|
|
/*
|
|
|
|
* Scan trough all frame data and recalculate the ref time
|
|
|
|
* without rereading the file.
|
|
|
|
* XXX - do we need a progres bar or is this fast enough?
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
ref_time_packets(capture_file *cf)
|
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
guint32 framenum;
|
2009-07-28 16:20:05 +00:00
|
|
|
frame_data *fdata;
|
2013-07-21 23:07:33 +00:00
|
|
|
nstime_t rel_ts;
|
2009-07-28 16:20:05 +00:00
|
|
|
|
2013-08-14 04:14:36 +00:00
|
|
|
cf->ref = NULL;
|
|
|
|
cf->prev_dis = NULL;
|
|
|
|
cf->cum_bytes = 0;
|
2009-07-28 16:20:05 +00:00
|
|
|
|
2011-04-25 05:33:07 +00:00
|
|
|
for (framenum = 1; framenum <= cf->count; framenum++) {
|
2011-04-27 02:54:44 +00:00
|
|
|
fdata = frame_data_sequence_find(cf->frames, framenum);
|
2011-04-25 05:33:07 +00:00
|
|
|
|
2009-09-21 15:50:15 +00:00
|
|
|
/* just add some value here until we know if it is being displayed or not */
|
2013-08-14 04:14:36 +00:00
|
|
|
fdata->cum_bytes = cf->cum_bytes + fdata->pkt_len;
|
2009-07-28 16:20:05 +00:00
|
|
|
|
2010-05-26 23:29:56 +00:00
|
|
|
/*
|
|
|
|
*Timestamps
|
|
|
|
*/
|
|
|
|
|
2009-09-21 15:50:15 +00:00
|
|
|
/* If we don't have the time stamp of the first packet in the
|
2009-07-28 16:20:05 +00:00
|
|
|
capture, it's because this is the first packet. Save the time
|
|
|
|
stamp of this packet as the time stamp of the first packet. */
|
2013-08-14 04:14:36 +00:00
|
|
|
if (cf->ref == NULL)
|
|
|
|
cf->ref = fdata;
|
2009-09-21 15:50:15 +00:00
|
|
|
/* if this frames is marked as a reference time frame, reset
|
|
|
|
firstsec and firstusec to this frame */
|
2013-07-21 23:07:33 +00:00
|
|
|
if (fdata->flags.ref_time)
|
2013-08-14 04:14:36 +00:00
|
|
|
cf->ref = fdata;
|
2009-07-28 16:20:05 +00:00
|
|
|
|
2009-09-21 15:50:15 +00:00
|
|
|
/* If we don't have the time stamp of the previous displayed packet,
|
2009-07-28 16:20:05 +00:00
|
|
|
it's because this is the first displayed packet. Save the time
|
|
|
|
stamp of this packet as the time stamp of the previous displayed
|
|
|
|
packet. */
|
2013-08-14 04:14:36 +00:00
|
|
|
if (cf->prev_dis == NULL) {
|
|
|
|
cf->prev_dis = fdata;
|
2009-09-21 15:50:15 +00:00
|
|
|
}
|
2009-07-28 16:20:05 +00:00
|
|
|
|
2009-09-21 15:50:15 +00:00
|
|
|
/* Get the time elapsed between the first packet and this packet. */
|
2013-08-14 04:14:36 +00:00
|
|
|
fdata->frame_ref_num = (fdata != cf->ref) ? cf->ref->num : 0;
|
|
|
|
nstime_delta(&rel_ts, &fdata->abs_ts, &cf->ref->abs_ts);
|
2009-07-28 16:20:05 +00:00
|
|
|
|
2009-09-21 15:50:15 +00:00
|
|
|
/* If it's greater than the current elapsed time, set the elapsed time
|
2009-07-28 16:20:05 +00:00
|
|
|
to it (we check for "greater than" so as not to be confused by
|
|
|
|
time moving backwards). */
|
2013-07-21 23:07:33 +00:00
|
|
|
if ((gint32)cf->elapsed_time.secs < rel_ts.secs
|
|
|
|
|| ((gint32)cf->elapsed_time.secs == rel_ts.secs && (gint32)cf->elapsed_time.nsecs < rel_ts.nsecs)) {
|
|
|
|
cf->elapsed_time = rel_ts;
|
2009-09-21 15:50:15 +00:00
|
|
|
}
|
2009-07-28 16:20:05 +00:00
|
|
|
|
2012-02-28 03:19:49 +00:00
|
|
|
/* If this frame is displayed, get the time elapsed between the
|
|
|
|
previous displayed packet and this packet. */
|
2012-08-12 22:21:02 +00:00
|
|
|
if ( fdata->flags.passed_dfilter ) {
|
2013-08-14 04:14:36 +00:00
|
|
|
fdata->prev_dis_num = cf->prev_dis->num;
|
|
|
|
cf->prev_dis = fdata;
|
2011-12-27 18:16:12 +00:00
|
|
|
}
|
2010-05-26 23:29:56 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Byte counts
|
|
|
|
*/
|
2012-08-12 22:21:02 +00:00
|
|
|
if ( (fdata->flags.passed_dfilter) || (fdata->flags.ref_time) ) {
|
2009-09-21 15:50:15 +00:00
|
|
|
/* This frame either passed the display filter list or is marked as
|
|
|
|
a time reference frame. All time reference frames are displayed
|
|
|
|
even if they dont pass the display filter */
|
2012-08-12 22:21:02 +00:00
|
|
|
if (fdata->flags.ref_time) {
|
2010-05-26 23:29:56 +00:00
|
|
|
/* if this was a TIME REF frame we should reset the cum_bytes field */
|
2013-08-14 04:14:36 +00:00
|
|
|
cf->cum_bytes = fdata->pkt_len;
|
|
|
|
fdata->cum_bytes = cf->cum_bytes;
|
2009-09-21 15:50:15 +00:00
|
|
|
} else {
|
|
|
|
/* increase cum_bytes with this packets length */
|
2013-08-14 04:14:36 +00:00
|
|
|
cf->cum_bytes += fdata->pkt_len;
|
2009-09-21 15:50:15 +00:00
|
|
|
}
|
|
|
|
}
|
2009-07-28 16:20:05 +00:00
|
|
|
}
|
|
|
|
}
|
2009-09-21 15:50:15 +00:00
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
typedef enum {
|
|
|
|
PSP_FINISHED,
|
|
|
|
PSP_STOPPED,
|
|
|
|
PSP_FAILED
|
|
|
|
} psp_return_t;
|
|
|
|
|
2005-08-14 23:25:20 +00:00
|
|
|
static psp_return_t
|
2004-01-09 22:56:59 +00:00
|
|
|
process_specified_packets(capture_file *cf, packet_range_t *range,
|
2005-11-12 11:05:02 +00:00
|
|
|
const char *string1, const char *string2, gboolean terminate_is_stop,
|
2004-01-09 22:56:59 +00:00
|
|
|
gboolean (*callback)(capture_file *, frame_data *,
|
2012-10-16 21:50:57 +00:00
|
|
|
struct wtap_pkthdr *, const guint8 *, void *),
|
2004-01-09 22:56:59 +00:00
|
|
|
void *callback_args)
|
1999-07-23 08:29:24 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
guint32 framenum;
|
|
|
|
frame_data *fdata;
|
2013-06-16 00:20:00 +00:00
|
|
|
Buffer buf;
|
2012-08-12 22:21:02 +00:00
|
|
|
psp_return_t ret = PSP_FINISHED;
|
|
|
|
|
|
|
|
progdlg_t *progbar = NULL;
|
|
|
|
int progbar_count;
|
|
|
|
float progbar_val;
|
|
|
|
gboolean progbar_stop_flag;
|
|
|
|
GTimeVal progbar_start_time;
|
|
|
|
gchar progbar_status_str[100];
|
|
|
|
int progbar_nextstep;
|
|
|
|
int progbar_quantum;
|
|
|
|
range_process_e process_this;
|
2012-10-16 21:50:57 +00:00
|
|
|
struct wtap_pkthdr phdr;
|
1999-08-10 04:13:37 +00:00
|
|
|
|
2013-09-05 20:35:03 +00:00
|
|
|
memset(&phdr, 0, sizeof(struct wtap_pkthdr));
|
2013-06-16 00:20:00 +00:00
|
|
|
buffer_init(&buf, 1500);
|
|
|
|
|
1999-09-13 23:45:22 +00:00
|
|
|
/* Update the progress bar when it gets to this value. */
|
2004-01-09 21:38:21 +00:00
|
|
|
progbar_nextstep = 0;
|
1999-09-13 23:45:22 +00:00
|
|
|
/* When we reach the value that triggers a progress bar update,
|
|
|
|
bump that value by this amount. */
|
2004-01-09 21:38:21 +00:00
|
|
|
progbar_quantum = cf->count/N_PROGBAR_UPDATES;
|
2000-01-08 23:49:33 +00:00
|
|
|
/* Count of packets at which we've looked. */
|
2004-01-09 22:56:59 +00:00
|
|
|
progbar_count = 0;
|
2005-10-27 20:18:50 +00:00
|
|
|
/* Progress so far. */
|
2009-04-21 16:57:52 +00:00
|
|
|
progbar_val = 0.0f;
|
1999-09-13 23:45:22 +00:00
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
progbar_stop_flag = FALSE;
|
|
|
|
g_get_current_time(&progbar_start_time);
|
2000-01-08 23:49:33 +00:00
|
|
|
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
if (range != NULL)
|
|
|
|
packet_range_process_init(range);
|
2004-01-09 18:11:21 +00:00
|
|
|
|
2011-04-25 05:33:07 +00:00
|
|
|
/* Iterate through all the packets, printing the packets that
|
1999-09-12 06:11:51 +00:00
|
|
|
were selected by the current display filter. */
|
2011-04-25 05:33:07 +00:00
|
|
|
for (framenum = 1; framenum <= cf->count; framenum++) {
|
2011-04-27 02:54:44 +00:00
|
|
|
fdata = frame_data_sequence_find(cf->frames, framenum);
|
2011-04-25 05:33:07 +00:00
|
|
|
|
2005-10-27 06:45:37 +00:00
|
|
|
/* Create the progress bar if necessary.
|
|
|
|
We check on every iteration of the loop, so that it takes no
|
|
|
|
longer than the standard time to create it (otherwise, for a
|
|
|
|
large file, we might take considerably longer than that standard
|
|
|
|
time in order to get to the next progress bar step). */
|
|
|
|
if (progbar == NULL)
|
2012-07-19 21:49:52 +00:00
|
|
|
progbar = delayed_create_progress_dlg(cf->window, string1, string2,
|
2005-11-12 11:05:02 +00:00
|
|
|
terminate_is_stop,
|
2005-10-27 06:45:37 +00:00
|
|
|
&progbar_stop_flag,
|
|
|
|
&progbar_start_time,
|
|
|
|
progbar_val);
|
|
|
|
|
1999-09-13 23:45:22 +00:00
|
|
|
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
|
|
|
|
when we update it, we have to run the GTK+ main loop to get it
|
|
|
|
to repaint what's pending, and doing so may involve an "ioctl()"
|
|
|
|
to see if there's any pending input from an X server, and doing
|
|
|
|
that for every packet can be costly, especially on a big file. */
|
2004-01-09 22:56:59 +00:00
|
|
|
if (progbar_count >= progbar_nextstep) {
|
1999-09-13 23:45:22 +00:00
|
|
|
/* let's not divide by zero. I should never be started
|
2000-01-08 23:49:33 +00:00
|
|
|
* with count == 0, so let's assert that
|
1999-09-13 23:45:22 +00:00
|
|
|
*/
|
2000-01-08 23:49:33 +00:00
|
|
|
g_assert(cf->count > 0);
|
2004-01-09 22:56:59 +00:00
|
|
|
progbar_val = (gfloat) progbar_count / cf->count;
|
1999-09-13 23:45:22 +00:00
|
|
|
|
2002-08-28 10:07:37 +00:00
|
|
|
if (progbar != NULL) {
|
2004-01-09 22:56:59 +00:00
|
|
|
g_snprintf(progbar_status_str, sizeof(progbar_status_str),
|
|
|
|
"%4u of %u packets", progbar_count, cf->count);
|
|
|
|
update_progress_dlg(progbar, progbar_val, progbar_status_str);
|
2002-08-28 10:07:37 +00:00
|
|
|
}
|
2002-07-30 10:13:16 +00:00
|
|
|
|
2004-01-09 21:38:21 +00:00
|
|
|
progbar_nextstep += progbar_quantum;
|
1999-09-13 23:45:22 +00:00
|
|
|
}
|
2000-07-03 08:36:52 +00:00
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
if (progbar_stop_flag) {
|
|
|
|
/* Well, the user decided to abort the operation. Just stop,
|
2005-11-12 11:05:02 +00:00
|
|
|
and arrange to return PSP_STOPPED to our caller, so they know
|
|
|
|
it was stopped explicitly. */
|
2004-01-09 22:56:59 +00:00
|
|
|
ret = PSP_STOPPED;
|
2000-07-03 08:36:52 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
progbar_count++;
|
2004-01-09 18:11:21 +00:00
|
|
|
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
if (range != NULL) {
|
|
|
|
/* do we have to process this packet? */
|
|
|
|
process_this = packet_range_process_packet(range, fdata);
|
|
|
|
if (process_this == range_process_next) {
|
2004-01-09 18:11:21 +00:00
|
|
|
/* this packet uninteresting, continue with next one */
|
|
|
|
continue;
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
} else if (process_this == range_processing_finished) {
|
2004-01-09 18:11:21 +00:00
|
|
|
/* all interesting packets processed, stop the loop */
|
|
|
|
break;
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
}
|
2004-01-09 18:11:21 +00:00
|
|
|
}
|
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
/* Get the packet */
|
2013-06-16 00:20:00 +00:00
|
|
|
if (!cf_read_frame_r(cf, fdata, &phdr, &buf)) {
|
2004-01-09 22:56:59 +00:00
|
|
|
/* Attempt to get the packet failed. */
|
|
|
|
ret = PSP_FAILED;
|
|
|
|
break;
|
2004-01-09 18:11:21 +00:00
|
|
|
}
|
2004-05-27 21:48:10 +00:00
|
|
|
/* Process the packet */
|
2013-06-16 00:20:00 +00:00
|
|
|
if (!callback(cf, fdata, &phdr, buffer_start_ptr(&buf), callback_args)) {
|
2004-01-09 22:56:59 +00:00
|
|
|
/* Callback failed. We assume it reported the error appropriately. */
|
|
|
|
ret = PSP_FAILED;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2000-02-21 08:18:00 +00:00
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
/* We're done printing the packets; destroy the progress bar if
|
|
|
|
it was created. */
|
|
|
|
if (progbar != NULL)
|
|
|
|
destroy_progress_dlg(progbar);
|
1999-08-10 04:13:37 +00:00
|
|
|
|
2013-06-16 00:20:00 +00:00
|
|
|
buffer_free(&buf);
|
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
return ret;
|
|
|
|
}
|
1999-08-10 04:13:37 +00:00
|
|
|
|
2009-06-05 22:42:47 +00:00
|
|
|
typedef struct {
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_t edt;
|
2009-06-05 22:42:47 +00:00
|
|
|
column_info *cinfo;
|
|
|
|
} retap_callback_args_t;
|
|
|
|
|
2004-01-13 22:34:10 +00:00
|
|
|
static gboolean
|
|
|
|
retap_packet(capture_file *cf _U_, frame_data *fdata,
|
2012-10-16 21:50:57 +00:00
|
|
|
struct wtap_pkthdr *phdr, const guint8 *pd,
|
2005-09-14 08:59:41 +00:00
|
|
|
void *argsp)
|
2004-01-13 22:34:10 +00:00
|
|
|
{
|
2013-03-06 17:35:11 +00:00
|
|
|
retap_callback_args_t *args = (retap_callback_args_t *)argsp;
|
2004-01-13 22:34:10 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_run_with_taps(&args->edt, phdr, frame_tvbuff_new(fdata, pd), fdata, args->cinfo);
|
|
|
|
epan_dissect_reset(&args->edt);
|
2004-01-13 22:34:10 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2005-02-05 12:50:47 +00:00
|
|
|
cf_read_status_t
|
2009-06-05 22:42:47 +00:00
|
|
|
cf_retap_packets(capture_file *cf)
|
2004-01-13 22:34:10 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
packet_range_t range;
|
2009-06-05 22:42:47 +00:00
|
|
|
retap_callback_args_t callback_args;
|
2013-10-20 13:22:48 +00:00
|
|
|
gboolean construct_protocol_tree;
|
2012-08-12 22:21:02 +00:00
|
|
|
gboolean filtering_tap_listeners;
|
|
|
|
guint tap_flags;
|
2013-10-20 13:22:48 +00:00
|
|
|
psp_return_t ret;
|
2009-06-05 22:42:47 +00:00
|
|
|
|
|
|
|
/* Do we have any tap listeners with filters? */
|
|
|
|
filtering_tap_listeners = have_filtering_tap_listeners();
|
|
|
|
|
|
|
|
tap_flags = union_of_tap_listener_flags();
|
|
|
|
|
|
|
|
/* If any tap listeners have filters, or require the protocol tree,
|
|
|
|
construct the protocol tree. */
|
2013-10-20 13:22:48 +00:00
|
|
|
construct_protocol_tree = filtering_tap_listeners ||
|
|
|
|
(tap_flags & TL_REQUIRES_PROTO_TREE);
|
2009-06-05 22:42:47 +00:00
|
|
|
|
|
|
|
/* If any tap listeners require the columns, construct them. */
|
|
|
|
callback_args.cinfo = (tap_flags & TL_REQUIRES_COLUMNS) ? &cf->cinfo : NULL;
|
2004-01-13 22:34:10 +00:00
|
|
|
|
2004-01-16 19:35:32 +00:00
|
|
|
/* Reset the tap listeners. */
|
|
|
|
reset_tap_listeners();
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_init(&callback_args.edt, cf->epan, construct_protocol_tree, FALSE);
|
|
|
|
|
2004-01-13 22:34:10 +00:00
|
|
|
/* Iterate through the list of packets, dissecting all packets and
|
|
|
|
re-running the taps. */
|
2012-10-05 18:52:42 +00:00
|
|
|
packet_range_init(&range, cf);
|
2004-01-13 22:34:10 +00:00
|
|
|
packet_range_process_init(&range);
|
2013-10-20 13:22:48 +00:00
|
|
|
|
|
|
|
ret = process_specified_packets(cf, &range, "Recalculating statistics on",
|
|
|
|
"all packets", TRUE, retap_packet,
|
|
|
|
&callback_args);
|
|
|
|
|
|
|
|
epan_dissect_cleanup(&callback_args.edt);
|
|
|
|
|
|
|
|
switch (ret) {
|
2004-01-13 22:34:10 +00:00
|
|
|
case PSP_FINISHED:
|
|
|
|
/* Completed successfully. */
|
2008-05-30 07:15:05 +00:00
|
|
|
return CF_READ_OK;
|
2004-01-13 22:34:10 +00:00
|
|
|
|
|
|
|
case PSP_STOPPED:
|
|
|
|
/* Well, the user decided to abort the refiltering.
|
2005-02-05 12:50:47 +00:00
|
|
|
Return CF_READ_ABORTED so our caller knows they did that. */
|
2005-02-05 13:44:27 +00:00
|
|
|
return CF_READ_ABORTED;
|
2004-01-13 22:34:10 +00:00
|
|
|
|
|
|
|
case PSP_FAILED:
|
|
|
|
/* Error while retapping. */
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_READ_ERROR;
|
2004-01-13 22:34:10 +00:00
|
|
|
}
|
|
|
|
|
2005-02-05 13:44:27 +00:00
|
|
|
g_assert_not_reached();
|
2005-02-05 12:50:47 +00:00
|
|
|
return CF_READ_OK;
|
2004-01-13 22:34:10 +00:00
|
|
|
}
|
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
typedef struct {
|
|
|
|
print_args_t *print_args;
|
2004-04-16 20:20:54 +00:00
|
|
|
gboolean print_header_line;
|
|
|
|
char *header_line_buf;
|
|
|
|
int header_line_buf_len;
|
2004-04-22 17:03:21 +00:00
|
|
|
gboolean print_formfeed;
|
2004-01-09 22:56:59 +00:00
|
|
|
gboolean print_separator;
|
|
|
|
char *line_buf;
|
|
|
|
int line_buf_len;
|
|
|
|
gint *col_widths;
|
2012-07-15 14:56:40 +00:00
|
|
|
int num_visible_cols;
|
|
|
|
gint *visible_cols;
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_t edt;
|
2004-01-09 22:56:59 +00:00
|
|
|
} print_callback_args_t;
|
1999-08-10 04:13:37 +00:00
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
static gboolean
|
|
|
|
print_packet(capture_file *cf, frame_data *fdata,
|
2012-10-16 21:50:57 +00:00
|
|
|
struct wtap_pkthdr *phdr, const guint8 *pd,
|
2004-01-09 22:56:59 +00:00
|
|
|
void *argsp)
|
|
|
|
{
|
2013-03-06 17:35:11 +00:00
|
|
|
print_callback_args_t *args = (print_callback_args_t *)argsp;
|
2004-01-09 22:56:59 +00:00
|
|
|
int i;
|
|
|
|
char *cp;
|
|
|
|
int line_len;
|
|
|
|
int column_len;
|
|
|
|
int cp_off;
|
2012-08-12 22:21:02 +00:00
|
|
|
char bookmark_name[9+10+1]; /* "__frameNNNNNNNNNN__\0" */
|
|
|
|
char bookmark_title[6+10+1]; /* "Frame NNNNNNNNNN__\0" */
|
2004-04-16 18:17:48 +00:00
|
|
|
|
2004-07-08 11:07:29 +00:00
|
|
|
/* Fill in the column information if we're printing the summary
|
|
|
|
information. */
|
|
|
|
if (args->print_args->print_summary) {
|
2013-10-20 13:22:48 +00:00
|
|
|
col_custom_prime_edt(&args->edt, &cf->cinfo);
|
|
|
|
epan_dissect_run(&args->edt, phdr, frame_tvbuff_new(fdata, pd), fdata, &cf->cinfo);
|
|
|
|
epan_dissect_fill_in_columns(&args->edt, FALSE, TRUE);
|
2004-07-08 11:07:29 +00:00
|
|
|
} else
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_run(&args->edt, phdr, frame_tvbuff_new(fdata, pd), fdata, NULL);
|
2004-04-16 18:17:48 +00:00
|
|
|
|
2004-04-22 17:03:21 +00:00
|
|
|
if (args->print_formfeed) {
|
2004-07-27 20:10:02 +00:00
|
|
|
if (!new_page(args->print_args->stream))
|
2004-07-25 08:53:38 +00:00
|
|
|
goto fail;
|
2004-04-22 17:03:21 +00:00
|
|
|
} else {
|
2004-07-25 08:53:38 +00:00
|
|
|
if (args->print_separator) {
|
2004-07-27 20:10:02 +00:00
|
|
|
if (!print_line(args->print_args->stream, 0, ""))
|
2004-07-25 08:53:38 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2004-04-22 17:03:21 +00:00
|
|
|
}
|
2004-01-09 22:56:59 +00:00
|
|
|
|
2004-07-25 08:53:38 +00:00
|
|
|
/*
|
|
|
|
* We generate bookmarks, if the output format supports them.
|
|
|
|
* The name is "__frameN__".
|
|
|
|
*/
|
2005-08-10 19:37:29 +00:00
|
|
|
g_snprintf(bookmark_name, sizeof bookmark_name, "__frame%u__", fdata->num);
|
2004-07-25 08:53:38 +00:00
|
|
|
|
2004-07-08 11:07:29 +00:00
|
|
|
if (args->print_args->print_summary) {
|
2013-06-19 15:22:56 +00:00
|
|
|
if (!args->print_args->print_col_headings)
|
|
|
|
args->print_header_line = FALSE;
|
2004-04-16 20:20:54 +00:00
|
|
|
if (args->print_header_line) {
|
2004-07-27 20:10:02 +00:00
|
|
|
if (!print_line(args->print_args->stream, 0, args->header_line_buf))
|
2004-07-25 08:53:38 +00:00
|
|
|
goto fail;
|
2009-09-21 15:50:15 +00:00
|
|
|
args->print_header_line = FALSE; /* we might not need to print any more */
|
2004-04-16 20:20:54 +00:00
|
|
|
}
|
2004-01-09 22:56:59 +00:00
|
|
|
cp = &args->line_buf[0];
|
|
|
|
line_len = 0;
|
2012-07-15 14:56:40 +00:00
|
|
|
for (i = 0; i < args->num_visible_cols; i++) {
|
2004-01-09 22:56:59 +00:00
|
|
|
/* Find the length of the string for this column. */
|
2012-07-15 14:56:40 +00:00
|
|
|
column_len = (int) strlen(cf->cinfo.col_data[args->visible_cols[i]]);
|
2004-01-09 22:56:59 +00:00
|
|
|
if (args->col_widths[i] > column_len)
|
|
|
|
column_len = args->col_widths[i];
|
1999-09-29 22:19:24 +00:00
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
/* Make sure there's room in the line buffer for the column; if not,
|
|
|
|
double its length. */
|
2009-09-21 15:50:15 +00:00
|
|
|
line_len += column_len + 1; /* "+1" for space */
|
2004-01-09 22:56:59 +00:00
|
|
|
if (line_len > args->line_buf_len) {
|
2009-04-16 04:05:39 +00:00
|
|
|
cp_off = (int) (cp - args->line_buf);
|
2004-01-09 22:56:59 +00:00
|
|
|
args->line_buf_len = 2 * line_len;
|
2013-03-06 17:35:11 +00:00
|
|
|
args->line_buf = (char *)g_realloc(args->line_buf, args->line_buf_len + 1);
|
2004-01-09 22:56:59 +00:00
|
|
|
cp = args->line_buf + cp_off;
|
|
|
|
}
|
1999-07-23 08:29:24 +00:00
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
/* Right-justify the packet number column. */
|
2012-07-15 14:56:40 +00:00
|
|
|
if (cf->cinfo.col_fmt[args->visible_cols[i]] == COL_NUMBER)
|
|
|
|
g_snprintf(cp, column_len+1, "%*s", args->col_widths[i], cf->cinfo.col_data[args->visible_cols[i]]);
|
2004-01-09 22:56:59 +00:00
|
|
|
else
|
2012-07-15 14:56:40 +00:00
|
|
|
g_snprintf(cp, column_len+1, "%-*s", args->col_widths[i], cf->cinfo.col_data[args->visible_cols[i]]);
|
2004-01-09 22:56:59 +00:00
|
|
|
cp += column_len;
|
2012-07-15 14:56:40 +00:00
|
|
|
if (i != args->num_visible_cols - 1)
|
2004-01-09 22:56:59 +00:00
|
|
|
*cp++ = ' ';
|
|
|
|
}
|
|
|
|
*cp = '\0';
|
2004-04-22 17:03:21 +00:00
|
|
|
|
2004-07-25 08:53:38 +00:00
|
|
|
/*
|
|
|
|
* Generate a bookmark, using the summary line as the title.
|
|
|
|
*/
|
2004-07-27 20:10:02 +00:00
|
|
|
if (!print_bookmark(args->print_args->stream, bookmark_name,
|
|
|
|
args->line_buf))
|
2004-07-25 08:53:38 +00:00
|
|
|
goto fail;
|
2004-04-22 17:03:21 +00:00
|
|
|
|
2004-07-27 20:10:02 +00:00
|
|
|
if (!print_line(args->print_args->stream, 0, args->line_buf))
|
2004-07-25 08:53:38 +00:00
|
|
|
goto fail;
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Generate a bookmark, using "Frame N" as the title, as we're not
|
|
|
|
* printing the summary line.
|
|
|
|
*/
|
2005-08-10 19:37:29 +00:00
|
|
|
g_snprintf(bookmark_title, sizeof bookmark_title, "Frame %u", fdata->num);
|
2004-07-27 20:10:02 +00:00
|
|
|
if (!print_bookmark(args->print_args->stream, bookmark_name,
|
|
|
|
bookmark_title))
|
2004-07-25 08:53:38 +00:00
|
|
|
goto fail;
|
2004-04-16 18:17:48 +00:00
|
|
|
} /* if (print_summary) */
|
2004-07-25 08:53:38 +00:00
|
|
|
|
2004-04-16 18:17:48 +00:00
|
|
|
if (args->print_args->print_dissections != print_dissections_none) {
|
2004-04-16 20:20:54 +00:00
|
|
|
if (args->print_args->print_summary) {
|
|
|
|
/* Separate the summary line from the tree with a blank line. */
|
2004-07-27 20:10:02 +00:00
|
|
|
if (!print_line(args->print_args->stream, 0, ""))
|
2004-07-25 08:53:38 +00:00
|
|
|
goto fail;
|
2004-04-16 20:20:54 +00:00
|
|
|
}
|
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
/* Print the information in that tree. */
|
2013-10-20 13:22:48 +00:00
|
|
|
if (!proto_tree_print(args->print_args, &args->edt, args->print_args->stream))
|
2004-07-25 08:53:38 +00:00
|
|
|
goto fail;
|
2004-01-09 22:56:59 +00:00
|
|
|
|
2004-04-16 18:17:48 +00:00
|
|
|
/* Print a blank line if we print anything after this (aka more than one packet). */
|
|
|
|
args->print_separator = TRUE;
|
2004-04-16 20:20:54 +00:00
|
|
|
|
|
|
|
/* Print a header line if we print any more packet summaries */
|
2013-06-19 15:22:56 +00:00
|
|
|
if (args->print_args->print_col_headings)
|
|
|
|
args->print_header_line = TRUE;
|
2004-04-16 18:17:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (args->print_args->print_hex) {
|
2012-10-22 15:56:59 +00:00
|
|
|
if (args->print_args->print_summary || (args->print_args->print_dissections != print_dissections_none)) {
|
|
|
|
if (!print_line(args->print_args->stream, 0, ""))
|
|
|
|
goto fail;
|
|
|
|
}
|
2004-04-16 18:17:48 +00:00
|
|
|
/* Print the full packet data as hex. */
|
2013-10-20 13:22:48 +00:00
|
|
|
if (!print_hex_data(args->print_args->stream, &args->edt))
|
2004-07-25 08:53:38 +00:00
|
|
|
goto fail;
|
2004-01-09 22:56:59 +00:00
|
|
|
|
2004-04-16 18:17:48 +00:00
|
|
|
/* Print a blank line if we print anything after this (aka more than one packet). */
|
2004-01-09 22:56:59 +00:00
|
|
|
args->print_separator = TRUE;
|
2004-04-16 20:20:54 +00:00
|
|
|
|
|
|
|
/* Print a header line if we print any more packet summaries */
|
2013-06-19 15:22:56 +00:00
|
|
|
if (args->print_args->print_col_headings)
|
|
|
|
args->print_header_line = TRUE;
|
2004-07-25 08:53:38 +00:00
|
|
|
} /* if (args->print_args->print_dissections != print_dissections_none) */
|
2004-04-16 18:17:48 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_reset(&args->edt);
|
2004-01-09 22:56:59 +00:00
|
|
|
|
2004-04-22 17:03:21 +00:00
|
|
|
/* do we want to have a formfeed between each packet from now on? */
|
2012-08-12 22:21:02 +00:00
|
|
|
if (args->print_args->print_formfeed) {
|
2004-04-22 17:03:21 +00:00
|
|
|
args->print_formfeed = TRUE;
|
|
|
|
}
|
|
|
|
|
2004-07-25 08:53:38 +00:00
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
fail:
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_reset(&args->edt);
|
2004-07-25 08:53:38 +00:00
|
|
|
return FALSE;
|
2004-01-09 22:56:59 +00:00
|
|
|
}
|
|
|
|
|
2005-02-04 20:54:12 +00:00
|
|
|
cf_print_status_t
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_print_packets(capture_file *cf, print_args_t *print_args)
|
2004-01-09 22:56:59 +00:00
|
|
|
{
|
|
|
|
print_callback_args_t callback_args;
|
2012-08-12 22:21:02 +00:00
|
|
|
gint data_width;
|
|
|
|
char *cp;
|
|
|
|
int i, cp_off, column_len, line_len;
|
|
|
|
int num_visible_col = 0, last_visible_col = 0, visible_col_count;
|
|
|
|
psp_return_t ret;
|
|
|
|
GList *clp;
|
|
|
|
fmt_data *cfmt;
|
2013-10-20 13:22:48 +00:00
|
|
|
gboolean proto_tree_needed;
|
2000-07-03 08:36:52 +00:00
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
callback_args.print_args = print_args;
|
2013-06-19 15:22:56 +00:00
|
|
|
callback_args.print_header_line = print_args->print_col_headings;
|
2004-04-16 20:20:54 +00:00
|
|
|
callback_args.header_line_buf = NULL;
|
|
|
|
callback_args.header_line_buf_len = 256;
|
2004-04-22 17:03:21 +00:00
|
|
|
callback_args.print_formfeed = FALSE;
|
2004-01-09 22:56:59 +00:00
|
|
|
callback_args.print_separator = FALSE;
|
|
|
|
callback_args.line_buf = NULL;
|
|
|
|
callback_args.line_buf_len = 256;
|
|
|
|
callback_args.col_widths = NULL;
|
2012-07-15 14:56:40 +00:00
|
|
|
callback_args.num_visible_cols = 0;
|
|
|
|
callback_args.visible_cols = NULL;
|
2004-07-27 20:10:02 +00:00
|
|
|
|
2013-07-12 03:50:50 +00:00
|
|
|
if (!print_preamble(print_args->stream, cf->filename, wireshark_svnversion)) {
|
2004-07-27 20:10:02 +00:00
|
|
|
destroy_print_stream(print_args->stream);
|
2005-02-04 18:44:44 +00:00
|
|
|
return CF_PRINT_WRITE_ERROR;
|
2004-07-27 20:10:02 +00:00
|
|
|
}
|
|
|
|
|
2004-07-08 11:07:29 +00:00
|
|
|
if (print_args->print_summary) {
|
2004-04-16 20:20:54 +00:00
|
|
|
/* We're printing packet summaries. Allocate the header line buffer
|
|
|
|
and get the column widths. */
|
2013-03-06 17:35:11 +00:00
|
|
|
callback_args.header_line_buf = (char *)g_malloc(callback_args.header_line_buf_len + 1);
|
2004-01-09 22:56:59 +00:00
|
|
|
|
2012-07-15 14:56:40 +00:00
|
|
|
/* Find the number of visible columns and the last visible column */
|
|
|
|
for (i = 0; i < prefs.num_cols; i++) {
|
|
|
|
|
|
|
|
clp = g_list_nth(prefs.col_list, i);
|
|
|
|
if (clp == NULL) /* Sanity check, Invalid column requested */
|
|
|
|
continue;
|
|
|
|
|
|
|
|
cfmt = (fmt_data *) clp->data;
|
|
|
|
if (cfmt->visible) {
|
|
|
|
num_visible_col++;
|
|
|
|
last_visible_col = i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
/* Find the widths for each of the columns - maximum of the
|
2004-04-16 20:20:54 +00:00
|
|
|
width of the title and the width of the data - and construct
|
|
|
|
a buffer with a line containing the column titles. */
|
2012-07-15 14:56:40 +00:00
|
|
|
callback_args.num_visible_cols = num_visible_col;
|
|
|
|
callback_args.col_widths = (gint *) g_malloc(sizeof(gint) * num_visible_col);
|
|
|
|
callback_args.visible_cols = (gint *) g_malloc(sizeof(gint) * num_visible_col);
|
2004-04-16 20:20:54 +00:00
|
|
|
cp = &callback_args.header_line_buf[0];
|
2004-01-09 22:56:59 +00:00
|
|
|
line_len = 0;
|
2012-07-15 14:56:40 +00:00
|
|
|
visible_col_count = 0;
|
2004-01-09 22:56:59 +00:00
|
|
|
for (i = 0; i < cf->cinfo.num_cols; i++) {
|
2012-07-15 14:56:40 +00:00
|
|
|
|
|
|
|
clp = g_list_nth(prefs.col_list, i);
|
|
|
|
if (clp == NULL) /* Sanity check, Invalid column requested */
|
|
|
|
continue;
|
|
|
|
|
|
|
|
cfmt = (fmt_data *) clp->data;
|
|
|
|
if (cfmt->visible == FALSE)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Save the order of visible columns */
|
|
|
|
callback_args.visible_cols[visible_col_count] = i;
|
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
/* Don't pad the last column. */
|
2012-07-15 14:56:40 +00:00
|
|
|
if (i == last_visible_col)
|
|
|
|
callback_args.col_widths[visible_col_count] = 0;
|
2004-01-09 22:56:59 +00:00
|
|
|
else {
|
2012-07-15 14:56:40 +00:00
|
|
|
callback_args.col_widths[visible_col_count] = (gint) strlen(cf->cinfo.col_title[i]);
|
2004-01-09 22:56:59 +00:00
|
|
|
data_width = get_column_char_width(get_column_format(i));
|
2012-07-15 14:56:40 +00:00
|
|
|
if (data_width > callback_args.col_widths[visible_col_count])
|
|
|
|
callback_args.col_widths[visible_col_count] = data_width;
|
2004-01-09 22:56:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Find the length of the string for this column. */
|
2009-04-16 04:05:39 +00:00
|
|
|
column_len = (int) strlen(cf->cinfo.col_title[i]);
|
2004-01-09 22:56:59 +00:00
|
|
|
if (callback_args.col_widths[i] > column_len)
|
2012-07-15 14:56:40 +00:00
|
|
|
column_len = callback_args.col_widths[visible_col_count];
|
2004-01-09 22:56:59 +00:00
|
|
|
|
|
|
|
/* Make sure there's room in the line buffer for the column; if not,
|
|
|
|
double its length. */
|
2009-09-21 15:50:15 +00:00
|
|
|
line_len += column_len + 1; /* "+1" for space */
|
2004-04-16 20:20:54 +00:00
|
|
|
if (line_len > callback_args.header_line_buf_len) {
|
2009-04-16 04:05:39 +00:00
|
|
|
cp_off = (int) (cp - callback_args.header_line_buf);
|
2004-04-16 20:20:54 +00:00
|
|
|
callback_args.header_line_buf_len = 2 * line_len;
|
2013-03-06 17:35:11 +00:00
|
|
|
callback_args.header_line_buf = (char *)g_realloc(callback_args.header_line_buf,
|
2004-04-16 20:20:54 +00:00
|
|
|
callback_args.header_line_buf_len + 1);
|
|
|
|
cp = callback_args.header_line_buf + cp_off;
|
2004-01-09 22:56:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Right-justify the packet number column. */
|
2004-04-20 22:34:08 +00:00
|
|
|
/* if (cf->cinfo.col_fmt[i] == COL_NUMBER)
|
2012-07-15 14:56:40 +00:00
|
|
|
g_snprintf(cp, column_len+1, "%*s", callback_args.col_widths[visible_col_count], cf->cinfo.col_title[i]);
|
2004-04-20 22:34:08 +00:00
|
|
|
else*/
|
2012-07-15 14:56:40 +00:00
|
|
|
g_snprintf(cp, column_len+1, "%-*s", callback_args.col_widths[visible_col_count], cf->cinfo.col_title[i]);
|
2004-01-09 22:56:59 +00:00
|
|
|
cp += column_len;
|
|
|
|
if (i != cf->cinfo.num_cols - 1)
|
|
|
|
*cp++ = ' ';
|
2012-07-15 14:56:40 +00:00
|
|
|
|
|
|
|
visible_col_count++;
|
2004-01-09 22:56:59 +00:00
|
|
|
}
|
|
|
|
*cp = '\0';
|
2004-04-16 20:20:54 +00:00
|
|
|
|
|
|
|
/* Now start out the main line buffer with the same length as the
|
|
|
|
header line buffer. */
|
|
|
|
callback_args.line_buf_len = callback_args.header_line_buf_len;
|
2013-03-06 17:35:11 +00:00
|
|
|
callback_args.line_buf = (char *)g_malloc(callback_args.line_buf_len + 1);
|
2004-01-09 22:56:59 +00:00
|
|
|
} /* if (print_summary) */
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
/* Create the protocol tree, and make it visible, if we're printing
|
|
|
|
the dissection or the hex data.
|
|
|
|
XXX - do we need it if we're just printing the hex data? */
|
|
|
|
proto_tree_needed =
|
|
|
|
callback_args.print_args->print_dissections != print_dissections_none ||
|
|
|
|
callback_args.print_args->print_hex ||
|
|
|
|
have_custom_cols(&cf->cinfo);
|
|
|
|
epan_dissect_init(&callback_args.edt, cf->epan, proto_tree_needed, proto_tree_needed);
|
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
/* Iterate through the list of packets, printing the packets we were
|
|
|
|
told to print. */
|
2004-01-25 00:58:13 +00:00
|
|
|
ret = process_specified_packets(cf, &print_args->range, "Printing",
|
2005-11-12 11:05:02 +00:00
|
|
|
"selected packets", TRUE, print_packet,
|
2004-01-25 00:58:13 +00:00
|
|
|
&callback_args);
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_cleanup(&callback_args.edt);
|
2009-03-15 18:08:46 +00:00
|
|
|
g_free(callback_args.header_line_buf);
|
|
|
|
g_free(callback_args.line_buf);
|
|
|
|
g_free(callback_args.col_widths);
|
2012-07-15 14:56:40 +00:00
|
|
|
g_free(callback_args.visible_cols);
|
2004-01-25 00:58:13 +00:00
|
|
|
|
|
|
|
switch (ret) {
|
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
case PSP_FINISHED:
|
|
|
|
/* Completed successfully. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSP_STOPPED:
|
|
|
|
/* Well, the user decided to abort the printing.
|
|
|
|
|
|
|
|
XXX - note that what got generated before they did that
|
2004-01-25 00:58:13 +00:00
|
|
|
will get printed if we're piping to a print program; we'd
|
2004-01-09 22:56:59 +00:00
|
|
|
have to write to a file and then hand that to the print
|
|
|
|
program to make it actually not print anything. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSP_FAILED:
|
2004-01-25 00:58:13 +00:00
|
|
|
/* Error while printing.
|
2004-01-09 22:56:59 +00:00
|
|
|
|
2004-01-25 00:58:13 +00:00
|
|
|
XXX - note that what got generated before they did that
|
|
|
|
will get printed if we're piping to a print program; we'd
|
|
|
|
have to write to a file and then hand that to the print
|
|
|
|
program to make it actually not print anything. */
|
2004-07-27 20:10:02 +00:00
|
|
|
destroy_print_stream(print_args->stream);
|
2005-02-04 18:44:44 +00:00
|
|
|
return CF_PRINT_WRITE_ERROR;
|
2004-01-25 00:58:13 +00:00
|
|
|
}
|
1999-07-23 21:09:25 +00:00
|
|
|
|
2004-07-27 20:10:02 +00:00
|
|
|
if (!print_finale(print_args->stream)) {
|
|
|
|
destroy_print_stream(print_args->stream);
|
2005-02-04 18:44:44 +00:00
|
|
|
return CF_PRINT_WRITE_ERROR;
|
2004-01-25 00:58:13 +00:00
|
|
|
}
|
2002-08-28 21:04:11 +00:00
|
|
|
|
2004-07-27 20:10:02 +00:00
|
|
|
if (!destroy_print_stream(print_args->stream))
|
2005-02-04 18:44:44 +00:00
|
|
|
return CF_PRINT_WRITE_ERROR;
|
2000-05-18 08:35:01 +00:00
|
|
|
|
2005-02-05 13:44:27 +00:00
|
|
|
return CF_PRINT_OK;
|
1999-07-23 08:29:24 +00:00
|
|
|
}
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
typedef struct {
|
|
|
|
FILE *fh;
|
|
|
|
epan_dissect_t edt;
|
|
|
|
} write_packet_callback_args_t;
|
|
|
|
|
2004-07-08 10:36:29 +00:00
|
|
|
static gboolean
|
|
|
|
write_pdml_packet(capture_file *cf _U_, frame_data *fdata,
|
2012-10-16 21:50:57 +00:00
|
|
|
struct wtap_pkthdr *phdr, const guint8 *pd,
|
2009-09-21 15:50:15 +00:00
|
|
|
void *argsp)
|
2004-07-08 10:36:29 +00:00
|
|
|
{
|
2013-10-20 13:22:48 +00:00
|
|
|
write_packet_callback_args_t *args = (write_packet_callback_args_t *)argsp;
|
2004-07-08 10:36:29 +00:00
|
|
|
|
|
|
|
/* Create the protocol tree, but don't fill in the column information. */
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_run(&args->edt, phdr, frame_tvbuff_new(fdata, pd), fdata, NULL);
|
2004-07-08 10:36:29 +00:00
|
|
|
|
|
|
|
/* Write out the information in that tree. */
|
2013-10-20 13:22:48 +00:00
|
|
|
proto_tree_write_pdml(&args->edt, args->fh);
|
2004-07-08 10:36:29 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_reset(&args->edt);
|
2004-07-08 10:36:29 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
return !ferror(args->fh);
|
2004-07-08 10:36:29 +00:00
|
|
|
}
|
|
|
|
|
2005-02-04 20:54:12 +00:00
|
|
|
cf_print_status_t
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_write_pdml_packets(capture_file *cf, print_args_t *print_args)
|
2004-07-08 10:36:29 +00:00
|
|
|
{
|
2013-10-20 13:22:48 +00:00
|
|
|
write_packet_callback_args_t callback_args;
|
2012-08-12 22:21:02 +00:00
|
|
|
FILE *fh;
|
|
|
|
psp_return_t ret;
|
2004-07-08 10:36:29 +00:00
|
|
|
|
2008-05-22 15:46:27 +00:00
|
|
|
fh = ws_fopen(print_args->file, "w");
|
2004-07-08 10:36:29 +00:00
|
|
|
if (fh == NULL)
|
2009-09-21 15:50:15 +00:00
|
|
|
return CF_PRINT_OPEN_ERROR; /* attempt to open destination failed */
|
2004-07-08 10:36:29 +00:00
|
|
|
|
2011-05-19 18:10:21 +00:00
|
|
|
write_pdml_preamble(fh, cf->filename);
|
2004-07-08 10:36:29 +00:00
|
|
|
if (ferror(fh)) {
|
|
|
|
fclose(fh);
|
2005-02-04 18:44:44 +00:00
|
|
|
return CF_PRINT_WRITE_ERROR;
|
2004-07-08 10:36:29 +00:00
|
|
|
}
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
callback_args.fh = fh;
|
|
|
|
epan_dissect_init(&callback_args.edt, cf->epan, TRUE, TRUE);
|
|
|
|
|
2004-07-08 10:36:29 +00:00
|
|
|
/* Iterate through the list of packets, printing the packets we were
|
|
|
|
told to print. */
|
|
|
|
ret = process_specified_packets(cf, &print_args->range, "Writing PDML",
|
2005-11-12 11:05:02 +00:00
|
|
|
"selected packets", TRUE,
|
2013-10-20 13:22:48 +00:00
|
|
|
write_pdml_packet, &callback_args);
|
|
|
|
|
|
|
|
epan_dissect_cleanup(&callback_args.edt);
|
2004-07-08 10:36:29 +00:00
|
|
|
|
|
|
|
switch (ret) {
|
|
|
|
|
|
|
|
case PSP_FINISHED:
|
|
|
|
/* Completed successfully. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSP_STOPPED:
|
|
|
|
/* Well, the user decided to abort the printing. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSP_FAILED:
|
|
|
|
/* Error while printing. */
|
|
|
|
fclose(fh);
|
2005-02-04 18:44:44 +00:00
|
|
|
return CF_PRINT_WRITE_ERROR;
|
2004-07-08 10:36:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
write_pdml_finale(fh);
|
|
|
|
if (ferror(fh)) {
|
|
|
|
fclose(fh);
|
2005-02-04 18:44:44 +00:00
|
|
|
return CF_PRINT_WRITE_ERROR;
|
2004-07-08 10:36:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX - check for an error */
|
|
|
|
fclose(fh);
|
|
|
|
|
2005-02-05 13:44:27 +00:00
|
|
|
return CF_PRINT_OK;
|
2004-07-08 10:36:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
write_psml_packet(capture_file *cf, frame_data *fdata,
|
2012-10-16 21:50:57 +00:00
|
|
|
struct wtap_pkthdr *phdr, const guint8 *pd,
|
2009-09-21 15:50:15 +00:00
|
|
|
void *argsp)
|
2004-07-08 10:36:29 +00:00
|
|
|
{
|
2013-10-20 13:22:48 +00:00
|
|
|
write_packet_callback_args_t *args = (write_packet_callback_args_t *)argsp;
|
2004-07-08 10:36:29 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
col_custom_prime_edt(&args->edt, &cf->cinfo);
|
|
|
|
epan_dissect_run(&args->edt, phdr, frame_tvbuff_new(fdata, pd), fdata, &cf->cinfo);
|
|
|
|
epan_dissect_fill_in_columns(&args->edt, FALSE, TRUE);
|
2004-07-08 10:36:29 +00:00
|
|
|
|
|
|
|
/* Write out the information in that tree. */
|
2013-10-20 13:22:48 +00:00
|
|
|
proto_tree_write_psml(&args->edt, args->fh);
|
2004-07-08 10:36:29 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_reset(&args->edt);
|
2004-07-08 10:36:29 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
return !ferror(args->fh);
|
2004-07-08 10:36:29 +00:00
|
|
|
}
|
|
|
|
|
2005-02-04 20:54:12 +00:00
|
|
|
cf_print_status_t
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_write_psml_packets(capture_file *cf, print_args_t *print_args)
|
2004-07-08 10:36:29 +00:00
|
|
|
{
|
2013-10-20 13:22:48 +00:00
|
|
|
write_packet_callback_args_t callback_args;
|
2012-08-12 22:21:02 +00:00
|
|
|
FILE *fh;
|
|
|
|
psp_return_t ret;
|
2004-07-08 10:36:29 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
gboolean proto_tree_needed;
|
|
|
|
|
2008-05-22 15:46:27 +00:00
|
|
|
fh = ws_fopen(print_args->file, "w");
|
2004-07-08 10:36:29 +00:00
|
|
|
if (fh == NULL)
|
2009-09-21 15:50:15 +00:00
|
|
|
return CF_PRINT_OPEN_ERROR; /* attempt to open destination failed */
|
2004-07-08 10:36:29 +00:00
|
|
|
|
|
|
|
write_psml_preamble(fh);
|
|
|
|
if (ferror(fh)) {
|
|
|
|
fclose(fh);
|
2005-02-04 18:44:44 +00:00
|
|
|
return CF_PRINT_WRITE_ERROR;
|
2004-07-08 10:36:29 +00:00
|
|
|
}
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
callback_args.fh = fh;
|
|
|
|
|
|
|
|
/* Fill in the column information, only create the protocol tree
|
|
|
|
if having custom columns. */
|
|
|
|
proto_tree_needed = have_custom_cols(&cf->cinfo);
|
|
|
|
epan_dissect_init(&callback_args.edt, cf->epan, proto_tree_needed, proto_tree_needed);
|
|
|
|
|
2004-07-08 10:36:29 +00:00
|
|
|
/* Iterate through the list of packets, printing the packets we were
|
|
|
|
told to print. */
|
|
|
|
ret = process_specified_packets(cf, &print_args->range, "Writing PSML",
|
2005-11-12 11:05:02 +00:00
|
|
|
"selected packets", TRUE,
|
2013-10-20 13:22:48 +00:00
|
|
|
write_psml_packet, &callback_args);
|
|
|
|
|
|
|
|
epan_dissect_cleanup(&callback_args.edt);
|
2004-07-08 10:36:29 +00:00
|
|
|
|
|
|
|
switch (ret) {
|
|
|
|
|
|
|
|
case PSP_FINISHED:
|
|
|
|
/* Completed successfully. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSP_STOPPED:
|
|
|
|
/* Well, the user decided to abort the printing. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSP_FAILED:
|
|
|
|
/* Error while printing. */
|
|
|
|
fclose(fh);
|
2005-02-04 18:44:44 +00:00
|
|
|
return CF_PRINT_WRITE_ERROR;
|
2004-07-08 10:36:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
write_psml_finale(fh);
|
|
|
|
if (ferror(fh)) {
|
|
|
|
fclose(fh);
|
2005-02-04 18:44:44 +00:00
|
|
|
return CF_PRINT_WRITE_ERROR;
|
2004-07-08 10:36:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX - check for an error */
|
|
|
|
fclose(fh);
|
|
|
|
|
2005-02-05 13:44:27 +00:00
|
|
|
return CF_PRINT_OK;
|
2004-07-08 10:36:29 +00:00
|
|
|
}
|
|
|
|
|
2005-03-11 20:56:31 +00:00
|
|
|
static gboolean
|
|
|
|
write_csv_packet(capture_file *cf, frame_data *fdata,
|
2012-10-16 21:50:57 +00:00
|
|
|
struct wtap_pkthdr *phdr, const guint8 *pd,
|
2005-03-11 20:56:31 +00:00
|
|
|
void *argsp)
|
|
|
|
{
|
2013-10-20 13:22:48 +00:00
|
|
|
write_packet_callback_args_t *args = (write_packet_callback_args_t *)argsp;
|
2005-03-11 20:56:31 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
/* Fill in the column information */
|
|
|
|
col_custom_prime_edt(&args->edt, &cf->cinfo);
|
|
|
|
epan_dissect_run(&args->edt, phdr, frame_tvbuff_new(fdata, pd), fdata, &cf->cinfo);
|
|
|
|
epan_dissect_fill_in_columns(&args->edt, FALSE, TRUE);
|
2005-03-11 20:56:31 +00:00
|
|
|
|
|
|
|
/* Write out the information in that tree. */
|
2013-10-20 13:22:48 +00:00
|
|
|
proto_tree_write_csv(&args->edt, args->fh);
|
2005-03-11 20:56:31 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_reset(&args->edt);
|
2005-03-11 20:56:31 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
return !ferror(args->fh);
|
2005-03-11 20:56:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
cf_print_status_t
|
|
|
|
cf_write_csv_packets(capture_file *cf, print_args_t *print_args)
|
|
|
|
{
|
2013-10-20 13:22:48 +00:00
|
|
|
write_packet_callback_args_t callback_args;
|
|
|
|
gboolean proto_tree_needed;
|
2012-08-12 22:21:02 +00:00
|
|
|
FILE *fh;
|
|
|
|
psp_return_t ret;
|
2005-03-11 20:56:31 +00:00
|
|
|
|
2008-05-22 15:46:27 +00:00
|
|
|
fh = ws_fopen(print_args->file, "w");
|
2005-03-11 20:56:31 +00:00
|
|
|
if (fh == NULL)
|
|
|
|
return CF_PRINT_OPEN_ERROR; /* attempt to open destination failed */
|
|
|
|
|
|
|
|
write_csv_preamble(fh);
|
|
|
|
if (ferror(fh)) {
|
|
|
|
fclose(fh);
|
|
|
|
return CF_PRINT_WRITE_ERROR;
|
|
|
|
}
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
callback_args.fh = fh;
|
|
|
|
|
|
|
|
/* only create the protocol tree if having custom columns. */
|
|
|
|
proto_tree_needed = have_custom_cols(&cf->cinfo);
|
|
|
|
epan_dissect_init(&callback_args.edt, cf->epan, proto_tree_needed, proto_tree_needed);
|
|
|
|
|
2005-03-11 20:56:31 +00:00
|
|
|
/* Iterate through the list of packets, printing the packets we were
|
|
|
|
told to print. */
|
|
|
|
ret = process_specified_packets(cf, &print_args->range, "Writing CSV",
|
2005-11-12 11:05:02 +00:00
|
|
|
"selected packets", TRUE,
|
|
|
|
write_csv_packet, fh);
|
2005-03-11 20:56:31 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_cleanup(&callback_args.edt);
|
|
|
|
|
2005-03-11 20:56:31 +00:00
|
|
|
switch (ret) {
|
|
|
|
|
|
|
|
case PSP_FINISHED:
|
|
|
|
/* Completed successfully. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSP_STOPPED:
|
|
|
|
/* Well, the user decided to abort the printing. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSP_FAILED:
|
|
|
|
/* Error while printing. */
|
|
|
|
fclose(fh);
|
|
|
|
return CF_PRINT_WRITE_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
write_csv_finale(fh);
|
|
|
|
if (ferror(fh)) {
|
|
|
|
fclose(fh);
|
|
|
|
return CF_PRINT_WRITE_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX - check for an error */
|
|
|
|
fclose(fh);
|
|
|
|
|
|
|
|
return CF_PRINT_OK;
|
|
|
|
}
|
|
|
|
|
2008-03-11 18:23:16 +00:00
|
|
|
static gboolean
|
2013-10-20 13:22:48 +00:00
|
|
|
write_carrays_packet(capture_file *cf _U_, frame_data *fdata,
|
2012-10-16 21:50:57 +00:00
|
|
|
struct wtap_pkthdr *phdr,
|
2009-09-21 15:50:15 +00:00
|
|
|
const guint8 *pd, void *argsp)
|
2008-03-11 18:23:16 +00:00
|
|
|
{
|
2013-10-20 13:22:48 +00:00
|
|
|
write_packet_callback_args_t *args = (write_packet_callback_args_t *)argsp;
|
2011-12-09 19:44:28 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
epan_dissect_run(&args->edt, phdr, frame_tvbuff_new(fdata, pd), fdata, NULL);
|
|
|
|
proto_tree_write_carrays(fdata->num, args->fh, &args->edt);
|
|
|
|
epan_dissect_reset(&args->edt);
|
2008-03-11 18:23:16 +00:00
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
return !ferror(args->fh);
|
2008-03-11 18:23:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
cf_print_status_t
|
|
|
|
cf_write_carrays_packets(capture_file *cf, print_args_t *print_args)
|
|
|
|
{
|
2013-10-20 13:22:48 +00:00
|
|
|
write_packet_callback_args_t callback_args;
|
2012-08-12 22:21:02 +00:00
|
|
|
FILE *fh;
|
|
|
|
psp_return_t ret;
|
2008-03-11 18:23:16 +00:00
|
|
|
|
2008-05-22 15:46:27 +00:00
|
|
|
fh = ws_fopen(print_args->file, "w");
|
2008-03-11 18:23:16 +00:00
|
|
|
|
|
|
|
if (fh == NULL)
|
|
|
|
return CF_PRINT_OPEN_ERROR; /* attempt to open destination failed */
|
|
|
|
|
|
|
|
write_carrays_preamble(fh);
|
|
|
|
|
|
|
|
if (ferror(fh)) {
|
|
|
|
fclose(fh);
|
|
|
|
return CF_PRINT_WRITE_ERROR;
|
|
|
|
}
|
|
|
|
|
2013-10-20 13:22:48 +00:00
|
|
|
callback_args.fh = fh;
|
|
|
|
epan_dissect_init(&callback_args.edt, cf->epan, TRUE, TRUE);
|
|
|
|
|
2008-03-11 18:23:16 +00:00
|
|
|
/* Iterate through the list of packets, printing the packets we were
|
|
|
|
told to print. */
|
2008-05-22 15:46:27 +00:00
|
|
|
ret = process_specified_packets(cf, &print_args->range,
|
2009-09-21 15:50:15 +00:00
|
|
|
"Writing C Arrays",
|
|
|
|
"selected packets", TRUE,
|
2013-10-20 13:22:48 +00:00
|
|
|
write_carrays_packet, &callback_args);
|
|
|
|
|
|
|
|
epan_dissect_cleanup(&callback_args.edt);
|
|
|
|
|
2008-03-11 18:23:16 +00:00
|
|
|
switch (ret) {
|
|
|
|
case PSP_FINISHED:
|
|
|
|
/* Completed successfully. */
|
|
|
|
break;
|
|
|
|
case PSP_STOPPED:
|
|
|
|
/* Well, the user decided to abort the printing. */
|
|
|
|
break;
|
|
|
|
case PSP_FAILED:
|
|
|
|
/* Error while printing. */
|
|
|
|
fclose(fh);
|
|
|
|
return CF_PRINT_WRITE_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
write_carrays_finale(fh);
|
|
|
|
|
|
|
|
if (ferror(fh)) {
|
|
|
|
fclose(fh);
|
|
|
|
return CF_PRINT_WRITE_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
fclose(fh);
|
|
|
|
return CF_PRINT_OK;
|
|
|
|
}
|
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
gboolean
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
cf_find_packet_protocol_tree(capture_file *cf, const char *string,
|
|
|
|
search_direction dir)
|
2003-08-11 22:41:10 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
match_data mdata;
|
2003-08-11 22:41:10 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
mdata.string = string;
|
|
|
|
mdata.string_len = strlen(string);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return find_packet(cf, match_protocol_tree, &mdata, dir);
|
2003-08-11 22:41:10 +00:00
|
|
|
}
|
|
|
|
|
2011-01-31 12:19:15 +00:00
|
|
|
gboolean
|
|
|
|
cf_find_string_protocol_tree(capture_file *cf, proto_tree *tree, match_data *mdata)
|
|
|
|
{
|
|
|
|
mdata->frame_matched = FALSE;
|
|
|
|
mdata->string = convert_string_case(cf->sfilter, cf->case_type);
|
|
|
|
mdata->string_len = strlen(mdata->string);
|
|
|
|
mdata->cf = cf;
|
|
|
|
/* Iterate through all the nodes looking for matching text */
|
|
|
|
proto_tree_children_foreach(tree, match_subtree_text, mdata);
|
2011-09-21 18:55:03 +00:00
|
|
|
return mdata->frame_matched ? MR_MATCHED : MR_NOTMATCHED;
|
2011-01-31 12:19:15 +00:00
|
|
|
}
|
|
|
|
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
static match_result
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
match_protocol_tree(capture_file *cf, frame_data *fdata, void *criterion)
|
2003-08-11 22:41:10 +00:00
|
|
|
{
|
2013-03-06 17:35:11 +00:00
|
|
|
match_data *mdata = (match_data *)criterion;
|
2012-08-12 22:21:02 +00:00
|
|
|
epan_dissect_t edt;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
/* Load the frame's data. */
|
|
|
|
if (!cf_read_frame(cf, fdata)) {
|
|
|
|
/* Attempt to get the packet failed. */
|
|
|
|
return MR_ERROR;
|
|
|
|
}
|
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
/* Construct the protocol tree, including the displayed text */
|
2013-07-21 18:38:03 +00:00
|
|
|
epan_dissect_init(&edt, cf->epan, TRUE, TRUE);
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
/* We don't need the column information */
|
2013-07-11 05:47:02 +00:00
|
|
|
epan_dissect_run(&edt, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL);
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
|
|
|
|
/* Iterate through all the nodes, seeing if they have text that matches. */
|
|
|
|
mdata->cf = cf;
|
|
|
|
mdata->frame_matched = FALSE;
|
2009-08-13 19:42:46 +00:00
|
|
|
proto_tree_children_foreach(edt.tree, match_subtree_text, mdata);
|
|
|
|
epan_dissect_cleanup(&edt);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return mdata->frame_matched ? MR_MATCHED : MR_NOTMATCHED;
|
2003-08-11 22:41:10 +00:00
|
|
|
}
|
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
static void
|
2003-12-04 10:59:34 +00:00
|
|
|
match_subtree_text(proto_node *node, gpointer data)
|
2003-08-11 22:41:10 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
match_data *mdata = (match_data *) data;
|
|
|
|
const gchar *string = mdata->string;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
size_t string_len = mdata->string_len;
|
2012-08-12 22:21:02 +00:00
|
|
|
capture_file *cf = mdata->cf;
|
|
|
|
field_info *fi = PNODE_FINFO(node);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
gchar label_str[ITEM_LABEL_LENGTH];
|
2012-08-12 22:21:02 +00:00
|
|
|
gchar *label_ptr;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
size_t label_len;
|
|
|
|
guint32 i;
|
|
|
|
guint8 c_char;
|
2012-08-12 22:21:02 +00:00
|
|
|
size_t c_match = 0;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
|
2012-09-05 01:44:09 +00:00
|
|
|
/* dissection with an invisible proto tree? */
|
|
|
|
g_assert(fi);
|
2009-08-21 11:03:30 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
if (mdata->frame_matched) {
|
|
|
|
/* We already had a match; don't bother doing any more work. */
|
|
|
|
return;
|
|
|
|
}
|
2003-08-11 22:41:10 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
/* Don't match invisible entries. */
|
2004-05-01 15:15:08 +00:00
|
|
|
if (PROTO_ITEM_IS_HIDDEN(node))
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
return;
|
2003-08-11 22:41:10 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
/* was a free format label produced? */
|
2003-11-25 14:07:45 +00:00
|
|
|
if (fi->rep) {
|
|
|
|
label_ptr = fi->rep->representation;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
} else {
|
|
|
|
/* no, make a generic label */
|
|
|
|
label_ptr = label_str;
|
|
|
|
proto_item_fill_label(fi, label_str);
|
|
|
|
}
|
2006-04-27 18:46:05 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
/* Does that label match? */
|
|
|
|
label_len = strlen(label_ptr);
|
|
|
|
for (i = 0; i < label_len; i++) {
|
|
|
|
c_char = label_ptr[i];
|
|
|
|
if (cf->case_type)
|
|
|
|
c_char = toupper(c_char);
|
|
|
|
if (c_char == string[c_match]) {
|
|
|
|
c_match++;
|
|
|
|
if (c_match == string_len) {
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
/* No need to look further; we have a match */
|
|
|
|
mdata->frame_matched = TRUE;
|
2011-01-31 12:19:15 +00:00
|
|
|
mdata->finfo = fi;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
|
|
|
} else
|
|
|
|
c_match = 0;
|
|
|
|
}
|
2006-04-27 18:46:05 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
/* Recurse into the subtree, if it exists */
|
2003-12-04 10:59:34 +00:00
|
|
|
if (node->first_child != NULL)
|
|
|
|
proto_tree_children_foreach(node, match_subtree_text, mdata);
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
2003-08-11 22:41:10 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
gboolean
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
cf_find_packet_summary_line(capture_file *cf, const char *string,
|
|
|
|
search_direction dir)
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
match_data mdata;
|
2003-08-11 22:41:10 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
mdata.string = string;
|
|
|
|
mdata.string_len = strlen(string);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return find_packet(cf, match_summary_line, &mdata, dir);
|
2003-08-11 22:41:10 +00:00
|
|
|
}
|
|
|
|
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
static match_result
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
match_summary_line(capture_file *cf, frame_data *fdata, void *criterion)
|
2003-08-11 22:41:10 +00:00
|
|
|
{
|
2013-03-06 17:35:11 +00:00
|
|
|
match_data *mdata = (match_data *)criterion;
|
2012-08-12 22:21:02 +00:00
|
|
|
const gchar *string = mdata->string;
|
|
|
|
size_t string_len = mdata->string_len;
|
|
|
|
epan_dissect_t edt;
|
|
|
|
const char *info_column;
|
|
|
|
size_t info_column_len;
|
|
|
|
match_result result = MR_NOTMATCHED;
|
|
|
|
gint colx;
|
|
|
|
guint32 i;
|
|
|
|
guint8 c_char;
|
|
|
|
size_t c_match = 0;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
|
|
|
|
/* Load the frame's data. */
|
|
|
|
if (!cf_read_frame(cf, fdata)) {
|
|
|
|
/* Attempt to get the packet failed. */
|
|
|
|
return MR_ERROR;
|
|
|
|
}
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
|
|
|
|
/* Don't bother constructing the protocol tree */
|
2013-07-21 18:38:03 +00:00
|
|
|
epan_dissect_init(&edt, cf->epan, FALSE, FALSE);
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
/* Get the column information */
|
2013-07-11 05:47:02 +00:00
|
|
|
epan_dissect_run(&edt, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata,
|
2013-06-16 00:20:00 +00:00
|
|
|
&cf->cinfo);
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
|
|
|
|
/* Find the Info column */
|
|
|
|
for (colx = 0; colx < cf->cinfo.num_cols; colx++) {
|
|
|
|
if (cf->cinfo.fmt_matx[colx][COL_INFO]) {
|
|
|
|
/* Found it. See if we match. */
|
2009-08-13 19:42:46 +00:00
|
|
|
info_column = edt.pi.cinfo->col_data[colx];
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
info_column_len = strlen(info_column);
|
|
|
|
for (i = 0; i < info_column_len; i++) {
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
c_char = info_column[i];
|
|
|
|
if (cf->case_type)
|
|
|
|
c_char = toupper(c_char);
|
|
|
|
if (c_char == string[c_match]) {
|
|
|
|
c_match++;
|
|
|
|
if (c_match == string_len) {
|
|
|
|
result = MR_MATCHED;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
c_match = 0;
|
2003-08-11 22:41:10 +00:00
|
|
|
}
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2009-08-13 19:42:46 +00:00
|
|
|
epan_dissect_cleanup(&edt);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return result;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
2003-08-11 22:41:10 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
typedef struct {
|
2009-09-21 15:50:15 +00:00
|
|
|
const guint8 *data;
|
2012-08-12 22:21:02 +00:00
|
|
|
size_t data_len;
|
2009-09-21 15:50:15 +00:00
|
|
|
} cbs_t; /* "Counted byte string" */
|
2003-08-11 22:41:10 +00:00
|
|
|
|
2012-12-15 01:04:39 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The current match_* routines only support ASCII case insensitivity and don't
|
|
|
|
* convert UTF-8 inputs to UTF-16 for matching.
|
|
|
|
*
|
|
|
|
* We could modify them to use the GLib Unicode routines or the International
|
|
|
|
* Components for Unicode library but it's not apparent that we could do so
|
|
|
|
* without consuming a lot more CPU and memory or that searching would be
|
|
|
|
* significantly better.
|
|
|
|
*/
|
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
gboolean
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
cf_find_packet_data(capture_file *cf, const guint8 *string, size_t string_size,
|
|
|
|
search_direction dir)
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
{
|
|
|
|
cbs_t info;
|
2003-08-11 22:41:10 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
info.data = string;
|
|
|
|
info.data_len = string_size;
|
2003-08-11 22:41:10 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
/* String or hex search? */
|
2004-04-15 23:28:11 +00:00
|
|
|
if (cf->string) {
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
/* String search - what type of string? */
|
|
|
|
switch (cf->scs_type) {
|
2003-08-11 22:41:10 +00:00
|
|
|
|
2012-12-15 01:04:39 +00:00
|
|
|
case SCS_NARROW_AND_WIDE:
|
|
|
|
return find_packet(cf, match_narrow_and_wide, &info, dir);
|
2003-08-11 22:41:10 +00:00
|
|
|
|
2012-12-15 01:04:39 +00:00
|
|
|
case SCS_NARROW:
|
|
|
|
return find_packet(cf, match_narrow, &info, dir);
|
2003-08-11 22:41:10 +00:00
|
|
|
|
2012-12-15 01:04:39 +00:00
|
|
|
case SCS_WIDE:
|
|
|
|
return find_packet(cf, match_wide, &info, dir);
|
2003-08-11 22:41:10 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
default:
|
|
|
|
g_assert_not_reached();
|
|
|
|
return FALSE;
|
2003-08-11 22:41:10 +00:00
|
|
|
}
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
} else
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return find_packet(cf, match_binary, &info, dir);
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
2003-08-11 22:41:10 +00:00
|
|
|
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
static match_result
|
2012-12-15 01:04:39 +00:00
|
|
|
match_narrow_and_wide(capture_file *cf, frame_data *fdata, void *criterion)
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
{
|
2013-03-06 17:35:11 +00:00
|
|
|
cbs_t *info = (cbs_t *)criterion;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
const guint8 *ascii_text = info->data;
|
2012-08-12 22:21:02 +00:00
|
|
|
size_t textlen = info->data_len;
|
|
|
|
match_result result;
|
|
|
|
guint32 buf_len;
|
2013-06-16 00:20:00 +00:00
|
|
|
guint8 *pd;
|
2012-08-12 22:21:02 +00:00
|
|
|
guint32 i;
|
|
|
|
guint8 c_char;
|
|
|
|
size_t c_match = 0;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
|
|
|
|
/* Load the frame's data. */
|
|
|
|
if (!cf_read_frame(cf, fdata)) {
|
|
|
|
/* Attempt to get the packet failed. */
|
|
|
|
return MR_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
result = MR_NOTMATCHED;
|
2012-10-17 21:14:14 +00:00
|
|
|
buf_len = fdata->cap_len;
|
2013-06-16 00:20:00 +00:00
|
|
|
pd = buffer_start_ptr(&cf->buf);
|
2012-01-13 21:09:33 +00:00
|
|
|
i = 0;
|
|
|
|
while (i < buf_len) {
|
2013-06-16 00:20:00 +00:00
|
|
|
c_char = pd[i];
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
if (cf->case_type)
|
|
|
|
c_char = toupper(c_char);
|
2012-01-13 21:09:33 +00:00
|
|
|
if (c_char != '\0') {
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
if (c_char == ascii_text[c_match]) {
|
2012-01-13 21:09:33 +00:00
|
|
|
c_match += 1;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
if (c_match == textlen) {
|
|
|
|
result = MR_MATCHED;
|
|
|
|
cf->search_pos = i; /* Save the position of the last character
|
|
|
|
for highlighting the field. */
|
|
|
|
break;
|
|
|
|
}
|
2012-01-13 21:09:33 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
g_assert(i>=c_match);
|
2012-01-13 22:27:59 +00:00
|
|
|
i -= (guint32)c_match;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
c_match = 0;
|
2012-01-13 21:09:33 +00:00
|
|
|
}
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
2012-01-13 21:09:33 +00:00
|
|
|
i += 1;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return result;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
2003-08-11 22:41:10 +00:00
|
|
|
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
static match_result
|
2012-12-15 01:04:39 +00:00
|
|
|
match_narrow(capture_file *cf, frame_data *fdata, void *criterion)
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
{
|
2013-06-16 00:20:00 +00:00
|
|
|
guint8 *pd;
|
2013-03-06 17:35:11 +00:00
|
|
|
cbs_t *info = (cbs_t *)criterion;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
const guint8 *ascii_text = info->data;
|
2012-08-12 22:21:02 +00:00
|
|
|
size_t textlen = info->data_len;
|
|
|
|
match_result result;
|
|
|
|
guint32 buf_len;
|
|
|
|
guint32 i;
|
|
|
|
guint8 c_char;
|
|
|
|
size_t c_match = 0;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
|
|
|
|
/* Load the frame's data. */
|
|
|
|
if (!cf_read_frame(cf, fdata)) {
|
|
|
|
/* Attempt to get the packet failed. */
|
|
|
|
return MR_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
result = MR_NOTMATCHED;
|
2012-10-17 21:14:14 +00:00
|
|
|
buf_len = fdata->cap_len;
|
2013-06-16 00:20:00 +00:00
|
|
|
pd = buffer_start_ptr(&cf->buf);
|
2012-01-13 21:09:33 +00:00
|
|
|
i = 0;
|
|
|
|
while (i < buf_len) {
|
2013-06-16 00:20:00 +00:00
|
|
|
c_char = pd[i];
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
if (cf->case_type)
|
|
|
|
c_char = toupper(c_char);
|
|
|
|
if (c_char == ascii_text[c_match]) {
|
2012-01-13 21:09:33 +00:00
|
|
|
c_match += 1;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
if (c_match == textlen) {
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
result = MR_MATCHED;
|
|
|
|
cf->search_pos = i; /* Save the position of the last character
|
|
|
|
for highlighting the field. */
|
|
|
|
break;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
2012-01-13 21:09:33 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
g_assert(i>=c_match);
|
2012-01-13 22:27:59 +00:00
|
|
|
i -= (guint32)c_match;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
c_match = 0;
|
2012-01-13 21:09:33 +00:00
|
|
|
}
|
|
|
|
i += 1;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
2012-01-13 21:09:33 +00:00
|
|
|
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return result;
|
2003-08-11 22:41:10 +00:00
|
|
|
}
|
|
|
|
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
static match_result
|
2012-12-15 01:04:39 +00:00
|
|
|
match_wide(capture_file *cf, frame_data *fdata, void *criterion)
|
2003-07-22 23:08:48 +00:00
|
|
|
{
|
2013-03-06 17:35:11 +00:00
|
|
|
cbs_t *info = (cbs_t *)criterion;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
const guint8 *ascii_text = info->data;
|
2012-08-12 22:21:02 +00:00
|
|
|
size_t textlen = info->data_len;
|
|
|
|
match_result result;
|
|
|
|
guint32 buf_len;
|
2013-06-16 00:20:00 +00:00
|
|
|
guint8 *pd;
|
2012-08-12 22:21:02 +00:00
|
|
|
guint32 i;
|
|
|
|
guint8 c_char;
|
|
|
|
size_t c_match = 0;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
|
|
|
|
/* Load the frame's data. */
|
|
|
|
if (!cf_read_frame(cf, fdata)) {
|
|
|
|
/* Attempt to get the packet failed. */
|
|
|
|
return MR_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
result = MR_NOTMATCHED;
|
2012-10-17 21:14:14 +00:00
|
|
|
buf_len = fdata->cap_len;
|
2013-06-16 00:20:00 +00:00
|
|
|
pd = buffer_start_ptr(&cf->buf);
|
2012-01-13 21:09:33 +00:00
|
|
|
i = 0;
|
|
|
|
while (i < buf_len) {
|
2013-06-16 00:20:00 +00:00
|
|
|
c_char = pd[i];
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
if (cf->case_type)
|
|
|
|
c_char = toupper(c_char);
|
|
|
|
if (c_char == ascii_text[c_match]) {
|
2012-01-13 21:09:33 +00:00
|
|
|
c_match += 1;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
if (c_match == textlen) {
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
result = MR_MATCHED;
|
|
|
|
cf->search_pos = i; /* Save the position of the last character
|
|
|
|
for highlighting the field. */
|
|
|
|
break;
|
2003-08-05 00:01:27 +00:00
|
|
|
}
|
2012-01-13 21:09:33 +00:00
|
|
|
i += 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
g_assert(i>=(c_match*2));
|
2012-01-13 22:27:59 +00:00
|
|
|
i -= (guint32)c_match*2;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
c_match = 0;
|
2012-01-13 21:09:33 +00:00
|
|
|
}
|
|
|
|
i += 1;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return result;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
2003-08-05 00:01:27 +00:00
|
|
|
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
static match_result
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
match_binary(capture_file *cf, frame_data *fdata, void *criterion)
|
|
|
|
{
|
2013-03-06 17:35:11 +00:00
|
|
|
cbs_t *info = (cbs_t *)criterion;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
const guint8 *binary_data = info->data;
|
2012-08-12 22:21:02 +00:00
|
|
|
size_t datalen = info->data_len;
|
|
|
|
match_result result;
|
|
|
|
guint32 buf_len;
|
2013-06-16 00:20:00 +00:00
|
|
|
guint8 *pd;
|
2012-08-12 22:21:02 +00:00
|
|
|
guint32 i;
|
|
|
|
size_t c_match = 0;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
|
|
|
|
/* Load the frame's data. */
|
|
|
|
if (!cf_read_frame(cf, fdata)) {
|
|
|
|
/* Attempt to get the packet failed. */
|
|
|
|
return MR_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
result = MR_NOTMATCHED;
|
2012-10-17 21:14:14 +00:00
|
|
|
buf_len = fdata->cap_len;
|
2013-06-16 00:20:00 +00:00
|
|
|
pd = buffer_start_ptr(&cf->buf);
|
2012-01-13 21:09:33 +00:00
|
|
|
i = 0;
|
|
|
|
while (i < buf_len) {
|
2013-06-16 00:20:00 +00:00
|
|
|
if (pd[i] == binary_data[c_match]) {
|
2012-01-13 21:09:33 +00:00
|
|
|
c_match += 1;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
if (c_match == datalen) {
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
result = MR_MATCHED;
|
|
|
|
cf->search_pos = i; /* Save the position of the last character
|
|
|
|
for highlighting the field. */
|
|
|
|
break;
|
2003-07-22 23:08:48 +00:00
|
|
|
}
|
2012-01-13 21:09:33 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
g_assert(i>=c_match);
|
2012-01-13 22:27:59 +00:00
|
|
|
i -= (guint32)c_match;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
c_match = 0;
|
2012-01-13 21:09:33 +00:00
|
|
|
}
|
|
|
|
i += 1;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return result;
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
2003-07-22 23:08:48 +00:00
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
gboolean
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
cf_find_packet_dfilter(capture_file *cf, dfilter_t *sfcode,
|
|
|
|
search_direction dir)
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
{
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return find_packet(cf, match_dfilter, sfcode, dir);
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
}
|
2003-07-22 23:08:48 +00:00
|
|
|
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
gboolean
|
|
|
|
cf_find_packet_dfilter_string(capture_file *cf, const char *filter,
|
|
|
|
search_direction dir)
|
|
|
|
{
|
|
|
|
dfilter_t *sfcode;
|
2012-08-12 22:21:02 +00:00
|
|
|
gboolean result;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
|
|
|
|
if (!dfilter_compile(filter, &sfcode)) {
|
|
|
|
/*
|
|
|
|
* XXX - this shouldn't happen, as the filter string is machine
|
|
|
|
* generated
|
|
|
|
*/
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
if (sfcode == NULL) {
|
|
|
|
/*
|
|
|
|
* XXX - this shouldn't happen, as the filter string is machine
|
|
|
|
* generated.
|
|
|
|
*/
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
result = find_packet(cf, match_dfilter, sfcode, dir);
|
|
|
|
dfilter_free(sfcode);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static match_result
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
match_dfilter(capture_file *cf, frame_data *fdata, void *criterion)
|
|
|
|
{
|
2013-03-06 17:35:11 +00:00
|
|
|
dfilter_t *sfcode = (dfilter_t *)criterion;
|
2012-08-12 22:21:02 +00:00
|
|
|
epan_dissect_t edt;
|
|
|
|
match_result result;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
|
|
|
|
/* Load the frame's data. */
|
|
|
|
if (!cf_read_frame(cf, fdata)) {
|
|
|
|
/* Attempt to get the packet failed. */
|
|
|
|
return MR_ERROR;
|
|
|
|
}
|
2003-07-22 23:08:48 +00:00
|
|
|
|
2013-07-21 18:38:03 +00:00
|
|
|
epan_dissect_init(&edt, cf->epan, TRUE, FALSE);
|
2009-08-13 19:42:46 +00:00
|
|
|
epan_dissect_prime_dfilter(&edt, sfcode);
|
2013-07-11 05:47:02 +00:00
|
|
|
epan_dissect_run(&edt, &cf->phdr, frame_tvbuff_new_buffer(fdata, &cf->buf), fdata, NULL);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
result = dfilter_apply_edt(sfcode, &edt) ? MR_MATCHED : MR_NOTMATCHED;
|
2009-08-13 19:42:46 +00:00
|
|
|
epan_dissect_cleanup(&edt);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
cf_find_packet_marked(capture_file *cf, search_direction dir)
|
|
|
|
{
|
|
|
|
return find_packet(cf, match_marked, NULL, dir);
|
|
|
|
}
|
|
|
|
|
|
|
|
static match_result
|
|
|
|
match_marked(capture_file *cf _U_, frame_data *fdata, void *criterion _U_)
|
|
|
|
{
|
|
|
|
return fdata->flags.marked ? MR_MATCHED : MR_NOTMATCHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
cf_find_packet_time_reference(capture_file *cf, search_direction dir)
|
|
|
|
{
|
|
|
|
return find_packet(cf, match_time_reference, NULL, dir);
|
|
|
|
}
|
|
|
|
|
|
|
|
static match_result
|
|
|
|
match_time_reference(capture_file *cf _U_, frame_data *fdata, void *criterion _U_)
|
|
|
|
{
|
|
|
|
return fdata->flags.ref_time ? MR_MATCHED : MR_NOTMATCHED;
|
2003-07-22 23:08:48 +00:00
|
|
|
}
|
|
|
|
|
Get rid of the EBCDIC stuff in the find dialog - it's not supported yet,
so we shouldn't torment the users by offering it.
Check the string type and convert it to an internal representation in
the GUI code; have the search code deal only with the internal
representation.
Save the case-sensitivity flag, and the indication of where string
searches look, along with other search parameters.
Upper-casify the string, for case-insensitive searches, in the GUI code;
don't save the upper-casified string, so it doesn't SHOUT at you when
you next pop up a "find" dialog.
Convert the hex value string to raw binary data in the GUI code, rather
than doing so in the search code. Check that it's a valid string.
Connect the signals to the radio buttons after the pointers have been
attached to various GUI items - the signal handlers expect some of those
pointers to be attached, and aren't happy if they're not.
Have "find_packet()" contain a framework for searching, but not contain
the matching code; instead, pass it a pointer to a matching routine and
an opaque pointer to be passed to the matching routine. Have all the
routines that do different types of searching have their own matching
routines, and use the common "find_packet()" code, rather than
duplicating that code.
Search for the Info column by column type, not by name (the user can
change the name).
When matching on the protocol tree, don't format the entire protocol
tree into a big buffer - just have a routine that matches the text
representation of a protocol tree item against a string, and, if it
finds a match, sets a "we found a match flag" and returns; have that
routine not bother doing any more work if that flag is set.
(Unfortunately, you can't abort "g_node_children_foreach()" in the
middle of a traversal.)
Free the generated display filter code after a find-by-display-filter
finishes.
svn path=/trunk/; revision=8306
2003-08-29 04:03:46 +00:00
|
|
|
static gboolean
|
|
|
|
find_packet(capture_file *cf,
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
match_result (*match_function)(capture_file *, frame_data *, void *),
|
|
|
|
void *criterion, search_direction dir)
|
1999-11-06 06:28:07 +00:00
|
|
|
{
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
frame_data *start_fd;
|
2011-04-25 05:33:07 +00:00
|
|
|
guint32 framenum;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
frame_data *fdata;
|
|
|
|
frame_data *new_fd = NULL;
|
|
|
|
progdlg_t *progbar = NULL;
|
|
|
|
gboolean stop_flag;
|
|
|
|
int count;
|
2011-04-24 21:02:55 +00:00
|
|
|
gboolean found;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
float progbar_val;
|
|
|
|
GTimeVal start_time;
|
|
|
|
gchar status_str[100];
|
|
|
|
int progbar_nextstep;
|
|
|
|
int progbar_quantum;
|
|
|
|
const char *title;
|
|
|
|
match_result result;
|
1999-11-06 06:28:07 +00:00
|
|
|
|
|
|
|
start_fd = cf->current_frame;
|
|
|
|
if (start_fd != NULL) {
|
|
|
|
/* Iterate through the list of packets, starting at the packet we've
|
|
|
|
picked, calling a routine to run the filter on the packet, see if
|
|
|
|
it matches, and stop if so. */
|
|
|
|
count = 0;
|
2011-04-25 05:33:07 +00:00
|
|
|
framenum = start_fd->num;
|
1999-11-06 06:28:07 +00:00
|
|
|
|
2005-10-27 20:18:50 +00:00
|
|
|
/* Update the progress bar when it gets to this value. */
|
2004-01-09 21:38:21 +00:00
|
|
|
progbar_nextstep = 0;
|
1999-11-06 06:28:07 +00:00
|
|
|
/* When we reach the value that triggers a progress bar update,
|
2000-01-08 23:49:33 +00:00
|
|
|
bump that value by this amount. */
|
2004-01-09 21:38:21 +00:00
|
|
|
progbar_quantum = cf->count/N_PROGBAR_UPDATES;
|
2005-10-27 20:18:50 +00:00
|
|
|
/* Progress so far. */
|
2009-04-21 16:57:52 +00:00
|
|
|
progbar_val = 0.0f;
|
2000-07-03 08:36:52 +00:00
|
|
|
|
|
|
|
stop_flag = FALSE;
|
2002-07-30 10:13:16 +00:00
|
|
|
g_get_current_time(&start_time);
|
1999-11-06 06:28:07 +00:00
|
|
|
|
2006-02-27 09:01:10 +00:00
|
|
|
title = cf->sfilter?cf->sfilter:"";
|
1999-11-06 06:28:07 +00:00
|
|
|
for (;;) {
|
2005-10-27 06:45:37 +00:00
|
|
|
/* Create the progress bar if necessary.
|
|
|
|
We check on every iteration of the loop, so that it takes no
|
|
|
|
longer than the standard time to create it (otherwise, for a
|
|
|
|
large file, we might take considerably longer than that standard
|
|
|
|
time in order to get to the next progress bar step). */
|
|
|
|
if (progbar == NULL)
|
2012-07-19 21:49:52 +00:00
|
|
|
progbar = delayed_create_progress_dlg(cf->window, "Searching", title,
|
2005-11-12 11:05:02 +00:00
|
|
|
FALSE, &stop_flag, &start_time, progbar_val);
|
2005-10-27 06:45:37 +00:00
|
|
|
|
1999-11-06 06:28:07 +00:00
|
|
|
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
|
|
|
|
when we update it, we have to run the GTK+ main loop to get it
|
|
|
|
to repaint what's pending, and doing so may involve an "ioctl()"
|
|
|
|
to see if there's any pending input from an X server, and doing
|
|
|
|
that for every packet can be costly, especially on a big file. */
|
2004-01-09 21:38:21 +00:00
|
|
|
if (count >= progbar_nextstep) {
|
1999-11-06 06:28:07 +00:00
|
|
|
/* let's not divide by zero. I should never be started
|
|
|
|
* with count == 0, so let's assert that
|
|
|
|
*/
|
|
|
|
g_assert(cf->count > 0);
|
|
|
|
|
2005-10-27 20:18:50 +00:00
|
|
|
progbar_val = (gfloat) count / cf->count;
|
2002-07-30 10:13:16 +00:00
|
|
|
|
2002-08-28 10:07:37 +00:00
|
|
|
if (progbar != NULL) {
|
|
|
|
g_snprintf(status_str, sizeof(status_str),
|
2004-01-09 02:57:54 +00:00
|
|
|
"%4u of %u packets", count, cf->count);
|
2005-10-27 20:18:50 +00:00
|
|
|
update_progress_dlg(progbar, progbar_val, status_str);
|
2002-08-28 10:07:37 +00:00
|
|
|
}
|
1999-11-06 06:28:07 +00:00
|
|
|
|
2004-01-09 21:38:21 +00:00
|
|
|
progbar_nextstep += progbar_quantum;
|
2000-07-03 08:36:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (stop_flag) {
|
|
|
|
/* Well, the user decided to abort the search. Go back to the
|
|
|
|
frame where we started. */
|
|
|
|
new_fd = start_fd;
|
|
|
|
break;
|
1999-11-06 06:28:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Go past the current frame. */
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
if (dir == SD_BACKWARD) {
|
1999-11-06 06:28:07 +00:00
|
|
|
/* Go on to the previous frame. */
|
2011-04-25 05:33:07 +00:00
|
|
|
if (framenum == 1) {
|
2004-02-22 22:22:47 +00:00
|
|
|
/*
|
|
|
|
* XXX - other apps have a bit more of a detailed message
|
|
|
|
* for this, and instead of offering "OK" and "Cancel",
|
|
|
|
* they offer things such as "Continue" and "Cancel";
|
|
|
|
* we need an API for popping up alert boxes with
|
|
|
|
* {Verb} and "Cancel".
|
|
|
|
*/
|
2004-08-15 19:26:25 +00:00
|
|
|
|
|
|
|
if (prefs.gui_find_wrap)
|
|
|
|
{
|
2010-11-27 21:50:49 +00:00
|
|
|
statusbar_push_temporary_msg("Search reached the beginning. Continuing at end.");
|
2011-04-25 05:33:07 +00:00
|
|
|
framenum = cf->count; /* wrap around */
|
2004-08-15 19:26:25 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-11-27 21:50:49 +00:00
|
|
|
statusbar_push_temporary_msg("Search reached the beginning.");
|
2011-04-25 05:33:07 +00:00
|
|
|
framenum = start_fd->num; /* stay on previous packet */
|
2004-08-15 19:26:25 +00:00
|
|
|
}
|
2011-04-25 05:33:07 +00:00
|
|
|
} else
|
|
|
|
framenum--;
|
1999-11-06 06:28:07 +00:00
|
|
|
} else {
|
|
|
|
/* Go on to the next frame. */
|
2011-04-25 05:33:07 +00:00
|
|
|
if (framenum == cf->count) {
|
2004-08-15 19:26:25 +00:00
|
|
|
if (prefs.gui_find_wrap)
|
|
|
|
{
|
2010-11-27 21:50:49 +00:00
|
|
|
statusbar_push_temporary_msg("Search reached the end. Continuing at beginning.");
|
2011-04-25 05:33:07 +00:00
|
|
|
framenum = 1; /* wrap around */
|
2004-08-15 19:26:25 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-11-27 21:50:49 +00:00
|
|
|
statusbar_push_temporary_msg("Search reached the end.");
|
2011-04-25 05:33:07 +00:00
|
|
|
framenum = start_fd->num; /* stay on previous packet */
|
2004-08-15 19:26:25 +00:00
|
|
|
}
|
2011-04-25 05:33:07 +00:00
|
|
|
} else
|
|
|
|
framenum++;
|
1999-11-06 06:28:07 +00:00
|
|
|
}
|
2011-04-27 02:54:44 +00:00
|
|
|
fdata = frame_data_sequence_find(cf->frames, framenum);
|
1999-11-06 06:28:07 +00:00
|
|
|
|
2000-01-08 23:49:33 +00:00
|
|
|
count++;
|
|
|
|
|
1999-11-06 06:28:07 +00:00
|
|
|
/* Is this packet in the display? */
|
2000-05-12 22:03:59 +00:00
|
|
|
if (fdata->flags.passed_dfilter) {
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
/* Yes. Does it match the search criterion? */
|
|
|
|
result = (*match_function)(cf, fdata, criterion);
|
|
|
|
if (result == MR_ERROR) {
|
|
|
|
/* Error; our caller has reported the error. Go back to the frame
|
2003-09-03 23:40:06 +00:00
|
|
|
where we started. */
|
|
|
|
new_fd = start_fd;
|
2003-09-03 23:15:40 +00:00
|
|
|
break;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
} else if (result == MR_MATCHED) {
|
|
|
|
/* Yes. Go to the new frame. */
|
2000-05-12 22:03:59 +00:00
|
|
|
new_fd = fdata;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
break;
|
1999-11-06 06:28:07 +00:00
|
|
|
}
|
|
|
|
}
|
2000-04-07 08:00:34 +00:00
|
|
|
|
2000-05-12 22:03:59 +00:00
|
|
|
if (fdata == start_fd) {
|
2000-04-07 08:00:34 +00:00
|
|
|
/* We're back to the frame we were on originally, and that frame
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
doesn't match the search filter. The search failed. */
|
2000-04-07 08:00:34 +00:00
|
|
|
break;
|
|
|
|
}
|
1999-11-06 06:28:07 +00:00
|
|
|
}
|
|
|
|
|
2002-07-30 10:13:16 +00:00
|
|
|
/* We're done scanning the packets; destroy the progress bar if it
|
|
|
|
was created. */
|
2002-05-03 21:55:15 +00:00
|
|
|
if (progbar != NULL)
|
|
|
|
destroy_progress_dlg(progbar);
|
1999-11-06 06:28:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (new_fd != NULL) {
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
/* Find and select */
|
2011-01-19 18:21:21 +00:00
|
|
|
cf->search_in_progress = TRUE;
|
2012-09-04 02:35:25 +00:00
|
|
|
found = packet_list_select_row_from_data(new_fd);
|
2011-01-19 18:21:21 +00:00
|
|
|
cf->search_in_progress = FALSE;
|
|
|
|
cf->search_pos = 0; /* Reset the position */
|
2011-04-24 21:02:55 +00:00
|
|
|
if (!found) {
|
|
|
|
/* We didn't find a row corresponding to this frame.
|
|
|
|
This means that the frame isn't being displayed currently,
|
|
|
|
so we can't select it. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_message_box(ESD_TYPE_INFO, NULL,
|
|
|
|
"The capture file is probably not fully dissected.",
|
|
|
|
"End of capture exceeded!");
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
return FALSE;
|
2009-06-01 15:26:15 +00:00
|
|
|
}
|
2009-09-21 15:50:15 +00:00
|
|
|
return TRUE; /* success */
|
1999-11-06 06:54:24 +00:00
|
|
|
} else
|
2009-09-21 15:50:15 +00:00
|
|
|
return FALSE; /* failure */
|
1999-11-06 06:28:07 +00:00
|
|
|
}
|
1999-08-15 07:28:23 +00:00
|
|
|
|
2003-03-02 22:07:25 +00:00
|
|
|
gboolean
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_goto_frame(capture_file *cf, guint fnumber)
|
1999-11-08 01:03:40 +00:00
|
|
|
{
|
2000-05-12 22:03:59 +00:00
|
|
|
frame_data *fdata;
|
1999-11-08 01:03:40 +00:00
|
|
|
|
2011-04-27 02:54:44 +00:00
|
|
|
fdata = frame_data_sequence_find(cf->frames, fnumber);
|
1999-11-08 01:03:40 +00:00
|
|
|
|
2003-03-02 22:07:25 +00:00
|
|
|
if (fdata == NULL) {
|
2004-01-09 02:57:54 +00:00
|
|
|
/* we didn't find a packet with that packet number */
|
2010-11-27 21:50:49 +00:00
|
|
|
statusbar_push_temporary_msg("There is no packet number %u.", fnumber);
|
2009-09-21 15:50:15 +00:00
|
|
|
return FALSE; /* we failed to go to that packet */
|
2003-03-02 22:07:25 +00:00
|
|
|
}
|
|
|
|
if (!fdata->flags.passed_dfilter) {
|
2004-01-09 02:57:54 +00:00
|
|
|
/* that packet currently isn't displayed */
|
|
|
|
/* XXX - add it to the set of displayed packets? */
|
2010-11-27 21:50:49 +00:00
|
|
|
statusbar_push_temporary_msg("Packet number %u isn't displayed.", fnumber);
|
2009-09-21 15:50:15 +00:00
|
|
|
return FALSE; /* we failed to go to that packet */
|
2003-03-02 22:07:25 +00:00
|
|
|
}
|
1999-11-30 07:27:37 +00:00
|
|
|
|
2012-09-04 02:35:25 +00:00
|
|
|
if (!packet_list_select_row_from_data(fdata)) {
|
2011-04-24 21:02:55 +00:00
|
|
|
/* We didn't find a row corresponding to this frame.
|
|
|
|
This means that the frame isn't being displayed currently,
|
|
|
|
so we can't select it. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_message_box(ESD_TYPE_INFO, NULL,
|
|
|
|
"The capture file is probably not fully dissected.",
|
|
|
|
"End of capture exceeded!");
|
2011-04-24 21:02:55 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
2009-09-21 15:50:15 +00:00
|
|
|
return TRUE; /* we got to that packet */
|
2004-01-20 18:47:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
2011-05-17 22:18:32 +00:00
|
|
|
cf_goto_top_frame(void)
|
2004-01-20 18:47:25 +00:00
|
|
|
{
|
2009-07-25 07:50:53 +00:00
|
|
|
/* Find and select */
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_select_first_row();
|
2009-09-21 15:50:15 +00:00
|
|
|
return TRUE; /* we got to that packet */
|
2004-01-20 18:47:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
2011-05-17 22:18:32 +00:00
|
|
|
cf_goto_bottom_frame(void)
|
2004-01-20 18:47:25 +00:00
|
|
|
{
|
2009-07-25 07:50:53 +00:00
|
|
|
/* Find and select */
|
2012-09-04 02:35:25 +00:00
|
|
|
packet_list_select_last_row();
|
2009-09-21 15:50:15 +00:00
|
|
|
return TRUE; /* we got to that packet */
|
1999-11-08 01:03:40 +00:00
|
|
|
}
|
|
|
|
|
2004-09-02 19:52:39 +00:00
|
|
|
/*
|
|
|
|
* Go to frame specified by currently selected protocol tree item.
|
|
|
|
*/
|
2005-02-04 18:44:44 +00:00
|
|
|
gboolean
|
|
|
|
cf_goto_framenum(capture_file *cf)
|
2004-09-02 19:52:39 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
header_field_info *hfinfo;
|
|
|
|
guint32 framenum;
|
2004-09-02 19:52:39 +00:00
|
|
|
|
|
|
|
if (cf->finfo_selected) {
|
|
|
|
hfinfo = cf->finfo_selected->hfinfo;
|
|
|
|
g_assert(hfinfo);
|
|
|
|
if (hfinfo->type == FT_FRAMENUM) {
|
2007-01-18 11:02:26 +00:00
|
|
|
framenum = fvalue_get_uinteger(&cf->finfo_selected->value);
|
2004-09-02 19:52:39 +00:00
|
|
|
if (framenum != 0)
|
2005-02-04 18:44:44 +00:00
|
|
|
return cf_goto_frame(cf, framenum);
|
2004-09-02 19:52:39 +00:00
|
|
|
}
|
|
|
|
}
|
2005-02-04 18:44:44 +00:00
|
|
|
|
|
|
|
return FALSE;
|
2004-09-02 19:52:39 +00:00
|
|
|
}
|
|
|
|
|
1999-07-24 03:22:50 +00:00
|
|
|
/* Select the packet on a given row. */
|
|
|
|
void
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_select_packet(capture_file *cf, int row)
|
1999-07-24 03:22:50 +00:00
|
|
|
{
|
2012-06-10 22:03:17 +00:00
|
|
|
epan_dissect_t *old_edt;
|
2012-08-12 22:21:02 +00:00
|
|
|
frame_data *fdata;
|
2000-01-03 22:53:34 +00:00
|
|
|
|
We already set the foreground and background color for every frame,
which means we're already doing a "do something to the last row in the
packet list" operation on every frame we add to the list, so adding a
call to "gtk_clist_set_row_data()" won't make matters worse.
In addition, we already set one column in a row on a "change time
format" operation, so finding the row for a frame by calling
"gtk_clist_find_row_from_data()" doesn't turn a constant-time operation
into a linear-time operation, it just cranks the proportionality
constant up - it was quadratic before, alas, and it's still quadratic.
Adding calls to "gtk_clist_find_row_from_data()" to the "Find Frame" and
"Go To Frame" code does add an extra linear operation there, but those
operations shouldn't be common - and "Go To Frame", going to the last
frame on an ~100,000-frame big capture file, was quick, at least on my
450 MHz Pentium II machine, so maybe it won't be too bad.
And "select_packet()" either has to search the frame table for the frame
with the specified row number, or has to call "gtk_clist_get_row_data()"
to do that - the first is linear in the position of the frame in the
frame table, and the latter is linear in its position in the CList, and
the latter is less than or equal to the former, so the only thing making
it worse would be a change in the proportionality constant.
So it probably won't hurt performance by much.
Furthermore, if we add the ability to sort the display on an arbitrary
column, or to delete frames from the display - both of which are in the
wish list - storing the row number of the frame in the "frame_data"
structure won't necessarily work, as the row number can change out from
under us.
Therefore, reinstate the old way of doing things, where we associate
with each row a pointer to the "frame_data" structure for the row, using
"gtk_clist_set_row_data()".
svn path=/trunk/; revision=1703
2000-03-08 06:48:01 +00:00
|
|
|
/* Get the frame data struct pointer for this frame */
|
2012-09-04 02:35:25 +00:00
|
|
|
fdata = packet_list_get_row_data(row);
|
1999-10-05 04:34:00 +00:00
|
|
|
|
2000-05-12 22:03:59 +00:00
|
|
|
if (fdata == NULL) {
|
2000-03-12 03:13:58 +00:00
|
|
|
/* XXX - if a GtkCList's selection mode is GTK_SELECTION_BROWSE, when
|
|
|
|
the first entry is added to it by "real_insert_row()", that row
|
2012-01-15 21:59:11 +00:00
|
|
|
is selected (see "real_insert_row()", in "ui/gtk/gtkclist.c", in both
|
2000-03-12 03:13:58 +00:00
|
|
|
our version and the vanilla GTK+ version).
|
|
|
|
|
|
|
|
This means that a "select-row" signal is emitted; this causes
|
2005-02-04 18:44:44 +00:00
|
|
|
"packet_list_select_cb()" to be called, which causes "cf_select_packet()"
|
2000-03-12 03:13:58 +00:00
|
|
|
to be called.
|
|
|
|
|
2005-02-04 18:44:44 +00:00
|
|
|
"cf_select_packet()" fetches, above, the data associated with the
|
2000-03-12 03:13:58 +00:00
|
|
|
row that was selected; however, as "gtk_clist_append()", which
|
|
|
|
called "real_insert_row()", hasn't yet returned, we haven't yet
|
|
|
|
associated any data with that row, so we get back a null pointer.
|
|
|
|
|
|
|
|
We can't assume that there's only one frame in the frame list,
|
|
|
|
either, as we may be filtering the display.
|
|
|
|
|
|
|
|
We therefore assume that, if "row" is 0, i.e. the first row
|
|
|
|
is being selected, and "cf->first_displayed" equals
|
|
|
|
"cf->last_displayed", i.e. there's only one frame being
|
|
|
|
displayed, that frame is the frame we want.
|
|
|
|
|
|
|
|
This means we have to set "cf->first_displayed" and
|
|
|
|
"cf->last_displayed" before adding the row to the
|
|
|
|
GtkCList; see the comment in "add_packet_to_packet_list()". */
|
|
|
|
|
|
|
|
if (row == 0 && cf->first_displayed == cf->last_displayed)
|
2011-04-27 02:54:44 +00:00
|
|
|
fdata = frame_data_sequence_find(cf->frames, cf->first_displayed);
|
2000-03-12 03:13:58 +00:00
|
|
|
}
|
|
|
|
|
2006-04-27 18:46:05 +00:00
|
|
|
/* If fdata _still_ isn't set simply give up. */
|
|
|
|
if (fdata == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2003-09-03 23:15:40 +00:00
|
|
|
/* Get the data in that frame. */
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
if (!cf_read_frame (cf, fdata)) {
|
2003-09-03 23:15:40 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
We can't trust "cf->current_frame" to refer to the frame that was
selected before we started re-colorizing or re-filtering the display, as
when the first row is added to the clist, that may be selected and thus
made the current frame.
This means that we can't find the row corresponding to the
previously-selected frame, if any, by checking as each packet is
colorized/filtered and see whether its "frame_data" structure is equal
to "cf->current_frame", as that'll always say that the first frame in
the display is the selected frame.
Instead, we recored the value of "cf->current_frame" before we do
anything to the clist, have "add_packet_to_packet_list()" return either
the row number of the frame (if it passed the filter and thus was added
to the clist) or -1 (if it didn't pass the filter and thus wasn't added
to the clist), and, after "add_packet_to_packet_list()", if the current
frame is the one that was the selected row, remember its row number (if
any), and, when we're finished colorizing/filtering the display, make
that row the current row if it's not -1 (-1 means that the selected row
didn't pass the filter).
Also, don't do that until after we've thawed the clist, as the vertical
adjustment for the clist doesn't reflect reality until then, and
attempting to go to a given row won't work right until the vertical
adjustment for the clist reflects reality.
Shove all the code to set the selected and focus rows, and to make said
row visible, into a routine, so the "Find Frame" and "Go To Frame" code
can use it as well.
svn path=/trunk/; revision=1959
2000-05-15 01:50:16 +00:00
|
|
|
/* Record that this frame is the current frame. */
|
2000-05-12 22:03:59 +00:00
|
|
|
cf->current_frame = fdata;
|
2008-11-18 14:50:51 +00:00
|
|
|
cf->current_row = row;
|
1999-07-24 03:22:50 +00:00
|
|
|
|
2012-06-10 22:03:17 +00:00
|
|
|
old_edt = cf->edt;
|
1999-07-24 03:22:50 +00:00
|
|
|
/* Create the logical protocol tree. */
|
2001-12-10 03:25:58 +00:00
|
|
|
/* We don't need the columns here. */
|
2013-07-21 18:38:03 +00:00
|
|
|
cf->edt = epan_dissect_new(cf->epan, TRUE, TRUE);
|
2006-10-03 18:39:36 +00:00
|
|
|
|
2009-10-02 19:55:43 +00:00
|
|
|
tap_build_interesting(cf->edt);
|
2013-07-11 05:47:02 +00:00
|
|
|
epan_dissect_run(cf->edt, &cf->phdr, frame_tvbuff_new_buffer(cf->current_frame, &cf->buf),
|
2013-06-16 00:20:00 +00:00
|
|
|
cf->current_frame, NULL);
|
2007-12-05 23:50:28 +00:00
|
|
|
|
2007-07-30 23:32:47 +00:00
|
|
|
dfilter_macro_build_ftv_cache(cf->edt->tree);
|
2007-12-05 23:50:28 +00:00
|
|
|
|
2005-02-07 00:54:46 +00:00
|
|
|
cf_callback_invoke(cf_cb_packet_selected, cf);
|
2012-06-10 22:03:17 +00:00
|
|
|
|
|
|
|
if (old_edt != NULL)
|
|
|
|
epan_dissect_free(old_edt);
|
|
|
|
|
1999-07-24 03:22:50 +00:00
|
|
|
}
|
|
|
|
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
/* Unselect the selected packet, if any. */
|
|
|
|
void
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_unselect_packet(capture_file *cf)
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
{
|
2012-06-10 22:03:17 +00:00
|
|
|
epan_dissect_t *old_edt = cf->edt;
|
|
|
|
|
|
|
|
cf->edt = NULL;
|
1999-07-24 03:22:50 +00:00
|
|
|
|
2000-01-03 03:57:04 +00:00
|
|
|
/* No packet is selected. */
|
2003-09-24 02:36:35 +00:00
|
|
|
cf->current_frame = NULL;
|
2008-11-18 14:50:51 +00:00
|
|
|
cf->current_row = 0;
|
2005-02-07 00:54:46 +00:00
|
|
|
|
|
|
|
cf_callback_invoke(cf_cb_packet_unselected, cf);
|
Enable "Match Selected" only if there's a field selected *and* we can do
a "Match Selected" on it - we can't do a "Match Selected" if the field
has no value (e.g., FT_NULL) and has a length of 0.
If we unselect the current packet, we don't have a protocol tree, so we
don't have a currently selected field - clear the "Match Selected" menu
item and the display in the status line of information about the
currently selected field.
Move the low-level statusbar manipulation into "gtk/main.c", in routines
whose API doesn't expose anything GTK+-ish.
"close_cap_file()" calls one of those routines to clear out the status
bar, so it doesn't need to take a pointer to the statusbar widget as an
argument.
"clear_tree_and_hex_views()" is purely a display-manipulating routine;
move it to "gtk/proto_draw.c".
Extract from "tree_view_unselect_row_cb()" an "unselect_field()" routine
to do all the work that needs to be done if the currently selected
protocol tree row is unselected, and call it if the currently selected
packet list row is unselected (if it's unselected, there *is* no
protocol tree, so no row can be selected), as well as from
"tree_view_unselect_row_cb()".
Before pushing a new field-description message onto the statusbar, pop
the old one off.
Get rid of an unused variable (set, but not used).
svn path=/trunk/; revision=3513
2001-06-05 07:39:31 +00:00
|
|
|
|
|
|
|
/* No protocol tree means no selected field. */
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_unselect_field(cf);
|
2012-06-10 22:03:17 +00:00
|
|
|
|
|
|
|
/* Destroy the epan_dissect_t for the unselected packet. */
|
|
|
|
if (old_edt != NULL)
|
|
|
|
epan_dissect_free(old_edt);
|
Have "close_cap_file()" disable all menu items that make sense only if
you have a capture.
Leave the job of enabling and disabling menu items that make sense only
if you have a capture (except for "File/Save" and "File/Save As...", for
now) up to "load_cap_file()", "close_cap_file()", and the like - don't
scatter that stuff throughout the code.
Disable "File/Print Packet" if no packet is selected; enable it only if
a packet is selected.
If there's a selected packet, and a display filter is run:
if the selected packet passed the filter, re-select it;
if the selected packet didn't pass the filter, un-select it.
If we've opened a live "pcap" capture, but can't do the capture because
we can't get the netmask info, or can't parse the capture filter string,
or can't install the filter, close the live capture and the dump and
delete the dump file.
If we failed to open a live "pcap" capture, don't try to read the
capture file - it doesn't exist.
svn path=/trunk/; revision=384
1999-07-24 02:42:52 +00:00
|
|
|
}
|
|
|
|
|
Enable "Match Selected" only if there's a field selected *and* we can do
a "Match Selected" on it - we can't do a "Match Selected" if the field
has no value (e.g., FT_NULL) and has a length of 0.
If we unselect the current packet, we don't have a protocol tree, so we
don't have a currently selected field - clear the "Match Selected" menu
item and the display in the status line of information about the
currently selected field.
Move the low-level statusbar manipulation into "gtk/main.c", in routines
whose API doesn't expose anything GTK+-ish.
"close_cap_file()" calls one of those routines to clear out the status
bar, so it doesn't need to take a pointer to the statusbar widget as an
argument.
"clear_tree_and_hex_views()" is purely a display-manipulating routine;
move it to "gtk/proto_draw.c".
Extract from "tree_view_unselect_row_cb()" an "unselect_field()" routine
to do all the work that needs to be done if the currently selected
protocol tree row is unselected, and call it if the currently selected
packet list row is unselected (if it's unselected, there *is* no
protocol tree, so no row can be selected), as well as from
"tree_view_unselect_row_cb()".
Before pushing a new field-description message onto the statusbar, pop
the old one off.
Get rid of an unused variable (set, but not used).
svn path=/trunk/; revision=3513
2001-06-05 07:39:31 +00:00
|
|
|
/* Unset the selected protocol tree field, if any. */
|
|
|
|
void
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_unselect_field(capture_file *cf)
|
Enable "Match Selected" only if there's a field selected *and* we can do
a "Match Selected" on it - we can't do a "Match Selected" if the field
has no value (e.g., FT_NULL) and has a length of 0.
If we unselect the current packet, we don't have a protocol tree, so we
don't have a currently selected field - clear the "Match Selected" menu
item and the display in the status line of information about the
currently selected field.
Move the low-level statusbar manipulation into "gtk/main.c", in routines
whose API doesn't expose anything GTK+-ish.
"close_cap_file()" calls one of those routines to clear out the status
bar, so it doesn't need to take a pointer to the statusbar widget as an
argument.
"clear_tree_and_hex_views()" is purely a display-manipulating routine;
move it to "gtk/proto_draw.c".
Extract from "tree_view_unselect_row_cb()" an "unselect_field()" routine
to do all the work that needs to be done if the currently selected
protocol tree row is unselected, and call it if the currently selected
packet list row is unselected (if it's unselected, there *is* no
protocol tree, so no row can be selected), as well as from
"tree_view_unselect_row_cb()".
Before pushing a new field-description message onto the statusbar, pop
the old one off.
Get rid of an unused variable (set, but not used).
svn path=/trunk/; revision=3513
2001-06-05 07:39:31 +00:00
|
|
|
{
|
2003-09-24 00:47:37 +00:00
|
|
|
cf->finfo_selected = NULL;
|
2005-02-07 00:54:46 +00:00
|
|
|
|
|
|
|
cf_callback_invoke(cf_cb_field_unselected, cf);
|
Enable "Match Selected" only if there's a field selected *and* we can do
a "Match Selected" on it - we can't do a "Match Selected" if the field
has no value (e.g., FT_NULL) and has a length of 0.
If we unselect the current packet, we don't have a protocol tree, so we
don't have a currently selected field - clear the "Match Selected" menu
item and the display in the status line of information about the
currently selected field.
Move the low-level statusbar manipulation into "gtk/main.c", in routines
whose API doesn't expose anything GTK+-ish.
"close_cap_file()" calls one of those routines to clear out the status
bar, so it doesn't need to take a pointer to the statusbar widget as an
argument.
"clear_tree_and_hex_views()" is purely a display-manipulating routine;
move it to "gtk/proto_draw.c".
Extract from "tree_view_unselect_row_cb()" an "unselect_field()" routine
to do all the work that needs to be done if the currently selected
protocol tree row is unselected, and call it if the currently selected
packet list row is unselected (if it's unselected, there *is* no
protocol tree, so no row can be selected), as well as from
"tree_view_unselect_row_cb()".
Before pushing a new field-description message onto the statusbar, pop
the old one off.
Get rid of an unused variable (set, but not used).
svn path=/trunk/; revision=3513
2001-06-05 07:39:31 +00:00
|
|
|
}
|
|
|
|
|
2001-12-06 02:21:26 +00:00
|
|
|
/*
|
|
|
|
* Mark a particular frame.
|
|
|
|
*/
|
|
|
|
void
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_mark_frame(capture_file *cf, frame_data *frame)
|
2001-12-06 02:21:26 +00:00
|
|
|
{
|
2004-08-19 14:35:55 +00:00
|
|
|
if (! frame->flags.marked) {
|
|
|
|
frame->flags.marked = TRUE;
|
|
|
|
if (cf->count > cf->marked_count)
|
|
|
|
cf->marked_count++;
|
|
|
|
}
|
2001-12-06 02:21:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Unmark a particular frame.
|
|
|
|
*/
|
|
|
|
void
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_unmark_frame(capture_file *cf, frame_data *frame)
|
2001-12-06 02:21:26 +00:00
|
|
|
{
|
2004-08-19 14:35:55 +00:00
|
|
|
if (frame->flags.marked) {
|
|
|
|
frame->flags.marked = FALSE;
|
|
|
|
if (cf->marked_count > 0)
|
|
|
|
cf->marked_count--;
|
|
|
|
}
|
2001-12-06 02:21:26 +00:00
|
|
|
}
|
|
|
|
|
2009-12-17 01:18:14 +00:00
|
|
|
/*
|
|
|
|
* Ignore a particular frame.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
cf_ignore_frame(capture_file *cf, frame_data *frame)
|
|
|
|
{
|
|
|
|
if (! frame->flags.ignored) {
|
|
|
|
frame->flags.ignored = TRUE;
|
|
|
|
if (cf->count > cf->ignored_count)
|
|
|
|
cf->ignored_count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Un-ignore a particular frame.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
cf_unignore_frame(capture_file *cf, frame_data *frame)
|
|
|
|
{
|
|
|
|
if (frame->flags.ignored) {
|
|
|
|
frame->flags.ignored = FALSE;
|
|
|
|
if (cf->ignored_count > 0)
|
|
|
|
cf->ignored_count--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-02-29 16:51:32 +00:00
|
|
|
/*
|
2012-05-22 01:59:34 +00:00
|
|
|
* Read the comment in SHB block
|
2012-02-29 16:51:32 +00:00
|
|
|
*/
|
|
|
|
|
2012-05-22 01:59:34 +00:00
|
|
|
const gchar *
|
2012-02-29 16:51:32 +00:00
|
|
|
cf_read_shb_comment(capture_file *cf)
|
|
|
|
{
|
2012-03-23 01:41:59 +00:00
|
|
|
wtapng_section_t *shb_inf;
|
2012-08-12 22:21:02 +00:00
|
|
|
const gchar *temp_str;
|
2012-02-29 16:51:32 +00:00
|
|
|
|
|
|
|
/* Get info from SHB */
|
|
|
|
shb_inf = wtap_file_get_shb_info(cf->wth);
|
2012-08-12 22:21:02 +00:00
|
|
|
if (shb_inf == NULL)
|
2012-03-15 02:35:49 +00:00
|
|
|
return NULL;
|
2012-02-29 16:51:32 +00:00
|
|
|
temp_str = shb_inf->opt_comment;
|
|
|
|
g_free(shb_inf);
|
|
|
|
|
|
|
|
return temp_str;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cf_update_capture_comment(capture_file *cf, gchar *comment)
|
|
|
|
{
|
2012-03-23 01:41:59 +00:00
|
|
|
wtapng_section_t *shb_inf;
|
2012-02-29 16:51:32 +00:00
|
|
|
|
|
|
|
/* Get info from SHB */
|
2012-03-23 01:41:59 +00:00
|
|
|
shb_inf = wtap_file_get_shb_info(cf->wth);
|
2012-02-29 16:51:32 +00:00
|
|
|
|
2012-03-23 01:41:59 +00:00
|
|
|
/* See if the comment has changed or not */
|
|
|
|
if (shb_inf && shb_inf->opt_comment) {
|
|
|
|
if (strcmp(shb_inf->opt_comment, comment) == 0) {
|
|
|
|
g_free(comment);
|
2012-05-24 18:54:03 +00:00
|
|
|
g_free(shb_inf);
|
2012-03-23 01:41:59 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-24 18:54:03 +00:00
|
|
|
g_free(shb_inf);
|
|
|
|
|
2012-03-23 01:41:59 +00:00
|
|
|
/* The comment has changed, let's update it */
|
|
|
|
wtap_write_shb_comment(cf->wth, comment);
|
2012-05-20 08:56:06 +00:00
|
|
|
/* Mark the file as having unsaved changes */
|
|
|
|
cf->unsaved_changes = TRUE;
|
2012-02-29 16:51:32 +00:00
|
|
|
}
|
|
|
|
|
2013-08-01 20:59:38 +00:00
|
|
|
static const char *
|
|
|
|
cf_get_user_packet_comment(capture_file *cf, const frame_data *fd)
|
2012-06-20 01:11:01 +00:00
|
|
|
{
|
2013-08-01 20:59:38 +00:00
|
|
|
if (cf->frames_user_comments)
|
2013-08-01 21:06:34 +00:00
|
|
|
return (const char *)g_tree_lookup(cf->frames_user_comments, fd);
|
2013-08-01 20:59:38 +00:00
|
|
|
|
|
|
|
/* g_warning? */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
cf_get_comment(capture_file *cf, const frame_data *fd)
|
|
|
|
{
|
|
|
|
/* fetch user comment */
|
|
|
|
if (fd->flags.has_user_comment)
|
|
|
|
return g_strdup(cf_get_user_packet_comment(cf, fd));
|
|
|
|
|
|
|
|
/* fetch phdr comment */
|
|
|
|
if (fd->flags.has_phdr_comment) {
|
|
|
|
struct wtap_pkthdr phdr; /* Packet header */
|
|
|
|
Buffer buf; /* Packet data */
|
|
|
|
|
|
|
|
phdr.opt_comment = NULL;
|
|
|
|
|
|
|
|
buffer_init(&buf, 1500);
|
|
|
|
if (!cf_read_frame_r(cf, fd, &phdr, &buf))
|
|
|
|
{ /* XXX, what we can do here? */ }
|
|
|
|
|
|
|
|
buffer_free(&buf);
|
|
|
|
return phdr.opt_comment;
|
2012-06-20 01:11:01 +00:00
|
|
|
}
|
2013-08-01 20:59:38 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
frame_cmp(gconstpointer a, gconstpointer b, gpointer user_data _U_)
|
|
|
|
{
|
|
|
|
const frame_data *fdata1 = (const frame_data *) a;
|
|
|
|
const frame_data *fdata2 = (const frame_data *) b;
|
|
|
|
|
|
|
|
return (fdata1->num < fdata2->num) ? -1 :
|
|
|
|
(fdata1->num > fdata2->num) ? 1 :
|
|
|
|
0;
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
cf_set_user_packet_comment(capture_file *cf, frame_data *fd, const gchar *new_comment)
|
|
|
|
{
|
|
|
|
char *pkt_comment = cf_get_comment(cf, fd);
|
|
|
|
|
|
|
|
/* Check if the comment has changed */
|
|
|
|
if (!g_strcmp0(pkt_comment, new_comment)) {
|
|
|
|
g_free(pkt_comment);
|
|
|
|
return FALSE;
|
2012-06-20 01:11:01 +00:00
|
|
|
}
|
2013-08-01 20:59:38 +00:00
|
|
|
g_free(pkt_comment);
|
|
|
|
|
|
|
|
if (pkt_comment)
|
|
|
|
cf->packet_comment_count--;
|
|
|
|
|
|
|
|
if (new_comment)
|
|
|
|
cf->packet_comment_count++;
|
|
|
|
|
|
|
|
fd->flags.has_user_comment = TRUE;
|
|
|
|
|
|
|
|
if (!cf->frames_user_comments)
|
|
|
|
cf->frames_user_comments = g_tree_new_full(frame_cmp, NULL, NULL, g_free);
|
|
|
|
|
|
|
|
/* insert new packet comment */
|
|
|
|
g_tree_replace(cf->frames_user_comments, fd, g_strdup(new_comment));
|
2012-06-20 01:11:01 +00:00
|
|
|
|
2013-06-20 22:25:33 +00:00
|
|
|
expert_update_comment_count(cf->packet_comment_count);
|
|
|
|
|
2012-06-20 01:11:01 +00:00
|
|
|
/* OK, we have unsaved changes. */
|
|
|
|
cf->unsaved_changes = TRUE;
|
2013-08-01 20:59:38 +00:00
|
|
|
return TRUE;
|
2012-06-20 01:11:01 +00:00
|
|
|
}
|
|
|
|
|
2012-06-20 04:44:14 +00:00
|
|
|
/*
|
2013-04-01 20:36:42 +00:00
|
|
|
* What types of comments does this capture file have?
|
2012-06-20 04:44:14 +00:00
|
|
|
*/
|
2013-04-01 20:36:42 +00:00
|
|
|
guint32
|
|
|
|
cf_comment_types(capture_file *cf)
|
2012-06-20 04:44:14 +00:00
|
|
|
{
|
2013-04-01 20:36:42 +00:00
|
|
|
guint32 comment_types = 0;
|
|
|
|
|
|
|
|
if (cf_read_shb_comment(cf) != NULL)
|
|
|
|
comment_types |= WTAP_COMMENT_PER_SECTION;
|
|
|
|
if (cf->packet_comment_count != 0)
|
|
|
|
comment_types |= WTAP_COMMENT_PER_PACKET;
|
|
|
|
return comment_types;
|
2012-06-20 04:44:14 +00:00
|
|
|
}
|
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
typedef struct {
|
|
|
|
wtap_dumper *pdh;
|
|
|
|
const char *fname;
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
int file_type;
|
2004-01-09 22:56:59 +00:00
|
|
|
} save_callback_args_t;
|
|
|
|
|
2002-05-23 07:46:58 +00:00
|
|
|
/*
|
|
|
|
* Save a capture to a file, in a particular format, saving either
|
|
|
|
* all packets, all currently-displayed packets, or all marked packets.
|
|
|
|
*
|
|
|
|
* Returns TRUE if it succeeds, FALSE otherwise; if it fails, it pops
|
|
|
|
* up a message box for the failure.
|
|
|
|
*/
|
2004-01-09 22:56:59 +00:00
|
|
|
static gboolean
|
2012-05-18 03:31:50 +00:00
|
|
|
save_packet(capture_file *cf _U_, frame_data *fdata,
|
2012-10-16 21:50:57 +00:00
|
|
|
struct wtap_pkthdr *phdr, const guint8 *pd,
|
2004-01-09 22:56:59 +00:00
|
|
|
void *argsp)
|
|
|
|
{
|
2013-03-06 17:35:11 +00:00
|
|
|
save_callback_args_t *args = (save_callback_args_t *)argsp;
|
2012-08-12 22:21:02 +00:00
|
|
|
struct wtap_pkthdr hdr;
|
2004-01-09 22:56:59 +00:00
|
|
|
int err;
|
2012-06-17 22:32:03 +00:00
|
|
|
gchar *display_basename;
|
2013-08-01 20:59:38 +00:00
|
|
|
const char *pkt_comment;
|
|
|
|
|
|
|
|
if (fdata->flags.has_user_comment)
|
|
|
|
pkt_comment = cf_get_user_packet_comment(cf, fdata);
|
|
|
|
else
|
|
|
|
pkt_comment = phdr->opt_comment;
|
2004-01-09 22:56:59 +00:00
|
|
|
|
|
|
|
/* init the wtap header for saving */
|
2012-10-16 21:50:57 +00:00
|
|
|
/* TODO: reuse phdr */
|
2012-05-18 03:31:50 +00:00
|
|
|
/* XXX - these are the only flags that correspond to data that we have
|
|
|
|
in the frame_data structure and that matter on a per-packet basis.
|
|
|
|
|
|
|
|
For WTAP_HAS_CAP_LEN, either the file format has separate "captured"
|
|
|
|
and "on the wire" lengths, or it doesn't.
|
|
|
|
|
|
|
|
For WTAP_HAS_DROP_COUNT, Wiretap doesn't actually supply the value
|
|
|
|
to its callers.
|
|
|
|
|
|
|
|
For WTAP_HAS_PACK_FLAGS, we currently don't save the FCS length
|
|
|
|
from the packet flags. */
|
|
|
|
hdr.presence_flags = 0;
|
|
|
|
if (fdata->flags.has_ts)
|
|
|
|
hdr.presence_flags |= WTAP_HAS_TS;
|
2013-07-30 23:14:09 +00:00
|
|
|
if (phdr->presence_flags & WTAP_HAS_INTERFACE_ID)
|
2012-05-18 03:31:50 +00:00
|
|
|
hdr.presence_flags |= WTAP_HAS_INTERFACE_ID;
|
2013-07-30 23:14:09 +00:00
|
|
|
if (phdr->presence_flags & WTAP_HAS_PACK_FLAGS)
|
2012-12-22 20:38:08 +00:00
|
|
|
hdr.presence_flags |= WTAP_HAS_PACK_FLAGS;
|
2012-02-11 12:34:39 +00:00
|
|
|
hdr.ts.secs = fdata->abs_ts.secs;
|
|
|
|
hdr.ts.nsecs = fdata->abs_ts.nsecs;
|
|
|
|
hdr.caplen = fdata->cap_len;
|
|
|
|
hdr.len = fdata->pkt_len;
|
|
|
|
hdr.pkt_encap = fdata->lnk_t;
|
|
|
|
/* pcapng */
|
2013-07-30 23:14:09 +00:00
|
|
|
hdr.interface_id = phdr->interface_id; /* identifier of the interface. */
|
2012-02-11 12:34:39 +00:00
|
|
|
/* options */
|
2013-07-30 23:14:09 +00:00
|
|
|
hdr.pack_flags = phdr->pack_flags;
|
2013-08-01 20:59:38 +00:00
|
|
|
hdr.opt_comment = g_strdup(pkt_comment);
|
|
|
|
|
2012-10-16 21:50:57 +00:00
|
|
|
/* pseudo */
|
|
|
|
hdr.pseudo_header = phdr->pseudo_header;
|
2012-02-11 12:34:39 +00:00
|
|
|
#if 0
|
|
|
|
hdr.drop_count =
|
|
|
|
hdr.pack_flags = /* XXX - 0 for now (any value for "we don't have it"?) */
|
|
|
|
#endif
|
2004-01-09 22:56:59 +00:00
|
|
|
/* and save the packet */
|
2012-10-16 21:50:57 +00:00
|
|
|
if (!wtap_dump(args->pdh, &hdr, pd, &err)) {
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
if (err < 0) {
|
|
|
|
/* Wiretap error. */
|
|
|
|
switch (err) {
|
|
|
|
|
|
|
|
case WTAP_ERR_UNSUPPORTED_ENCAP:
|
|
|
|
/*
|
|
|
|
* This is a problem with the particular frame we're writing;
|
|
|
|
* note that, and give the frame number.
|
|
|
|
*/
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
"Frame %u has a network type that can't be saved in a \"%s\" file.",
|
2013-11-08 09:53:01 +00:00
|
|
|
fdata->num, wtap_file_type_subtype_string(args->file_type));
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename = g_filename_display_basename(args->fname);
|
|
|
|
simple_error_message_box(
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
"An error occurred while writing to the file \"%s\": %s.",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename, wtap_strerror(err));
|
|
|
|
g_free(display_basename);
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* OS error. */
|
|
|
|
write_failure_alert_box(args->fname, err);
|
|
|
|
}
|
2004-01-09 22:56:59 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
2013-08-01 20:59:38 +00:00
|
|
|
|
|
|
|
g_free(hdr.opt_comment);
|
2004-01-09 22:56:59 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2007-03-14 19:30:19 +00:00
|
|
|
/*
|
2012-06-25 18:37:52 +00:00
|
|
|
* Can this capture file be written out in any format using Wiretap
|
|
|
|
* rather than by copying the raw data?
|
2007-03-14 19:30:19 +00:00
|
|
|
*/
|
|
|
|
gboolean
|
2012-06-25 18:37:52 +00:00
|
|
|
cf_can_write_with_wiretap(capture_file *cf)
|
2007-03-14 19:30:19 +00:00
|
|
|
{
|
2013-04-01 21:17:50 +00:00
|
|
|
/* We don't care whether we support the comments in this file or not;
|
|
|
|
if we can't, we'll offer the user the option of discarding the
|
2013-04-01 23:44:29 +00:00
|
|
|
comments. */
|
2013-04-01 21:17:50 +00:00
|
|
|
return wtap_dump_can_write(cf->linktypes, 0);
|
2007-03-14 19:30:19 +00:00
|
|
|
}
|
|
|
|
|
2013-04-01 23:44:29 +00:00
|
|
|
/*
|
|
|
|
* Should we let the user do a save?
|
|
|
|
*
|
|
|
|
* We should if:
|
|
|
|
*
|
|
|
|
* the file has unsaved changes, and we can save it in some
|
|
|
|
* format through Wiretap
|
|
|
|
*
|
|
|
|
* or
|
|
|
|
*
|
|
|
|
* the file is a temporary file and has no unsaved changes (so
|
|
|
|
* that "saving" it just means copying it).
|
|
|
|
*
|
|
|
|
* XXX - we shouldn't allow files to be edited if they can't be saved,
|
|
|
|
* so cf->unsaved_changes should be true only if the file can be saved.
|
|
|
|
*
|
|
|
|
* We don't care whether we support the comments in this file or not;
|
|
|
|
* if we can't, we'll offer the user the option of discarding the
|
|
|
|
* comments.
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
cf_can_save(capture_file *cf)
|
|
|
|
{
|
|
|
|
if (cf->unsaved_changes && wtap_dump_can_write(cf->linktypes, 0)) {
|
|
|
|
/* Saved changes, and we can write it out with Wiretap. */
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cf->is_tempfile && !cf->unsaved_changes) {
|
|
|
|
/*
|
|
|
|
* Temporary file with no unsaved changes, so we can just do a
|
|
|
|
* raw binary copy.
|
|
|
|
*/
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Nothing to save. */
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Should we let the user do a "save as"?
|
|
|
|
*
|
|
|
|
* That's true if:
|
|
|
|
*
|
|
|
|
* we can save it in some format through Wiretap
|
|
|
|
*
|
|
|
|
* or
|
|
|
|
*
|
|
|
|
* the file is a temporary file and has no unsaved changes (so
|
|
|
|
* that "saving" it just means copying it).
|
|
|
|
*
|
|
|
|
* XXX - we shouldn't allow files to be edited if they can't be saved,
|
|
|
|
* so cf->unsaved_changes should be true only if the file can be saved.
|
|
|
|
*
|
|
|
|
* We don't care whether we support the comments in this file or not;
|
|
|
|
* if we can't, we'll offer the user the option of discarding the
|
|
|
|
* comments.
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
cf_can_save_as(capture_file *cf)
|
|
|
|
{
|
|
|
|
if (wtap_dump_can_write(cf->linktypes, 0)) {
|
|
|
|
/* We can write it out with Wiretap. */
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cf->is_tempfile && !cf->unsaved_changes) {
|
|
|
|
/*
|
|
|
|
* Temporary file with no unsaved changes, so we can just do a
|
|
|
|
* raw binary copy.
|
|
|
|
*/
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Nothing to save. */
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Does this file have unsaved data?
|
|
|
|
*/
|
|
|
|
gboolean
|
2013-04-02 20:35:46 +00:00
|
|
|
cf_has_unsaved_data(capture_file *cf)
|
2013-04-01 23:44:29 +00:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* If this is a temporary file, or a file with unsaved changes, it
|
|
|
|
* has unsaved data.
|
|
|
|
*/
|
|
|
|
return cf->is_tempfile || cf->unsaved_changes;
|
|
|
|
}
|
|
|
|
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
/*
|
|
|
|
* Quick scan to find packet offsets.
|
|
|
|
*/
|
|
|
|
static cf_read_status_t
|
|
|
|
rescan_file(capture_file *cf, const char *fname, gboolean is_tempfile, int *err)
|
|
|
|
{
|
2012-06-15 23:54:05 +00:00
|
|
|
const struct wtap_pkthdr *phdr;
|
2012-08-12 22:21:02 +00:00
|
|
|
gchar *err_info;
|
|
|
|
gchar *name_ptr;
|
|
|
|
gint64 data_offset;
|
|
|
|
gint64 file_pos;
|
2012-10-22 19:14:43 +00:00
|
|
|
progdlg_t *progbar = NULL;
|
2012-08-12 22:21:02 +00:00
|
|
|
gboolean stop_flag;
|
2012-10-22 19:14:43 +00:00
|
|
|
gint64 size;
|
|
|
|
float progbar_val;
|
2012-08-12 22:21:02 +00:00
|
|
|
GTimeVal start_time;
|
|
|
|
gchar status_str[100];
|
2012-10-22 19:14:43 +00:00
|
|
|
gint64 progbar_nextstep;
|
|
|
|
gint64 progbar_quantum;
|
2012-08-12 22:21:02 +00:00
|
|
|
guint32 framenum;
|
|
|
|
frame_data *fdata;
|
2012-10-22 19:14:43 +00:00
|
|
|
int count = 0;
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
#ifdef HAVE_LIBPCAP
|
2012-10-22 19:14:43 +00:00
|
|
|
int displayed_once = 0;
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Close the old handle. */
|
|
|
|
wtap_close(cf->wth);
|
|
|
|
|
|
|
|
/* Open the new file. */
|
|
|
|
cf->wth = wtap_open_offline(fname, err, &err_info, TRUE);
|
|
|
|
if (cf->wth == NULL) {
|
|
|
|
cf_open_failure_alert_box(fname, *err, err_info, FALSE, 0);
|
|
|
|
return CF_READ_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We're scanning a file whose contents should be the same as what
|
|
|
|
we had before, so we don't discard dissection state etc.. */
|
|
|
|
cf->f_datalen = 0;
|
|
|
|
|
|
|
|
/* Set the file name because we need it to set the follow stream filter.
|
|
|
|
XXX - is that still true? We need it for other reasons, though,
|
|
|
|
in any case. */
|
|
|
|
cf->filename = g_strdup(fname);
|
|
|
|
|
|
|
|
/* Indicate whether it's a permanent or temporary file. */
|
|
|
|
cf->is_tempfile = is_tempfile;
|
|
|
|
|
|
|
|
/* No user changes yet. */
|
|
|
|
cf->unsaved_changes = FALSE;
|
|
|
|
|
2013-11-08 09:53:01 +00:00
|
|
|
cf->cd_t = wtap_file_type_subtype(cf->wth);
|
2012-06-15 23:54:05 +00:00
|
|
|
cf->linktypes = g_array_sized_new(FALSE, FALSE, (guint) sizeof(int), 1);
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
|
|
|
|
cf->snap = wtap_snapshot_length(cf->wth);
|
|
|
|
if (cf->snap == 0) {
|
|
|
|
/* Snapshot length not known. */
|
|
|
|
cf->has_snap = FALSE;
|
|
|
|
cf->snap = WTAP_MAX_PACKET_SIZE;
|
|
|
|
} else
|
|
|
|
cf->has_snap = TRUE;
|
|
|
|
|
|
|
|
name_ptr = g_filename_display_basename(cf->filename);
|
|
|
|
|
|
|
|
cf_callback_invoke(cf_cb_file_rescan_started, cf);
|
|
|
|
|
2012-06-15 23:54:05 +00:00
|
|
|
/* Record whether the file is compressed.
|
|
|
|
XXX - do we know this at open time? */
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
cf->iscompressed = wtap_iscompressed(cf->wth);
|
|
|
|
|
|
|
|
/* Find the size of the file. */
|
|
|
|
size = wtap_file_size(cf->wth, NULL);
|
|
|
|
|
|
|
|
/* Update the progress bar when it gets to this value. */
|
|
|
|
progbar_nextstep = 0;
|
|
|
|
/* When we reach the value that triggers a progress bar update,
|
|
|
|
bump that value by this amount. */
|
2012-08-12 22:21:02 +00:00
|
|
|
if (size >= 0) {
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
progbar_quantum = size/N_PROGBAR_UPDATES;
|
|
|
|
if (progbar_quantum < MIN_QUANTUM)
|
|
|
|
progbar_quantum = MIN_QUANTUM;
|
|
|
|
}else
|
|
|
|
progbar_quantum = 0;
|
|
|
|
|
|
|
|
stop_flag = FALSE;
|
|
|
|
g_get_current_time(&start_time);
|
|
|
|
|
|
|
|
framenum = 0;
|
2012-06-15 23:54:05 +00:00
|
|
|
phdr = wtap_phdr(cf->wth);
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
while ((wtap_read(cf->wth, err, &err_info, &data_offset))) {
|
|
|
|
framenum++;
|
|
|
|
fdata = frame_data_sequence_find(cf->frames, framenum);
|
|
|
|
fdata->file_off = data_offset;
|
|
|
|
if (size >= 0) {
|
|
|
|
count++;
|
|
|
|
file_pos = wtap_read_so_far(cf->wth);
|
|
|
|
|
|
|
|
/* Create the progress bar if necessary.
|
|
|
|
* Check whether it should be created or not every MIN_NUMBER_OF_PACKET
|
|
|
|
*/
|
2012-08-12 22:21:02 +00:00
|
|
|
if ((progbar == NULL) && !(count % MIN_NUMBER_OF_PACKET)) {
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
progbar_val = calc_progbar_val(cf, size, file_pos, status_str, sizeof(status_str));
|
2012-07-19 21:49:52 +00:00
|
|
|
progbar = delayed_create_progress_dlg(cf->window, "Rescanning", name_ptr,
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
TRUE, &stop_flag, &start_time, progbar_val);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update the progress bar, but do it only N_PROGBAR_UPDATES times;
|
|
|
|
when we update it, we have to run the GTK+ main loop to get it
|
|
|
|
to repaint what's pending, and doing so may involve an "ioctl()"
|
|
|
|
to see if there's any pending input from an X server, and doing
|
|
|
|
that for every packet can be costly, especially on a big file. */
|
|
|
|
if (file_pos >= progbar_nextstep) {
|
|
|
|
if (progbar != NULL) {
|
|
|
|
progbar_val = calc_progbar_val(cf, size, file_pos, status_str, sizeof(status_str));
|
|
|
|
/* update the packet bar content on the first run or frequently on very large files */
|
|
|
|
#ifdef HAVE_LIBPCAP
|
|
|
|
if (progbar_quantum > 500000 || displayed_once == 0) {
|
|
|
|
if ((auto_scroll_live || displayed_once == 0 || cf->displayed_count < 1000) && cf->count != 0) {
|
|
|
|
displayed_once = 1;
|
|
|
|
packets_bar_update();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* HAVE_LIBPCAP */
|
|
|
|
update_progress_dlg(progbar, progbar_val, status_str);
|
|
|
|
}
|
|
|
|
progbar_nextstep += progbar_quantum;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stop_flag) {
|
|
|
|
/* Well, the user decided to abort the rescan. Sadly, as this
|
|
|
|
isn't a reread, recovering is difficult, so we'll just
|
|
|
|
close the current capture. */
|
|
|
|
break;
|
|
|
|
}
|
2012-06-15 23:54:05 +00:00
|
|
|
|
|
|
|
/* Add this packet's link-layer encapsulation type to cf->linktypes, if
|
|
|
|
it's not already there.
|
2012-07-19 21:49:52 +00:00
|
|
|
XXX - yes, this is O(N), so if every packet had a different
|
2012-06-15 23:54:05 +00:00
|
|
|
link-layer encapsulation type, it'd be O(N^2) to read the file, but
|
|
|
|
there are probably going to be a small number of encapsulation types
|
|
|
|
in a file. */
|
|
|
|
cf_add_encapsulation_type(cf, phdr->pkt_encap);
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Free the display name */
|
|
|
|
g_free(name_ptr);
|
|
|
|
|
|
|
|
/* We're done reading the file; destroy the progress bar if it was created. */
|
|
|
|
if (progbar != NULL)
|
|
|
|
destroy_progress_dlg(progbar);
|
|
|
|
|
|
|
|
/* We're done reading sequentially through the file. */
|
|
|
|
cf->state = FILE_READ_DONE;
|
|
|
|
|
|
|
|
/* Close the sequential I/O side, to free up memory it requires. */
|
|
|
|
wtap_sequential_close(cf->wth);
|
|
|
|
|
|
|
|
/* compute the time it took to load the file */
|
2013-08-14 04:14:36 +00:00
|
|
|
compute_elapsed(cf, &start_time);
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
|
|
|
|
/* Set the file encapsulation type now; we don't know what it is until
|
|
|
|
we've looked at all the packets, as we don't know until then whether
|
|
|
|
there's more than one type (and thus whether it's
|
|
|
|
WTAP_ENCAP_PER_PACKET). */
|
|
|
|
cf->lnk_t = wtap_file_encap(cf->wth);
|
|
|
|
|
|
|
|
cf_callback_invoke(cf_cb_file_rescan_finished, cf);
|
|
|
|
|
|
|
|
if (stop_flag) {
|
|
|
|
/* Our caller will give up at this point. */
|
|
|
|
return CF_READ_ABORTED;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*err != 0) {
|
|
|
|
/* Put up a message box noting that the read failed somewhere along
|
|
|
|
the line. Don't throw out the stuff we managed to read, though,
|
|
|
|
if any. */
|
|
|
|
switch (*err) {
|
|
|
|
|
|
|
|
case WTAP_ERR_UNSUPPORTED:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"The capture file contains record data that Wireshark doesn't support.\n(%s)",
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
err_info);
|
|
|
|
g_free(err_info);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case WTAP_ERR_UNSUPPORTED_ENCAP:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
"The capture file has a packet with a network type that Wireshark doesn't support.\n(%s)",
|
|
|
|
err_info);
|
|
|
|
g_free(err_info);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case WTAP_ERR_CANT_READ:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"An attempt to read from the capture file failed for"
|
|
|
|
" some unknown reason.");
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case WTAP_ERR_SHORT_READ:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
|
|
|
"The capture file appears to have been cut short"
|
|
|
|
" in the middle of a packet.");
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case WTAP_ERR_BAD_FILE:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
"The capture file appears to be damaged or corrupt.\n(%s)",
|
|
|
|
err_info);
|
|
|
|
g_free(err_info);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case WTAP_ERR_DECOMPRESS:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
"The compressed capture file appears to be damaged or corrupt.\n"
|
|
|
|
"(%s)", err_info);
|
|
|
|
g_free(err_info);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
"An error occurred while reading the"
|
|
|
|
" capture file: %s.", wtap_strerror(*err));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return CF_READ_ERROR;
|
|
|
|
} else
|
|
|
|
return CF_READ_OK;
|
|
|
|
}
|
|
|
|
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
cf_write_status_t
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
cf_save_packets(capture_file *cf, const char *fname, guint save_format,
|
2012-06-20 01:11:01 +00:00
|
|
|
gboolean compressed, gboolean discard_comments,
|
|
|
|
gboolean dont_reopen)
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
{
|
2013-04-13 18:24:06 +00:00
|
|
|
gchar *err_info;
|
|
|
|
gchar *fname_new = NULL;
|
|
|
|
wtap_dumper *pdh;
|
|
|
|
frame_data *fdata;
|
2013-09-22 19:40:02 +00:00
|
|
|
addrinfo_lists_t *addr_lists;
|
2013-04-13 18:24:06 +00:00
|
|
|
guint framenum;
|
|
|
|
int err;
|
|
|
|
#ifdef _WIN32
|
|
|
|
gchar *display_basename;
|
|
|
|
#endif
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
enum {
|
|
|
|
SAVE_WITH_MOVE,
|
|
|
|
SAVE_WITH_COPY,
|
|
|
|
SAVE_WITH_WTAP
|
2013-04-13 18:24:06 +00:00
|
|
|
} how_to_save;
|
2004-01-09 22:56:59 +00:00
|
|
|
save_callback_args_t callback_args;
|
2004-01-02 21:01:40 +00:00
|
|
|
|
2009-12-14 22:05:29 +00:00
|
|
|
cf_callback_invoke(cf_cb_file_save_started, (gpointer)fname);
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
2013-09-22 19:40:02 +00:00
|
|
|
addr_lists = get_addrinfo_list();
|
2013-04-13 18:24:06 +00:00
|
|
|
|
2012-05-24 05:05:29 +00:00
|
|
|
if (save_format == cf->cd_t && compressed == cf->iscompressed
|
2013-04-13 18:24:06 +00:00
|
|
|
&& !discard_comments && !cf->unsaved_changes
|
2013-09-22 19:40:02 +00:00
|
|
|
&& !(addr_lists && wtap_dump_has_name_resolution(save_format))) {
|
2012-06-20 01:11:01 +00:00
|
|
|
/* We're saving in the format it's already in, and we're
|
|
|
|
not discarding comments, and there are no changes we have
|
2013-04-13 18:24:06 +00:00
|
|
|
in memory that aren't saved to the file, and we have no name
|
|
|
|
resolution blocks to write, so we can just move or copy the raw data. */
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
|
|
|
if (cf->is_tempfile) {
|
|
|
|
/* The file being saved is a temporary file from a live
|
|
|
|
capture, so it doesn't need to stay around under that name;
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
first, try renaming the capture buffer file to the new name.
|
2012-05-24 02:16:53 +00:00
|
|
|
This acts as a "safe save", in that, if the file already
|
|
|
|
exists, the existing file will be removed only if the rename
|
2012-05-26 00:44:49 +00:00
|
|
|
succeeds.
|
|
|
|
|
|
|
|
Sadly, on Windows, as we have the current capture file
|
|
|
|
open, even MoveFileEx() with MOVEFILE_REPLACE_EXISTING
|
|
|
|
(to cause the rename to remove an existing target), as
|
|
|
|
done by ws_stdio_rename() (ws_rename() is #defined to
|
|
|
|
be ws_stdio_rename() on Windows) will fail.
|
|
|
|
|
|
|
|
According to the MSDN documentation for CreateFile(), if,
|
|
|
|
when we open a capture file, we were to directly do a CreateFile(),
|
|
|
|
opening with FILE_SHARE_DELETE|FILE_SHARE_READ, and then
|
|
|
|
convert it to a file descriptor with _open_osfhandle(),
|
|
|
|
that would allow the file to be renamed out from under us.
|
|
|
|
|
2012-06-01 08:05:12 +00:00
|
|
|
However, that doesn't work in practice. Perhaps the problem
|
|
|
|
is that the process doing the rename is the process that
|
|
|
|
has the file open. */
|
2012-05-26 00:44:49 +00:00
|
|
|
#ifndef _WIN32
|
2008-05-22 15:46:27 +00:00
|
|
|
if (ws_rename(cf->filename, fname) == 0) {
|
2009-09-21 15:50:15 +00:00
|
|
|
/* That succeeded - there's no need to copy the source file. */
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
how_to_save = SAVE_WITH_MOVE;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
} else {
|
2009-09-21 15:50:15 +00:00
|
|
|
if (errno == EXDEV) {
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
/* They're on different file systems, so we have to copy the
|
|
|
|
file. */
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
how_to_save = SAVE_WITH_COPY;
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
} else {
|
|
|
|
/* The rename failed, but not because they're on different
|
|
|
|
file systems - put up an error message. (Or should we
|
|
|
|
just punt and try to copy? The only reason why I'd
|
|
|
|
expect the rename to fail and the copy to succeed would
|
|
|
|
be if we didn't have permission to remove the file from
|
|
|
|
the temporary directory, and that might be fixable - but
|
|
|
|
is it worth requiring the user to go off and fix it?) */
|
2012-06-17 22:32:03 +00:00
|
|
|
cf_rename_failure_alert_box(fname, errno);
|
Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.
Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction. Give
more information in the Doxygen comments for those routines.
Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument. Replace
find_previous_next_frame_with_filter() with it.
Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller. That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().
Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.
Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet. Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.
Clean up indentation.
svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
}
|
2012-05-26 00:44:49 +00:00
|
|
|
#else
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
how_to_save = SAVE_WITH_COPY;
|
2012-05-26 00:44:49 +00:00
|
|
|
#endif
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
} else {
|
|
|
|
/* It's a permanent file, so we should copy it, and not remove the
|
|
|
|
original. */
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
how_to_save = SAVE_WITH_COPY;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
}
|
2002-04-22 19:10:33 +00:00
|
|
|
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
if (how_to_save == SAVE_WITH_COPY) {
|
2012-05-24 02:16:53 +00:00
|
|
|
/* Copy the file, if we haven't moved it. If we're overwriting
|
|
|
|
an existing file, we do it with a "safe save", by writing
|
|
|
|
to a new file and, if the write succeeds, renaming the
|
|
|
|
new file on top of the old file. */
|
|
|
|
if (file_exists(fname)) {
|
|
|
|
fname_new = g_strdup_printf("%s~", fname);
|
|
|
|
if (!copy_file_binary_mode(cf->filename, fname_new))
|
|
|
|
goto fail;
|
|
|
|
} else {
|
|
|
|
if (!copy_file_binary_mode(cf->filename, fname))
|
|
|
|
goto fail;
|
|
|
|
}
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
}
|
|
|
|
} else {
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
/* Either we're saving in a different format or we're saving changes,
|
|
|
|
such as added, modified, or removed comments, that haven't yet
|
|
|
|
been written to the underlying file; we can't do that by copying
|
|
|
|
or moving the capture file, we have to do it by writing the packets
|
|
|
|
out in Wiretap. */
|
2012-02-15 19:44:16 +00:00
|
|
|
|
2012-02-20 20:15:51 +00:00
|
|
|
wtapng_section_t *shb_hdr = NULL;
|
2012-02-21 16:29:29 +00:00
|
|
|
wtapng_iface_descriptions_t *idb_inf = NULL;
|
Add a routine that, given a set of packet encapsulation types, returns
the per-file encapsulation type needed to write out a set of packets
with all those encapsulation types. If there's only one such
encapsulation type, that's the type, otherwise WTAP_ENCAP_PER_PACKET is
needed. Use that in wtap_dump_can_write_encaps().
Also use it in cf_save_packets() and cf_export_specified_packets(), so
that we can write out files with WTAP_ENCAP_PER_PACKET as the file
encapsulation type and only one actual per-packet encapsulation type in
some cases where that failed before. This fixes the case that showed up
in bug 7505, although there are other cases where we *could* write out a
capture in a given file format but won't be able to do so; fixing those
will take more work.
#BACKPORT
(Note: this adds a routine to libwiretap, so, when backported, the
*minor* version of the library should be increased. Code that worked
with the version of the library prior to this change will continue to
work, so there's no need to change the *major* version of the library.)
svn path=/trunk/; revision=43847
2012-07-20 04:00:29 +00:00
|
|
|
int encap;
|
2012-02-15 19:44:16 +00:00
|
|
|
|
2012-02-21 16:29:29 +00:00
|
|
|
shb_hdr = wtap_file_get_shb_info(cf->wth);
|
|
|
|
idb_inf = wtap_file_get_idb_info(cf->wth);
|
2012-02-20 20:15:51 +00:00
|
|
|
|
Add a routine that, given a set of packet encapsulation types, returns
the per-file encapsulation type needed to write out a set of packets
with all those encapsulation types. If there's only one such
encapsulation type, that's the type, otherwise WTAP_ENCAP_PER_PACKET is
needed. Use that in wtap_dump_can_write_encaps().
Also use it in cf_save_packets() and cf_export_specified_packets(), so
that we can write out files with WTAP_ENCAP_PER_PACKET as the file
encapsulation type and only one actual per-packet encapsulation type in
some cases where that failed before. This fixes the case that showed up
in bug 7505, although there are other cases where we *could* write out a
capture in a given file format but won't be able to do so; fixing those
will take more work.
#BACKPORT
(Note: this adds a routine to libwiretap, so, when backported, the
*minor* version of the library should be increased. Code that worked
with the version of the library prior to this change will continue to
work, so there's no need to change the *major* version of the library.)
svn path=/trunk/; revision=43847
2012-07-20 04:00:29 +00:00
|
|
|
/* Determine what file encapsulation type we should use. */
|
|
|
|
encap = wtap_dump_file_encap_type(cf->linktypes);
|
|
|
|
|
2012-05-24 02:16:53 +00:00
|
|
|
if (file_exists(fname)) {
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
/* We're overwriting an existing file; write out to a new file,
|
|
|
|
and, if that succeeds, rename the new file on top of the
|
|
|
|
old file. That makes this a "safe save", so that we don't
|
|
|
|
lose the old file if we have a problem writing out the new
|
|
|
|
file. (If the existing file is the current capture file,
|
|
|
|
we *HAVE* to do that, otherwise we're overwriting the file
|
|
|
|
from which we're reading the packets that we're writing!) */
|
2012-05-24 02:16:53 +00:00
|
|
|
fname_new = g_strdup_printf("%s~", fname);
|
Add a routine that, given a set of packet encapsulation types, returns
the per-file encapsulation type needed to write out a set of packets
with all those encapsulation types. If there's only one such
encapsulation type, that's the type, otherwise WTAP_ENCAP_PER_PACKET is
needed. Use that in wtap_dump_can_write_encaps().
Also use it in cf_save_packets() and cf_export_specified_packets(), so
that we can write out files with WTAP_ENCAP_PER_PACKET as the file
encapsulation type and only one actual per-packet encapsulation type in
some cases where that failed before. This fixes the case that showed up
in bug 7505, although there are other cases where we *could* write out a
capture in a given file format but won't be able to do so; fixing those
will take more work.
#BACKPORT
(Note: this adds a routine to libwiretap, so, when backported, the
*minor* version of the library should be increased. Code that worked
with the version of the library prior to this change will continue to
work, so there's no need to change the *major* version of the library.)
svn path=/trunk/; revision=43847
2012-07-20 04:00:29 +00:00
|
|
|
pdh = wtap_dump_open_ng(fname_new, save_format, encap, cf->snap,
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
compressed, shb_hdr, idb_inf, &err);
|
|
|
|
} else {
|
Add a routine that, given a set of packet encapsulation types, returns
the per-file encapsulation type needed to write out a set of packets
with all those encapsulation types. If there's only one such
encapsulation type, that's the type, otherwise WTAP_ENCAP_PER_PACKET is
needed. Use that in wtap_dump_can_write_encaps().
Also use it in cf_save_packets() and cf_export_specified_packets(), so
that we can write out files with WTAP_ENCAP_PER_PACKET as the file
encapsulation type and only one actual per-packet encapsulation type in
some cases where that failed before. This fixes the case that showed up
in bug 7505, although there are other cases where we *could* write out a
capture in a given file format but won't be able to do so; fixing those
will take more work.
#BACKPORT
(Note: this adds a routine to libwiretap, so, when backported, the
*minor* version of the library should be increased. Code that worked
with the version of the library prior to this change will continue to
work, so there's no need to change the *major* version of the library.)
svn path=/trunk/; revision=43847
2012-07-20 04:00:29 +00:00
|
|
|
pdh = wtap_dump_open_ng(fname, save_format, encap, cf->snap,
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
compressed, shb_hdr, idb_inf, &err);
|
|
|
|
}
|
2012-03-15 02:35:49 +00:00
|
|
|
g_free(idb_inf);
|
|
|
|
idb_inf = NULL;
|
|
|
|
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
if (pdh == NULL) {
|
2004-02-11 02:02:38 +00:00
|
|
|
cf_open_failure_alert_box(fname, err, NULL, TRUE, save_format);
|
2002-05-23 10:27:12 +00:00
|
|
|
goto fail;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
}
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
|
2012-02-08 20:15:59 +00:00
|
|
|
/* Add address resolution */
|
2013-09-22 19:40:02 +00:00
|
|
|
wtap_dump_set_addrinfo_list(pdh, addr_lists);
|
2012-02-08 20:15:59 +00:00
|
|
|
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
/* Iterate through the list of packets, processing all the packets. */
|
2004-01-09 22:56:59 +00:00
|
|
|
callback_args.pdh = pdh;
|
|
|
|
callback_args.fname = fname;
|
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
|
|
|
callback_args.file_type = save_format;
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
switch (process_specified_packets(cf, NULL, "Saving", "packets",
|
2005-11-12 11:05:02 +00:00
|
|
|
TRUE, save_packet, &callback_args)) {
|
2004-01-09 22:56:59 +00:00
|
|
|
|
|
|
|
case PSP_FINISHED:
|
|
|
|
/* Completed successfully. */
|
|
|
|
break;
|
2003-12-29 20:05:59 +00:00
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
case PSP_STOPPED:
|
|
|
|
/* The user decided to abort the saving.
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
If we're writing to a temporary file, remove it.
|
|
|
|
XXX - should we do so even if we're not writing to a
|
|
|
|
temporary file? */
|
|
|
|
wtap_dump_close(pdh, &err);
|
|
|
|
if (fname_new != NULL)
|
|
|
|
ws_unlink(fname_new);
|
|
|
|
cf_callback_invoke(cf_cb_file_save_stopped, NULL);
|
|
|
|
return CF_WRITE_ABORTED;
|
2004-01-02 21:01:40 +00:00
|
|
|
|
2004-01-09 22:56:59 +00:00
|
|
|
case PSP_FAILED:
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
/* Error while saving.
|
|
|
|
If we're writing to a temporary file, remove it. */
|
|
|
|
if (fname_new != NULL)
|
|
|
|
ws_unlink(fname_new);
|
2004-01-09 22:56:59 +00:00
|
|
|
wtap_dump_close(pdh, &err);
|
|
|
|
goto fail;
|
|
|
|
}
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
if (!wtap_dump_close(pdh, &err)) {
|
2004-02-11 02:02:38 +00:00
|
|
|
cf_close_failure_alert_box(fname, err);
|
2002-05-23 10:27:12 +00:00
|
|
|
goto fail;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
}
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
|
|
|
|
how_to_save = SAVE_WITH_WTAP;
|
2004-01-09 22:56:59 +00:00
|
|
|
}
|
2004-01-02 21:01:40 +00:00
|
|
|
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
if (fname_new != NULL) {
|
|
|
|
/* We wrote out to fname_new, and should rename it on top of
|
2012-06-01 08:05:12 +00:00
|
|
|
fname. fname_new is now closed, so that should be possible even
|
|
|
|
on Windows. However, on Windows, we first need to close whatever
|
|
|
|
file descriptors we have open for fname. */
|
|
|
|
#ifdef _WIN32
|
|
|
|
wtap_fdclose(cf->wth);
|
|
|
|
#endif
|
|
|
|
/* Now do the rename. */
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
if (ws_rename(fname_new, fname) == -1) {
|
2012-05-24 02:16:53 +00:00
|
|
|
/* Well, the rename failed. */
|
2012-06-17 22:32:03 +00:00
|
|
|
cf_rename_failure_alert_box(fname, errno);
|
2012-06-01 08:05:12 +00:00
|
|
|
#ifdef _WIN32
|
2012-06-02 16:59:47 +00:00
|
|
|
/* Attempt to reopen the random file descriptor using the
|
|
|
|
current file's filename. (At this point, the sequential
|
|
|
|
file descriptor is closed.) */
|
|
|
|
if (!wtap_fdreopen(cf->wth, cf->filename, &err)) {
|
2012-06-01 08:05:12 +00:00
|
|
|
/* Oh, well, we're screwed. */
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename = g_filename_display_basename(cf->filename);
|
|
|
|
simple_error_message_box(
|
|
|
|
file_open_error_message(err, FALSE), display_basename);
|
|
|
|
g_free(display_basename);
|
2012-06-01 08:05:12 +00:00
|
|
|
}
|
|
|
|
#endif
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-14 22:05:29 +00:00
|
|
|
cf_callback_invoke(cf_cb_file_save_finished, NULL);
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
cf->unsaved_changes = FALSE;
|
|
|
|
|
2012-05-25 21:25:55 +00:00
|
|
|
if (!dont_reopen) {
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
switch (how_to_save) {
|
|
|
|
|
|
|
|
case SAVE_WITH_MOVE:
|
|
|
|
/* We just moved the file, so the wtap structure refers to the
|
|
|
|
new file, and all the information other than the filename
|
|
|
|
and the "is temporary" status applies to the new file; just
|
|
|
|
update that. */
|
|
|
|
g_free(cf->filename);
|
|
|
|
cf->filename = g_strdup(fname);
|
|
|
|
cf->is_tempfile = FALSE;
|
|
|
|
cf_callback_invoke(cf_cb_file_fast_save_finished, cf);
|
|
|
|
break;
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
case SAVE_WITH_COPY:
|
|
|
|
/* We just copied the file, s all the information other than
|
|
|
|
the wtap structure, the filename, and the "is temporary"
|
|
|
|
status applies to the new file; just update that. */
|
|
|
|
wtap_close(cf->wth);
|
|
|
|
cf->wth = wtap_open_offline(fname, &err, &err_info, TRUE);
|
|
|
|
if (cf->wth == NULL) {
|
|
|
|
cf_open_failure_alert_box(fname, err, err_info, FALSE, 0);
|
|
|
|
cf_close(cf);
|
|
|
|
} else {
|
|
|
|
g_free(cf->filename);
|
|
|
|
cf->filename = g_strdup(fname);
|
|
|
|
cf->is_tempfile = FALSE;
|
|
|
|
}
|
|
|
|
cf_callback_invoke(cf_cb_file_fast_save_finished, cf);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SAVE_WITH_WTAP:
|
|
|
|
/* Open and read the file we saved to.
|
|
|
|
|
|
|
|
XXX - this is somewhat of a waste; we already have the
|
|
|
|
packets, all this gets us is updated file type information
|
|
|
|
(which we could just stuff into "cf"), and having the new
|
|
|
|
file be the one we have opened and from which we're reading
|
|
|
|
the data, and it means we have to spend time opening and
|
|
|
|
reading the file, which could be a significant amount of
|
|
|
|
time if the file is large.
|
|
|
|
|
|
|
|
If the capture-file-writing code were to return the
|
|
|
|
seek offset of each packet it writes, we could save that
|
|
|
|
in the frame_data structure for the frame, and just open
|
|
|
|
the file without reading it again...
|
|
|
|
|
|
|
|
...as long as, for gzipped files, the process of writing
|
|
|
|
out the file *also* generates the information needed to
|
|
|
|
support fast random access to the compressed file. */
|
|
|
|
if (rescan_file(cf, fname, FALSE, &err) != CF_READ_OK) {
|
|
|
|
/* The rescan failed; just close the file. Either
|
|
|
|
a dialog was popped up for the failure, so the
|
|
|
|
user knows what happened, or they stopped the
|
|
|
|
rescan, in which case they know what happened. */
|
|
|
|
cf_close(cf);
|
2012-05-25 21:25:55 +00:00
|
|
|
}
|
If we do a Save or Save As with a move, don't reread the capture file,
just tweak the elements in the capture_file structure as necessary and
poke the UI to update stuff such as the windows title.
If we do a Save or Save As with a copy, don't reread the capture file,
just close the old wtap, open a wtap for the copy, and tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title.
Otherwise, don't do a full read-and-dissect pass on the capture file,
just close the old wtap, open a wtap for the new file, tweak the
elements in the capture_file structure as necessary and poke the UI to
update stuff such as the windows title, and rescan the file to update
the packet offsets (and cause Wiretap to regenerate, for a gzipped file,
the information needed to support fast random access to the gzipped
file).
This should speed up Save and Save As a bit, as well as removing some
glitches in the UI (e.g., you won't see the packet list disappear and
reappear).
svn path=/trunk/; revision=43101
2012-06-05 06:52:18 +00:00
|
|
|
break;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
}
|
2012-06-20 01:11:01 +00:00
|
|
|
|
|
|
|
/* If we were told to discard the comments, do so. */
|
|
|
|
if (discard_comments) {
|
|
|
|
/* Remove SHB comment, if any. */
|
|
|
|
wtap_write_shb_comment(cf->wth, NULL);
|
|
|
|
|
2013-08-01 20:59:38 +00:00
|
|
|
/* remove all user comments */
|
2012-06-20 01:11:01 +00:00
|
|
|
for (framenum = 1; framenum <= cf->count; framenum++) {
|
|
|
|
fdata = frame_data_sequence_find(cf->frames, framenum);
|
2013-08-01 20:59:38 +00:00
|
|
|
|
|
|
|
fdata->flags.has_phdr_comment = FALSE;
|
|
|
|
fdata->flags.has_user_comment = FALSE;
|
2012-06-20 01:11:01 +00:00
|
|
|
}
|
2013-08-01 20:59:38 +00:00
|
|
|
|
|
|
|
if (cf->frames_user_comments) {
|
|
|
|
g_tree_destroy(cf->frames_user_comments);
|
|
|
|
cf->frames_user_comments = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
cf->packet_comment_count = 0;
|
2012-07-19 21:49:52 +00:00
|
|
|
}
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
}
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
return CF_WRITE_OK;
|
2002-05-23 10:27:12 +00:00
|
|
|
|
|
|
|
fail:
|
2012-05-29 01:18:16 +00:00
|
|
|
if (fname_new != NULL) {
|
2012-05-24 02:16:53 +00:00
|
|
|
/* We were trying to write to a temporary file; get rid of it if it
|
|
|
|
exists. (We don't care whether this fails, as, if it fails,
|
|
|
|
there's not much we can do about it. I guess if it failed for
|
|
|
|
a reason other than "it doesn't exist", we could report an
|
|
|
|
error, so the user knows there's a junk file that they might
|
|
|
|
want to clean up.) */
|
|
|
|
ws_unlink(fname_new);
|
|
|
|
g_free(fname_new);
|
|
|
|
}
|
2009-12-14 22:05:29 +00:00
|
|
|
cf_callback_invoke(cf_cb_file_save_failed, NULL);
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
return CF_WRITE_ERROR;
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
}
|
|
|
|
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
cf_write_status_t
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
cf_export_specified_packets(capture_file *cf, const char *fname,
|
|
|
|
packet_range_t *range, guint save_format,
|
|
|
|
gboolean compressed)
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
{
|
2012-08-12 22:21:02 +00:00
|
|
|
gchar *fname_new = NULL;
|
|
|
|
int err;
|
|
|
|
wtap_dumper *pdh;
|
|
|
|
save_callback_args_t callback_args;
|
|
|
|
wtapng_section_t *shb_hdr;
|
|
|
|
wtapng_iface_descriptions_t *idb_inf;
|
|
|
|
int encap;
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
cf_callback_invoke(cf_cb_file_export_specified_packets_started, (gpointer)fname);
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
|
|
|
|
packet_range_process_init(range);
|
|
|
|
|
|
|
|
/* We're writing out specified packets from the specified capture
|
|
|
|
file to another file. Even if all captured packets are to be
|
|
|
|
written, don't special-case the operation - read each packet
|
|
|
|
and then write it out if it's one of the specified ones. */
|
|
|
|
|
|
|
|
shb_hdr = wtap_file_get_shb_info(cf->wth);
|
|
|
|
idb_inf = wtap_file_get_idb_info(cf->wth);
|
|
|
|
|
Add a routine that, given a set of packet encapsulation types, returns
the per-file encapsulation type needed to write out a set of packets
with all those encapsulation types. If there's only one such
encapsulation type, that's the type, otherwise WTAP_ENCAP_PER_PACKET is
needed. Use that in wtap_dump_can_write_encaps().
Also use it in cf_save_packets() and cf_export_specified_packets(), so
that we can write out files with WTAP_ENCAP_PER_PACKET as the file
encapsulation type and only one actual per-packet encapsulation type in
some cases where that failed before. This fixes the case that showed up
in bug 7505, although there are other cases where we *could* write out a
capture in a given file format but won't be able to do so; fixing those
will take more work.
#BACKPORT
(Note: this adds a routine to libwiretap, so, when backported, the
*minor* version of the library should be increased. Code that worked
with the version of the library prior to this change will continue to
work, so there's no need to change the *major* version of the library.)
svn path=/trunk/; revision=43847
2012-07-20 04:00:29 +00:00
|
|
|
/* Determine what file encapsulation type we should use. */
|
|
|
|
encap = wtap_dump_file_encap_type(cf->linktypes);
|
|
|
|
|
2012-05-24 02:16:53 +00:00
|
|
|
if (file_exists(fname)) {
|
|
|
|
/* We're overwriting an existing file; write out to a new file,
|
|
|
|
and, if that succeeds, rename the new file on top of the
|
|
|
|
old file. That makes this a "safe save", so that we don't
|
|
|
|
lose the old file if we have a problem writing out the new
|
|
|
|
file. (If the existing file is the current capture file,
|
|
|
|
we *HAVE* to do that, otherwise we're overwriting the file
|
|
|
|
from which we're reading the packets that we're writing!) */
|
|
|
|
fname_new = g_strdup_printf("%s~", fname);
|
Add a routine that, given a set of packet encapsulation types, returns
the per-file encapsulation type needed to write out a set of packets
with all those encapsulation types. If there's only one such
encapsulation type, that's the type, otherwise WTAP_ENCAP_PER_PACKET is
needed. Use that in wtap_dump_can_write_encaps().
Also use it in cf_save_packets() and cf_export_specified_packets(), so
that we can write out files with WTAP_ENCAP_PER_PACKET as the file
encapsulation type and only one actual per-packet encapsulation type in
some cases where that failed before. This fixes the case that showed up
in bug 7505, although there are other cases where we *could* write out a
capture in a given file format but won't be able to do so; fixing those
will take more work.
#BACKPORT
(Note: this adds a routine to libwiretap, so, when backported, the
*minor* version of the library should be increased. Code that worked
with the version of the library prior to this change will continue to
work, so there's no need to change the *major* version of the library.)
svn path=/trunk/; revision=43847
2012-07-20 04:00:29 +00:00
|
|
|
pdh = wtap_dump_open_ng(fname_new, save_format, encap, cf->snap,
|
2012-05-24 02:16:53 +00:00
|
|
|
compressed, shb_hdr, idb_inf, &err);
|
|
|
|
} else {
|
Add a routine that, given a set of packet encapsulation types, returns
the per-file encapsulation type needed to write out a set of packets
with all those encapsulation types. If there's only one such
encapsulation type, that's the type, otherwise WTAP_ENCAP_PER_PACKET is
needed. Use that in wtap_dump_can_write_encaps().
Also use it in cf_save_packets() and cf_export_specified_packets(), so
that we can write out files with WTAP_ENCAP_PER_PACKET as the file
encapsulation type and only one actual per-packet encapsulation type in
some cases where that failed before. This fixes the case that showed up
in bug 7505, although there are other cases where we *could* write out a
capture in a given file format but won't be able to do so; fixing those
will take more work.
#BACKPORT
(Note: this adds a routine to libwiretap, so, when backported, the
*minor* version of the library should be increased. Code that worked
with the version of the library prior to this change will continue to
work, so there's no need to change the *major* version of the library.)
svn path=/trunk/; revision=43847
2012-07-20 04:00:29 +00:00
|
|
|
pdh = wtap_dump_open_ng(fname, save_format, encap, cf->snap,
|
2012-05-24 02:16:53 +00:00
|
|
|
compressed, shb_hdr, idb_inf, &err);
|
|
|
|
}
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
g_free(idb_inf);
|
|
|
|
idb_inf = NULL;
|
|
|
|
|
|
|
|
if (pdh == NULL) {
|
|
|
|
cf_open_failure_alert_box(fname, err, NULL, TRUE, save_format);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add address resolution */
|
|
|
|
wtap_dump_set_addrinfo_list(pdh, get_addrinfo_list());
|
|
|
|
|
|
|
|
/* Iterate through the list of packets, processing the packets we were
|
|
|
|
told to process.
|
|
|
|
|
|
|
|
XXX - we've already called "packet_range_process_init(range)", but
|
|
|
|
"process_specified_packets()" will do it again. Fortunately,
|
|
|
|
that's harmless in this case, as we haven't done anything to
|
|
|
|
"range" since we initialized it. */
|
|
|
|
callback_args.pdh = pdh;
|
|
|
|
callback_args.fname = fname;
|
|
|
|
callback_args.file_type = save_format;
|
|
|
|
switch (process_specified_packets(cf, range, "Writing", "specified packets",
|
|
|
|
TRUE, save_packet, &callback_args)) {
|
|
|
|
|
|
|
|
case PSP_FINISHED:
|
|
|
|
/* Completed successfully. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSP_STOPPED:
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
/* The user decided to abort the saving.
|
|
|
|
If we're writing to a temporary file, remove it.
|
|
|
|
XXX - should we do so even if we're not writing to a
|
|
|
|
temporary file? */
|
|
|
|
wtap_dump_close(pdh, &err);
|
|
|
|
if (fname_new != NULL)
|
|
|
|
ws_unlink(fname_new);
|
|
|
|
cf_callback_invoke(cf_cb_file_export_specified_packets_stopped, NULL);
|
|
|
|
return CF_WRITE_ABORTED;
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PSP_FAILED:
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
/* Error while saving.
|
|
|
|
If we're writing to a temporary file, remove it. */
|
|
|
|
if (fname_new != NULL)
|
|
|
|
ws_unlink(fname_new);
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
wtap_dump_close(pdh, &err);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!wtap_dump_close(pdh, &err)) {
|
|
|
|
cf_close_failure_alert_box(fname, err);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2012-05-24 02:16:53 +00:00
|
|
|
if (fname_new != NULL) {
|
|
|
|
/* We wrote out to fname_new, and should rename it on top of
|
|
|
|
fname; fname is now closed, so that should be possible even
|
|
|
|
on Windows. Do the rename. */
|
|
|
|
if (ws_rename(fname_new, fname) == -1) {
|
|
|
|
/* Well, the rename failed. */
|
2012-06-17 22:32:03 +00:00
|
|
|
cf_rename_failure_alert_box(fname, errno);
|
2012-05-24 02:16:53 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
cf_callback_invoke(cf_cb_file_export_specified_packets_finished, NULL);
|
|
|
|
return CF_WRITE_OK;
|
"Save As" always saves everything and, when the save is done, makes the
new file the current file, as is the case in most if not all other GUI
applications.
A new "Export Specified Packets" menu option allows you to specify which
packets to write out, with the default being the displayed packets (and
those on which the displayed packets depend for, e.g. reassembly), and
never makes the resulting file the current file.
The two operations are conceptually distinct. Lumping them into one
menu item, with the default for "Save As" being "displayed packets only"
and thus making it behave like the latter operation, was causing some
confusion; see, for example, bug 6640.
Make the dialog popped up if you try to "Save As" or "Export Specified
Packets" on top of an existing file ask the "do you want to do this?"
question in the main part of the message, and note in the secondary text
that doing that will overwrite what's in the file; that matches what
TextEdit on OS X and the GNOME text editor say.
svn path=/trunk/; revision=42792
2012-05-22 22:17:57 +00:00
|
|
|
|
|
|
|
fail:
|
2012-05-29 01:18:16 +00:00
|
|
|
if (fname_new != NULL) {
|
2012-05-24 02:16:53 +00:00
|
|
|
/* We were trying to write to a temporary file; get rid of it if it
|
|
|
|
exists. (We don't care whether this fails, as, if it fails,
|
|
|
|
there's not much we can do about it. I guess if it failed for
|
|
|
|
a reason other than "it doesn't exist", we could report an
|
|
|
|
error, so the user knows there's a junk file that they might
|
|
|
|
want to clean up.) */
|
|
|
|
ws_unlink(fname_new);
|
|
|
|
g_free(fname_new);
|
|
|
|
}
|
Distinguish between "failed" and "user stopped it" for "save as" and
"export specified packets". For "failed", let the user try again with a
different file, in case it failed due to, for example, running out of
space or quota (probably the most likely failure mode for writing, and
trying to a different volume might be the best workaround). For "user
stopped it", presumably they don't want to try again (the most likely
reason is "it was taking too damn long").
Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're
doing "export specified packets".
In process_specified_packets(), allow a null range pointer to be
specified, meaning "save 'em all"; that avoids the possibly-expensive
(with a large capture) operation of initializing the range.
If a "safe save" atop an existing file fails or is stopped, get rid of
the temporary file we created.
svn path=/trunk/; revision=43095
2012-06-05 02:46:54 +00:00
|
|
|
cf_callback_invoke(cf_cb_file_export_specified_packets_failed, NULL);
|
|
|
|
return CF_WRITE_ERROR;
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
}
|
|
|
|
|
2004-02-11 02:02:38 +00:00
|
|
|
static void
|
|
|
|
cf_open_failure_alert_box(const char *filename, int err, gchar *err_info,
|
|
|
|
gboolean for_writing, int file_type)
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
{
|
2012-06-17 22:32:03 +00:00
|
|
|
gchar *display_basename;
|
|
|
|
|
2004-01-24 01:44:29 +00:00
|
|
|
if (err < 0) {
|
|
|
|
/* Wiretap error. */
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename = g_filename_display_basename(filename);
|
2004-01-24 01:44:29 +00:00
|
|
|
switch (err) {
|
2002-06-07 07:47:58 +00:00
|
|
|
|
2004-01-24 02:01:44 +00:00
|
|
|
case WTAP_ERR_NOT_REGULAR_FILE:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" is a \"special file\" or socket or other non-regular file.",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename);
|
2004-01-24 01:44:29 +00:00
|
|
|
break;
|
2002-07-16 07:15:09 +00:00
|
|
|
|
2004-01-24 01:44:29 +00:00
|
|
|
case WTAP_ERR_RANDOM_OPEN_PIPE:
|
|
|
|
/* Seen only when opening a capture file for reading. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2012-05-07 19:53:49 +00:00
|
|
|
"The file \"%s\" is a pipe or FIFO; Wireshark can't read pipe or FIFO files.\n"
|
|
|
|
"To capture from a pipe or FIFO use wireshark -i -",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename);
|
2004-01-24 01:44:29 +00:00
|
|
|
break;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
2004-01-24 01:44:29 +00:00
|
|
|
case WTAP_ERR_FILE_UNKNOWN_FORMAT:
|
|
|
|
/* Seen only when opening a capture file for reading. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" isn't a capture file in a format Wireshark understands.",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename);
|
2004-01-24 01:44:29 +00:00
|
|
|
break;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
case WTAP_ERR_UNSUPPORTED:
|
|
|
|
/* Seen only when opening a capture file for reading. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" isn't a capture file in a format Wireshark understands.\n"
|
|
|
|
"(%s)",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename, err_info);
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
g_free(err_info);
|
|
|
|
break;
|
|
|
|
|
2004-01-24 01:44:29 +00:00
|
|
|
case WTAP_ERR_CANT_WRITE_TO_PIPE:
|
|
|
|
/* Seen only when opening a capture file for writing. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" is a pipe, and %s capture files can't be "
|
|
|
|
"written to a pipe.",
|
2013-11-08 09:53:01 +00:00
|
|
|
display_basename, wtap_file_type_subtype_string(file_type));
|
2004-01-24 01:44:29 +00:00
|
|
|
break;
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
|
2004-01-24 01:44:29 +00:00
|
|
|
case WTAP_ERR_UNSUPPORTED_FILE_TYPE:
|
|
|
|
/* Seen only when opening a capture file for writing. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"Wireshark doesn't support writing capture files in that format.");
|
2004-01-24 01:44:29 +00:00
|
|
|
break;
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
|
2004-01-24 01:44:29 +00:00
|
|
|
case WTAP_ERR_UNSUPPORTED_ENCAP:
|
2004-02-11 02:02:38 +00:00
|
|
|
if (for_writing) {
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box("Wireshark can't save this capture in that format.");
|
2004-02-11 02:02:38 +00:00
|
|
|
} else {
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" is a capture for a network type that Wireshark doesn't support.\n"
|
|
|
|
"(%s)",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename, err_info);
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
g_free(err_info);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2004-01-24 01:44:29 +00:00
|
|
|
case WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED:
|
2004-02-11 02:02:38 +00:00
|
|
|
if (for_writing) {
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"Wireshark can't save this capture in that format.");
|
2004-02-11 02:02:38 +00:00
|
|
|
} else {
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" is a capture for a network type that Wireshark doesn't support.",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename);
|
2004-02-11 02:02:38 +00:00
|
|
|
}
|
2004-01-24 01:44:29 +00:00
|
|
|
break;
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
|
2011-12-13 09:53:50 +00:00
|
|
|
case WTAP_ERR_BAD_FILE:
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
/* Seen only when opening a capture file for reading. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" appears to be damaged or corrupt.\n"
|
|
|
|
"(%s)",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename, err_info);
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
g_free(err_info);
|
2004-01-24 01:44:29 +00:00
|
|
|
break;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
2004-01-24 01:44:29 +00:00
|
|
|
case WTAP_ERR_CANT_OPEN:
|
2004-02-11 02:02:38 +00:00
|
|
|
if (for_writing) {
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" could not be created for some unknown reason.",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename);
|
2004-02-11 02:02:38 +00:00
|
|
|
} else {
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" could not be opened for some unknown reason.",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename);
|
2004-02-11 02:02:38 +00:00
|
|
|
}
|
2004-01-24 01:44:29 +00:00
|
|
|
break;
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
|
2004-01-24 01:44:29 +00:00
|
|
|
case WTAP_ERR_SHORT_READ:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" appears to have been cut short"
|
|
|
|
" in the middle of a packet or other data.",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename);
|
2004-01-24 01:44:29 +00:00
|
|
|
break;
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
|
2004-01-24 01:44:29 +00:00
|
|
|
case WTAP_ERR_SHORT_WRITE:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"A full header couldn't be written to the file \"%s\".",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename);
|
2004-01-24 01:44:29 +00:00
|
|
|
break;
|
2000-07-20 05:10:02 +00:00
|
|
|
|
2005-09-14 21:57:30 +00:00
|
|
|
case WTAP_ERR_COMPRESSION_NOT_SUPPORTED:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2012-02-16 18:58:40 +00:00
|
|
|
"This file type cannot be written as a compressed file.");
|
2005-09-14 21:57:30 +00:00
|
|
|
break;
|
|
|
|
|
2011-04-21 09:41:52 +00:00
|
|
|
case WTAP_ERR_DECOMPRESS:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2011-04-21 09:41:52 +00:00
|
|
|
"The compressed file \"%s\" appears to be damaged or corrupt.\n"
|
2012-06-17 22:32:03 +00:00
|
|
|
"(%s)", display_basename, err_info);
|
2011-04-21 09:41:52 +00:00
|
|
|
g_free(err_info);
|
|
|
|
break;
|
|
|
|
|
2004-01-24 01:44:29 +00:00
|
|
|
default:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" could not be %s: %s.",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename,
|
2009-09-21 15:50:15 +00:00
|
|
|
for_writing ? "created" : "opened",
|
|
|
|
wtap_strerror(err));
|
2004-01-24 01:44:29 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-06-17 22:32:03 +00:00
|
|
|
g_free(display_basename);
|
2004-02-11 02:02:38 +00:00
|
|
|
} else {
|
|
|
|
/* OS error. */
|
|
|
|
open_failure_alert_box(filename, err, for_writing);
|
|
|
|
}
|
Improve the alert boxes put up for file open/read/write errors. (Some
influence came from
http://developer.apple.com/techpubs/mac/HIGuidelines/HIGuidelines-232.html
which has a section on dialog box and alert box messages. However,
we're largely dealing with technoids, not with The Rest Of Us, so I
didn't go as far as one perhaps should.)
Unfortunately, it looks like it's a bit more work to arrange that, if
you give a bad file name to the "-r" flag, the dialog box pop up only
*after* the main window pops up - it has the annoying habit of popping
up *before* the main window pops up, and sometimes getting *obscured* by
it, when I do that. The removal of the dialog box stuff from
"load_cap_file()" was intended to facilitate that work. (It might also
be nice if, when an open from the "File/Open" menu item fails, we keep
the file selection box open, and give the user a chance to correct
typos, choose another file name, etc.)
svn path=/trunk/; revision=310
1999-06-12 09:10:20 +00:00
|
|
|
}
|
|
|
|
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
/*
|
|
|
|
* XXX - whether we mention the source pathname, the target pathname,
|
|
|
|
* or both depends on the error and on what we find if we look for
|
|
|
|
* one or both of them.
|
|
|
|
*/
|
2012-06-17 22:32:03 +00:00
|
|
|
static void
|
|
|
|
cf_rename_failure_alert_box(const char *filename, int err)
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
{
|
2012-06-17 22:32:03 +00:00
|
|
|
gchar *display_basename;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename = g_filename_display_basename(filename);
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
switch (err) {
|
|
|
|
|
|
|
|
case ENOENT:
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
/* XXX - should check whether the source exists and, if not,
|
|
|
|
report it as the problem and, if so, report the destination
|
|
|
|
as the problem. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box("The path to the file \"%s\" doesn't exist.",
|
|
|
|
display_basename);
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case EACCES:
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
/* XXX - if we're doing a rename after a safe save, we should
|
|
|
|
probably say something else. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box("You don't have permission to move the capture file to \"%s\".",
|
|
|
|
display_basename);
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
We're an editor now, as we let you add, delete, and edit frame comments,
so "Save" should, for non-temporary files, mean "save the current state
of the capture file on top of the existing file" without prompting for a
file name.
That means we have to do a "safe save" - i.e, write the capture out to a
new file and, if that succeeds, rename the new file on top of the old
file - as the actual packet data to write out is in the file we're
overwriting, not in memory. (We'd want to do that anyway, of
course....)
Update some comments.
Clean up indentation slightly, and get rid of an unnecessary variable
(in all the cases where we use it, we assign it the same value, and that
value isn't modified out from under us before we use it).
Note that after a "Save", or a "Save As" that writes out all captured
packets, we shouldn't have to close the current file and open the new
file and reread it - we should be able to open the new file and update
the frame offsets in the frame_data structures.
Note that we need to do some a better job of reporting rename failures.
svn path=/trunk/; revision=42777
2012-05-22 10:36:40 +00:00
|
|
|
/* XXX - this should probably mention both the source and destination
|
|
|
|
pathnames. */
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box("The file \"%s\" could not be moved: %s.",
|
|
|
|
display_basename, wtap_strerror(err));
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-06-17 22:32:03 +00:00
|
|
|
g_free(display_basename);
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for write errors - if the file is being written to an NFS server,
|
|
|
|
a write error may not show up until the file is closed, as NFS clients
|
|
|
|
might not send writes to the server until the "write()" call finishes,
|
|
|
|
so that the write may fail on the server but the "write()" may succeed. */
|
2004-02-11 02:02:38 +00:00
|
|
|
static void
|
|
|
|
cf_close_failure_alert_box(const char *filename, int err)
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
{
|
2012-06-17 22:32:03 +00:00
|
|
|
gchar *display_basename;
|
|
|
|
|
2004-01-24 10:53:25 +00:00
|
|
|
if (err < 0) {
|
|
|
|
/* Wiretap error. */
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename = g_filename_display_basename(filename);
|
2004-01-24 10:53:25 +00:00
|
|
|
switch (err) {
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
2004-01-24 10:53:25 +00:00
|
|
|
case WTAP_ERR_CANT_CLOSE:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"The file \"%s\" couldn't be closed for some unknown reason.",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename);
|
2004-01-24 10:53:25 +00:00
|
|
|
break;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
2004-01-24 10:53:25 +00:00
|
|
|
case WTAP_ERR_SHORT_WRITE:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"Not all the packets could be written to the file \"%s\".",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename);
|
2004-01-24 10:53:25 +00:00
|
|
|
break;
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
|
2004-01-24 10:53:25 +00:00
|
|
|
default:
|
2012-06-17 22:32:03 +00:00
|
|
|
simple_error_message_box(
|
2009-09-21 15:50:15 +00:00
|
|
|
"An error occurred while closing the file \"%s\": %s.",
|
2012-06-17 22:32:03 +00:00
|
|
|
display_basename, wtap_strerror(err));
|
2004-01-24 10:53:25 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-06-17 22:32:03 +00:00
|
|
|
g_free(display_basename);
|
2004-01-24 10:53:25 +00:00
|
|
|
} else {
|
2004-02-11 02:02:38 +00:00
|
|
|
/* OS error.
|
|
|
|
We assume that a close error from the OS is really a write error. */
|
|
|
|
write_failure_alert_box(filename, err);
|
Allow the user to save either all of the current capture, or only the
packets that are currently being displayed from that capture.
Centralize the code to control whether "File:Save" and "File:Save As"
are enabled (and *always* have "File:Save As" enabled if you have a
capture; "File:Save" is enabled only if you have a live capture you've
not yet saved, although it does the same thing as "File:Save As").
Have the "save_file" member of a "capture_file" structure represent
*only* the file currently being *written* to by a capture, and, if there
is no capture currently in progress, have it be NULL; the name of the
file currently being *displayed" is in the "filename" member, and an
"is_tempfile" member indicates whether it's a temporary file for a live
capture or not.
Have "close_cap_file()" delete the current capture file if it's a
temporary capture file that hasn't been saved (in its entirety - saving
selected frames doesn't count). Do the same (if there *is* a current
capture file) when exiting.
The "Ready to load or capture" message is the only statusbar message in
the "main" context; "close_cap_file()" should never pop it, it should
only pop whatever message exists in the "file" context, and thus has no
need to take, as an argument, the context for the message it should pop.
Update the man page to reflect the new behavior of "File:Save" and
"File:Save As", and to reflect recent changes to "Display:Match Selected".
svn path=/trunk/; revision=1170
1999-11-30 20:50:15 +00:00
|
|
|
}
|
|
|
|
}
|
2000-08-03 12:44:40 +00:00
|
|
|
|
2004-09-02 19:52:39 +00:00
|
|
|
/* Reload the current capture file. */
|
2004-08-25 03:01:32 +00:00
|
|
|
void
|
2005-02-04 18:44:44 +00:00
|
|
|
cf_reload(capture_file *cf) {
|
2012-08-12 22:21:02 +00:00
|
|
|
gchar *filename;
|
|
|
|
gboolean is_tempfile;
|
|
|
|
int err;
|
2004-08-25 03:01:32 +00:00
|
|
|
|
|
|
|
/* If the file could be opened, "cf_open()" calls "cf_close()"
|
|
|
|
to get rid of state for the old capture file before filling in state
|
|
|
|
for the new capture file. "cf_close()" will remove the file if
|
|
|
|
it's a temporary file; we don't want that to happen (for one thing,
|
|
|
|
it'd prevent subsequent reopens from working). Remember whether it's
|
|
|
|
a temporary file, mark it as not being a temporary file, and then
|
|
|
|
reopen it as the type of file it was.
|
|
|
|
|
2005-02-04 18:44:44 +00:00
|
|
|
Also, "cf_close()" will free "cf->filename", so we must make
|
2004-08-25 03:01:32 +00:00
|
|
|
a copy of it first. */
|
2005-02-04 18:44:44 +00:00
|
|
|
filename = g_strdup(cf->filename);
|
|
|
|
is_tempfile = cf->is_tempfile;
|
|
|
|
cf->is_tempfile = FALSE;
|
|
|
|
if (cf_open(cf, filename, is_tempfile, &err) == CF_OK) {
|
2012-05-22 03:52:12 +00:00
|
|
|
switch (cf_read(cf, TRUE)) {
|
2005-02-04 18:44:44 +00:00
|
|
|
|
2005-02-05 12:50:47 +00:00
|
|
|
case CF_READ_OK:
|
|
|
|
case CF_READ_ERROR:
|
2004-08-25 03:01:32 +00:00
|
|
|
/* Just because we got an error, that doesn't mean we were unable
|
|
|
|
to read any of the file; we handle what we could get from the
|
|
|
|
file. */
|
|
|
|
break;
|
|
|
|
|
2005-02-05 12:50:47 +00:00
|
|
|
case CF_READ_ABORTED:
|
2004-08-25 03:01:32 +00:00
|
|
|
/* The user bailed out of re-reading the capture file; the
|
|
|
|
capture file has been closed - just free the capture file name
|
|
|
|
string and return (without changing the last containing
|
|
|
|
directory). */
|
|
|
|
g_free(filename);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else {
|
2005-02-04 18:44:44 +00:00
|
|
|
/* The open failed, so "cf->is_tempfile" wasn't set to "is_tempfile".
|
|
|
|
Instead, the file was left open, so we should restore "cf->is_tempfile"
|
2004-08-25 03:01:32 +00:00
|
|
|
ourselves.
|
|
|
|
|
|
|
|
XXX - change the menu? Presumably "cf_open()" will do that;
|
|
|
|
make sure it does! */
|
2005-02-04 18:44:44 +00:00
|
|
|
cf->is_tempfile = is_tempfile;
|
2004-08-25 03:01:32 +00:00
|
|
|
}
|
|
|
|
/* "cf_open()" made a copy of the file name we handed it, so
|
|
|
|
we should free up our copy. */
|
|
|
|
g_free(filename);
|
|
|
|
}
|
2010-04-01 21:55:01 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Editor modelines
|
|
|
|
*
|
|
|
|
* Local Variables:
|
|
|
|
* c-basic-offset: 2
|
2010-04-28 16:37:25 +00:00
|
|
|
* tab-width: 8
|
2010-04-01 21:55:01 +00:00
|
|
|
* indent-tabs-mode: nil
|
|
|
|
* End:
|
|
|
|
*
|
2011-09-21 17:49:11 +00:00
|
|
|
* ex: set shiftwidth=2 tabstop=8 expandtab:
|
2010-04-28 16:37:25 +00:00
|
|
|
* :indentSize=2:tabSize=8:noTabs=true:
|
2010-04-01 21:55:01 +00:00
|
|
|
*/
|