/* proto_hier_stats.c
* Routines for calculating statistics based on protocol.
*
- * $Id: proto_hier_stats.c,v 1.14 2002/07/30 10:13:14 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
#include "globals.h"
#include "proto_hier_stats.h"
#include "progress_dlg.h"
+#include "simple_dialog.h"
#include <epan/epan_dissect.h>
#include <wtap.h>
#define STAT_NODE_STATS(n) ((ph_stats_node_t*)(n)->data)
#define STAT_NODE_HFINFO(n) (STAT_NODE_STATS(n)->hfinfo)
+static double
+secs_usecs(guint32 s, guint32 us)
+{
+ return (us / 1000000.0) + (double)s;
+}
+
static GNode*
find_stat_node(GNode *parent_stat_node, header_field_info *needle_hfinfo)
{
static void
-process_node(proto_item *ptree_node, GNode *parent_stat_node, ph_stats_t *ps, guint pkt_len)
+process_node(proto_node *ptree_node, GNode *parent_stat_node, ph_stats_t *ps, guint pkt_len)
{
field_info *finfo;
- ph_stats_node_t *stats;
- proto_item *proto_sibling_node;
+ ph_stats_node_t *stats;
+ proto_node *proto_sibling_node;
GNode *stat_node;
finfo = PITEM_FINFO(ptree_node);
g_assert(finfo);
stat_node = find_stat_node(parent_stat_node, finfo->hfinfo);
-
+
/* Assert that the finfo is related to a protocol, not a field. */
g_assert(finfo->hfinfo->parent == -1);
stats->num_pkts_total++;
stats->num_bytes_total += pkt_len;
- proto_sibling_node = g_node_next_sibling(ptree_node);
+ proto_sibling_node = ptree_node->next;
if (proto_sibling_node) {
process_node(proto_sibling_node, stat_node, ps, pkt_len);
static void
process_tree(proto_tree *protocol_tree, ph_stats_t* ps, guint pkt_len)
{
- proto_item *ptree_node;
+ proto_node *ptree_node;
- ptree_node = g_node_first_child(protocol_tree);
+ ptree_node = ((proto_node *)protocol_tree)->first_child;
if (!ptree_node) {
return;
}
process_node(ptree_node, ps->stats_tree, ps, pkt_len);
}
-static void
+static gboolean
process_frame(frame_data *frame, column_info *cinfo, ph_stats_t* ps)
{
epan_dissect_t *edt;
union wtap_pseudo_header phdr;
guint8 pd[WTAP_MAX_PACKET_SIZE];
int err;
+ gchar *err_info;
+ double cur_time;
/* Load the frame from the capture file */
- /* XX - do something with "err" */
- wtap_seek_read(cfile.wth, frame->file_off, &phdr,
- pd, frame->cap_len, &err);
+ if (!wtap_seek_read(cfile.wth, frame->file_off, &phdr, pd,
+ frame->cap_len, &err, &err_info)) {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ cf_read_error_message(err, err_info), cfile.filename);
+ return FALSE; /* failure */
+ }
/* Dissect the frame */
edt = epan_dissect_new(TRUE, FALSE);
/* Get stats from this protocol tree */
process_tree(edt->tree, ps, frame->pkt_len);
+ /* Update times */
+ cur_time = secs_usecs(frame->abs_secs, frame->abs_usecs);
+ if (cur_time < ps->first_time) {
+ ps->first_time = cur_time;
+ }
+ if (cur_time > ps->last_time){
+ ps->last_time = cur_time;
+ }
+
/* Free our memory. */
epan_dissect_free(edt);
-}
-
+ return TRUE; /* success */
+}
ph_stats_t*
ph_stats_new(void)
guint tot_packets, tot_bytes;
progdlg_t *progbar = NULL;
gboolean stop_flag;
- long count;
+ int count;
float prog_val;
GTimeVal start_time;
+ gchar status_str[100];
+ int progbar_nextstep;
+ int progbar_quantum;
/* Initialize the data */
ps = g_new(ph_stats_t, 1);
ps->tot_packets = 0;
ps->tot_bytes = 0;
ps->stats_tree = g_node_new(NULL);
+ ps->first_time = 0.0;
+ ps->last_time = 0.0;
/* Update the progress bar when it gets to this value. */
- cfile.progbar_nextstep = 0;
+ progbar_nextstep = 0;
/* When we reach the value that triggers a progress bar update,
bump that value by this amount. */
- cfile.progbar_quantum = cfile.count/N_PROGBAR_UPDATES;
+ progbar_quantum = cfile.count/N_PROGBAR_UPDATES;
/* Count of packets at which we've looked. */
count = 0;
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 (count >= cfile.progbar_nextstep) {
+ if (count >= progbar_nextstep) {
/* let's not divide by zero. I should never be started
* with count == 0, so let's assert that
*/
if (progbar == NULL)
/* Create the progress bar if necessary */
progbar = delayed_create_progress_dlg(
- "Computing protocol statistics", "Stop",
+ "Computing", "protocol hierarchy statistics",
&stop_flag, &start_time, prog_val);
- if (progbar != NULL)
- update_progress_dlg(progbar, prog_val);
+ if (progbar != NULL) {
+ g_snprintf(status_str, sizeof(status_str),
+ "%4u of %u frames", count, cfile.count);
+ update_progress_dlg(progbar, prog_val, status_str);
+ }
- cfile.progbar_nextstep += cfile.progbar_quantum;
+ progbar_nextstep += progbar_quantum;
}
if (stop_flag) {
probably do so for other loops (see "file.c") that
look only at those packets. */
if (frame->flags.passed_dfilter) {
- process_frame(frame, &cfile.cinfo, ps);
+
+ if (tot_packets == 0) {
+ double cur_time = secs_usecs(frame->abs_secs,
+ frame->abs_usecs);
+ ps->first_time = cur_time;
+ ps->last_time = cur_time;
+ }
+
+ if (!process_frame(frame, &cfile.cinfo, ps)) {
+ /*
+ * Give up, and set "stop_flag" so we
+ * just abort rather than popping up
+ * the statistics window.
+ */
+ stop_flag = TRUE;
+ break;
+ }
tot_packets++;
tot_bytes += frame->pkt_len;
git.samba.org / obnox / wireshark / wip.git / blobdiff