aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorsahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>2003-09-03 10:49:03 +0000
committersahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>2003-09-03 10:49:03 +0000
commite2bb7e9311076f8611a0d9108d6414048ef95253 (patch)
tree0808fac9442fde1325428c3bf52fd3fd92ffbc26 /epan
parent25493878d94ab97a34eff9032f5d23fbe133854a (diff)
And for Cal,
Ethereal presents a column to display culmulative bytes into the capture. A new column type is added : Culmulative Bytes. While PacketLength column type specifies the number of bytes in the current packet, Culmulative Bytes specifies the culmulative number of bytes from the start of the capture. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8359 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
-rw-r--r--epan/column-utils.c6
-rw-r--r--epan/column_info.h3
-rw-r--r--epan/frame_data.h3
3 files changed, 9 insertions, 3 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c
index 3b6634af2b..9f68dda50b 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -1,7 +1,7 @@
/* column-utils.c
* Routines for column utilities.
*
- * $Id: column-utils.c,v 1.37 2003/08/26 06:40:25 guy Exp $
+ * $Id: column-utils.c,v 1.38 2003/09/03 10:49:02 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -830,6 +830,10 @@ fill_in_columns(packet_info *pinfo)
strcpy(pinfo->cinfo->col_expr[i], "frame.pkt_len");
strcpy(pinfo->cinfo->col_expr_val[i], pinfo->cinfo->col_buf[i]);
break;
+ case COL_CULMULATIVE_BYTES:
+ snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "%u", pinfo->fd->cul_bytes);
+ pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i];
+ break;
case COL_OXID:
snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "0x%x", pinfo->oxid);
diff --git a/epan/column_info.h b/epan/column_info.h
index 8498fd1bba..2d3a1e9b65 100644
--- a/epan/column_info.h
+++ b/epan/column_info.h
@@ -1,7 +1,7 @@
/* column.h
* Definitions for column structures and routines
*
- * $Id: column_info.h,v 1.8 2003/04/16 04:52:53 guy Exp $
+ * $Id: column_info.h,v 1.9 2003/09/03 10:49:02 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -84,6 +84,7 @@ enum {
COL_PROTOCOL, /* Protocol */
COL_INFO, /* Description */
COL_PACKET_LENGTH, /* Packet length in bytes */
+ COL_CULMULATIVE_BYTES, /* Culmulative number of bytes */
COL_OXID, /* Fibre Channel OXID */
COL_RXID, /* Fibre Channel RXID */
COL_IF_DIR, /* FW-1 monitor interface/direction */
diff --git a/epan/frame_data.h b/epan/frame_data.h
index d2009e4275..fc68f0b6d9 100644
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -1,7 +1,7 @@
/* frame_data.h
* Definitions for frame_data structures and routines
*
- * $Id: frame_data.h,v 1.8 2003/07/08 05:29:42 tpot Exp $
+ * $Id: frame_data.h,v 1.9 2003/09/03 10:49:02 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -38,6 +38,7 @@ typedef struct _frame_data {
guint32 num; /* Frame number */
guint32 pkt_len; /* Packet length */
guint32 cap_len; /* Amount actually captured */
+ guint32 cul_bytes; /* Culmulative bytes into the capture */
gint32 rel_secs; /* Relative seconds (yes, it can be negative) */
gint32 rel_usecs; /* Relative microseconds (yes, it can be negative) */
guint32 abs_secs; /* Absolute seconds */