diff --git a/epan/column-utils.c b/epan/column-utils.c index 8c1ae75d30..3bb090a468 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -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 */ diff --git a/epan/column-utils.h b/epan/column-utils.h index 5e9372a3e0..bf1ed48ef8 100644 --- a/epan/column-utils.h +++ b/epan/column-utils.h @@ -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 diff --git a/epan/column.c b/epan/column.c index 47bc8e79e7..f64759b7cf 100644 --- a/epan/column.c +++ b/epan/column.c @@ -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 */ diff --git a/epan/column_info.h b/epan/column_info.h index 2b9ae6d759..ebca2deb00 100644 --- a/epan/column_info.h +++ b/epan/column_info.h @@ -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 */ diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 502db66481..67090c2dc7 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -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"); } diff --git a/epan/prefs.c b/epan/prefs.c index 5a59e293f5..ecff660ae8 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -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; diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index 9c41687cbe..0942219b21 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -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: