diff options
author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-22 14:50:43 +0000 |
---|---|---|
committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-22 14:50:43 +0000 |
commit | df61f09bd48ac7767c31834fc849716e618d4daf (patch) | |
tree | 8bbcd54faca11d364a7aa22b0c1ab2f50b32083f /epan/frame_data.c | |
parent | 71de8f3a061d436e33470c2c0a2cb71b147d249e (diff) |
Make frame_data_set_after_dissect() callers do the necessary checks instead
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30068 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/frame_data.c')
-rw-r--r-- | epan/frame_data.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/epan/frame_data.c b/epan/frame_data.c index 768dc4776e..72dbb3e74b 100644 --- a/epan/frame_data.c +++ b/epan/frame_data.c @@ -275,25 +275,22 @@ frame_data_set_after_dissect(frame_data *fdata, guint32 *cum_bytes, nstime_t *prev_dis_ts) { - if(fdata->flags.passed_dfilter || fdata->flags.ref_time) - { - /* This frame either passed the display filter list or is marked as - a time reference frame. All time reference frames are displayed - even if they dont pass the display filter */ - if(fdata->flags.ref_time){ - /* if this was a TIME REF frame we should reset the cul bytes field */ - *cum_bytes = fdata->pkt_len; - fdata->cum_bytes = *cum_bytes; - } else { - /* increase cum_bytes with this packets length */ - *cum_bytes += fdata->pkt_len; - fdata->cum_bytes = *cum_bytes; - } - - /* Set the time of the previous displayed frame to the time of this - frame. */ - *prev_dis_ts = fdata->abs_ts; + /* This frame either passed the display filter list or is marked as + a time reference frame. All time reference frames are displayed + even if they dont pass the display filter */ + if(fdata->flags.ref_time){ + /* if this was a TIME REF frame we should reset the cul bytes field */ + *cum_bytes = fdata->pkt_len; + fdata->cum_bytes = *cum_bytes; + } else { + /* increase cum_bytes with this packets length */ + *cum_bytes += fdata->pkt_len; + fdata->cum_bytes = *cum_bytes; } + + /* Set the time of the previous displayed frame to the time of this + frame. */ + *prev_dis_ts = fdata->abs_ts; } void |