diff options
| author | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-03-23 18:08:17 +0000 |
|---|---|---|
| committer | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-03-23 18:08:17 +0000 |
| commit | ee2cc676a11553dc899953a0a074b07ba3812f3c (patch) | |
| tree | 49c7db39b4c44d02429daa16149f2ba63678af4e /epan/dissectors/packet-frame.c | |
| parent | 4a0cba066a6021188a8c8c3b8b00d5b6e3ae67fc (diff) | |
From Sake Blok:
Fix for bug #491: Unexpected frame.time_delta behavior
This patch ... fixes bug 491. It does this by changing the
behaviour of the frame.time_delta field so it reflects the delta
time between captured packets (tshark already did this). To keep
the delta time between displayed packets, the field
frame.time_delta_displayed is created.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21154 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-frame.c')
| -rw-r--r-- | epan/dissectors/packet-frame.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 59bd538728..778154606f 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -43,6 +43,7 @@ int proto_frame = -1; int hf_frame_arrival_time = -1; static int hf_frame_time_invalid = -1; static int hf_frame_time_delta = -1; +static int hf_frame_time_delta_displayed = -1; static int hf_frame_time_relative = -1; int hf_frame_number = -1; int hf_frame_packet_len = -1; /* Deprecated in favor of hf_frame_len */ @@ -195,12 +196,18 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) expert_add_info_format(pinfo, item, PI_MALFORMED, PI_WARN, "Arrival Time: Fractional second out of range (0-1000000000)"); } - ts = pinfo->fd->del_ts; + ts = pinfo->fd->del_cap_ts; item = proto_tree_add_time(fh_tree, hf_frame_time_delta, tvb, 0, 0, &ts); PROTO_ITEM_SET_GENERATED(item); + ts = pinfo->fd->del_dis_ts; + + item = proto_tree_add_time(fh_tree, hf_frame_time_delta_displayed, tvb, + 0, 0, &ts); + PROTO_ITEM_SET_GENERATED(item); + ts = pinfo->fd->rel_ts; item = proto_tree_add_time(fh_tree, hf_frame_time_relative, tvb, @@ -462,7 +469,12 @@ proto_register_frame(void) "The timestamp from the capture is out of the valid range", HFILL }}, { &hf_frame_time_delta, - { "Time delta from previous displayed frame", "frame.time_delta", FT_RELATIVE_TIME, BASE_NONE, NULL, + { "Time delta from previous captured frame", "frame.time_delta", FT_RELATIVE_TIME, BASE_NONE, NULL, + 0x0, + "Time delta from previous captured frame", HFILL }}, + + { &hf_frame_time_delta_displayed, + { "Time delta from previous displayed frame", "frame.time_delta_displayed", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "Time delta from previous displayed frame", HFILL }}, |