diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-23 12:30:48 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-23 12:30:48 +0000 |
| commit | 23d4eba3b106d7cc8ba77773376ae1bc05d3ff03 (patch) | |
| tree | 9b8c974e2e176951c50c3342f889e1bfb8392d16 | |
| parent | b9cbd15469220b18b198b19d182b72827ae10911 (diff) | |
Custom columnfication:
* Deprecate COL_DELTA_CONV_TIME (Delta time (conversation)). Use tcp.time_delta
svn path=/trunk/; revision=29524
| -rw-r--r-- | epan/column-utils.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-tcp.c | 5 | ||||
| -rw-r--r-- | epan/prefs.c | 3 | ||||
| -rw-r--r-- | gtk/new_packet_list.c | 2 |
4 files changed, 2 insertions, 15 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 3bb090a468..d87e492fff 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1120,10 +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_DELTA_CONV_TIME: - /* Will be set by various dissectors */ - break; - default: g_assert_not_reached(); break; @@ -1522,9 +1518,6 @@ col_fill_in(packet_info *pinfo, gboolean fill_fd_colums) col_fill_in_frame_data(pinfo->fd, pinfo->cinfo, i); break; - case COL_DELTA_CONV_TIME: - break; /* Will be set by various dissectors */ - case COL_DEF_SRC: case COL_RES_SRC: /* COL_DEF_SRC is currently just like COL_RES_SRC */ col_set_addr(pinfo, i, &pinfo->src, TRUE, TRUE); diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 67090c2dc7..e7128d2ebe 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -3101,13 +3101,8 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (!(pinfo->fd->flags.visited)) tcp_calculate_timestamps(pinfo, tcpd, tcppd); - - /* Fill the conversation timestamp columns */ - if(tcppd) - col_set_time(pinfo->cinfo, COL_DELTA_CONV_TIME, &tcppd->ts_del, "tcp.time_delta"); } - /* * If we've been handed an IP fragment, we don't know how big the TCP * segment is, so don't do anything that requires that we know that. diff --git a/epan/prefs.c b/epan/prefs.c index ecff660ae8..4235c03abd 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1757,7 +1757,8 @@ try_convert_to_custom_column(gpointer *el_data) { COL_HPUX_DEVID, "nettl.devid" }, { COL_DSCP_VALUE, "ip.dsfield" }, { COL_FR_DLCI, "fr.dlci" }, - { COL_REL_CONV_TIME, "tcp.time_relative" } + { COL_REL_CONV_TIME, "tcp.time_relative" }, + { COL_DELTA_CONV_TIME, "tcp.time_delta" } }; guint haystack_idx; diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index 0942219b21..bd431945a1 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -190,8 +190,6 @@ new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo /* done by expert.c */ 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 */ fdata->col_text[i] = se_strdup(cinfo->col_data[i]); break; default: |