osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Custom columnfication: 

* Deprecate COL_REL_CONV_TIME (Relative time (conversation)). Use tcp.time_relative

svn path=/trunk/; revision=29523
This commit is contained in:
Kovarththanan Rajaratnam 2009-08-23 12:24:14 +00:00
parent 55cf35e3a0
commit b9cbd15469
7 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/column-utils.c
View File

@ -1120,7 +1120,6 @@ col_set_fmt_time(frame_data *fd, column_info *cinfo, gint fmt, gint col)
col_set_delta_time_dis(fd, cinfo, col);
break;
case COL_REL_CONV_TIME:
case COL_DELTA_CONV_TIME:
/* Will be set by various dissectors */
break;
@ -1523,7 +1522,6 @@ col_fill_in(packet_info *pinfo, gboolean fill_fd_colums)
col_fill_in_frame_data(pinfo->fd, pinfo->cinfo, i);
break;
case COL_REL_CONV_TIME:
case COL_DELTA_CONV_TIME:
break; /* Will be set by various dissectors */

4
epan/column-utils.h
View File

@ -230,8 +230,8 @@ extern void col_append_sep_fstr(column_info *cinfo, gint col, const gchar *sep,
/** Set the given (relative) time to a column element.
*
* Used by multiple dissectors to set the time in the columns
* COL_REL_CONV_TIME and COL_DELTA_CONV_TIME
* Used by multiple dissectors to set the time in the column
* COL_DELTA_CONV_TIME
*
* @param cinfo the current packet row
* @param col the column to use, e.g. COL_INFO

4
epan/column.c
View File

@ -97,7 +97,7 @@ col_format_to_string(gint fmt) {
"%L", /* 47) COL_PACKET_LENGTH */
"%p", /* 48) COL_PROTOCOL */
"%Rt", /* 49) COL_REL_TIME */
"%rct", /* 50) COL_REL_CONV_TIME */
"%rct", /* 50) !! DEPRECATED !! - COL_REL_CONV_TIME */
"%s", /* 51) COL_DEF_SRC */
"%S", /* 52) COL_DEF_SRC_PORT */
"%rs", /* 53) COL_RES_SRC */
@ -167,7 +167,7 @@ static const gchar *dlist[NUM_COL_FMTS] = {
"Packet length (bytes)" , /* 47) COL_PACKET_LENGTH */
"Protocol", /* 48) COL_PROTOCOL */
"Relative time", /* 49) COL_REL_TIME */
"Relative time (conversation)", /* 50) COL_REL_CONV_TIME */
"Relative time (conversation)", /* 50) !! DEPRECATED !! - COL_REL_CONV_TIME */
"Source address", /* 51) COL_DEF_SRC */
"Source port", /* 52) COL_DEF_SRC_PORT */
"Src addr (resolved)", /* 53) COL_RES_SRC */

2
epan/column_info.h
View File

@ -116,7 +116,7 @@ enum {
COL_PACKET_LENGTH, /* 47) Packet length in bytes */
COL_PROTOCOL, /* 48) Protocol */
COL_REL_TIME, /* 49) Relative time */
COL_REL_CONV_TIME, /* 50) Relative time to beginning of conversation */
COL_REL_CONV_TIME, /* 50) !! DEPRECATED !! - Relative time to beginning of conversation */
COL_DEF_SRC, /* 51) Source address */
COL_DEF_SRC_PORT, /* 52) Source port */
COL_RES_SRC, /* 53) Resolved source */

7
epan/dissectors/packet-tcp.c
View File

@ -2994,8 +2994,6 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
struct tcp_per_packet_data_t *tcppd=NULL;
proto_item *item;
proto_tree *checksum_tree;
nstime_t ts;
tcph=ep_alloc(sizeof(struct tcpheader));
SET_ADDRESS(&tcph->ip_src, pinfo->src.type, pinfo->src.len, pinfo->src.data);
@ -3105,11 +3103,6 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tcp_calculate_timestamps(pinfo, tcpd, tcppd);
/* Fill the conversation timestamp columns */
if (tcpd) {
nstime_delta(&ts, &pinfo->fd->abs_ts, &tcpd->ts_first);
col_set_time(pinfo->cinfo, COL_REL_CONV_TIME, &ts, "tcp.time_relative");
}
if(tcppd)
col_set_time(pinfo->cinfo, COL_DELTA_CONV_TIME, &tcppd->ts_del, "tcp.time_delta");
}

3
epan/prefs.c
View File

@ -1756,7 +1756,8 @@ try_convert_to_custom_column(gpointer *el_data)
{ COL_HPUX_SUBSYS, "nettl.subsys" },
{ COL_HPUX_DEVID, "nettl.devid" },
{ COL_DSCP_VALUE, "ip.dsfield" },
{ COL_FR_DLCI, "fr.dlci" }
{ COL_FR_DLCI, "fr.dlci" },
{ COL_REL_CONV_TIME, "tcp.time_relative" }
};
guint haystack_idx;

1
gtk/new_packet_list.c
View File

@ -192,7 +192,6 @@ new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo
case COL_EXPERT: /* 20) Expert Info */
/* Will be set by various dissectors */
case COL_DELTA_CONV_TIME: /* 12) Delta time to last frame in conversation */
case COL_REL_CONV_TIME: /* 50) Relative time to beginning of conversation */
fdata->col_text[i] = se_strdup(cinfo->col_data[i]);
break;
default: