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

Remove col_check() guard wrt. COL_REL_CONV_TIME/COL_DELTA_CONV_TIME 

svn path=/trunk/; revision=29508
This commit is contained in:
Kovarththanan Rajaratnam 2009-08-22 19:53:54 +00:00
parent 3d740a490f
commit 602e3a09e0
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3105,15 +3105,13 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tcp_calculate_timestamps(pinfo, tcpd, tcppd);
/* Fill the conversation timestamp columns */
if (tcpd && check_col(pinfo->cinfo, COL_REL_CONV_TIME)) {
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 (check_col(pinfo->cinfo, COL_DELTA_CONV_TIME)) {
if( tcppd )
col_set_time(pinfo->cinfo, COL_DELTA_CONV_TIME, &tcppd->ts_del, "tcp.time_delta");
}
if(tcppd)
col_set_time(pinfo->cinfo, COL_DELTA_CONV_TIME, &tcppd->ts_del, "tcp.time_delta");
}