osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Custom columnfication: 

* Deprecate COL_DELTA_CONV_TIME (Delta time (conversation)). Use tcp.time_delta

svn path=/trunk/; revision=29524
This commit is contained in:
Kovarththanan Rajaratnam 2009-08-23 12:30:48 +00:00
parent b9cbd15469
commit 23d4eba3b1
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/column-utils.c
View File

@ -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);

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

@ -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.

3
epan/prefs.c
View File

@ -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;

2
gtk/new_packet_list.c
View File

@ -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: