diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-12-10 22:19:29 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-12-10 22:19:29 +0000 |
| commit | 50582fc9f14baae6ce070a4c8afede51f4933f4c (patch) | |
| tree | 7c14448b49715a60aefc583ab03dc2796a151499 /epan/dissectors/packet-dmp.c | |
| parent | e04e1e7f67258fe2ee67aeb2719c6e1fed1d77be (diff) | |
Add an argument to abs_time_to_str() and abs_time_secs_to_str()
indicating whether the time should be shown as local time or UTC. For
now, always pass FALSE, meaning "show as local time".
Clean up some stuff in the SNMP dissector, use abs_time_secs_to_str()
for times with one-second resolution, and update a comment in various
macros in the WSP dissector, while we're at it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31227 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dmp.c')
| -rw-r--r-- | epan/dissectors/packet-dmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index 9085eee592..cd2edf3570 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -2498,7 +2498,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo, "Submission time: %s", (subm_time & 0x7FFF) >= 0x7FF8 ? "Reserved" : - abs_time_secs_to_str (dmp.subm_time)); + abs_time_secs_to_str (dmp.subm_time, FALSE)); field_tree = proto_item_add_subtree (tf, ett_envelope_subm_time); proto_tree_add_item (field_tree, hf_envelope_time_diff_present, tvb, offset, 2, FALSE); @@ -3357,7 +3357,7 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, proto_item_append_text (tf, "Reserved (0x%2.2x)", exp_time); } else { proto_item_append_text (tf, "%s (%s)", time_secs_to_str (secs), - abs_time_secs_to_str (dmp.subm_time + secs)); + abs_time_secs_to_str (dmp.subm_time + secs, FALSE)); } offset += 1; } @@ -3380,13 +3380,13 @@ static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo, proto_item_append_text (tf, "0 minutes in the %s (%s)", (dtg & 0x80) ? dtg_sign.true_string : dtg_sign.false_string, - abs_time_secs_to_str (dmp.subm_time)); + abs_time_secs_to_str (dmp.subm_time, FALSE)); } else { proto_item_append_text (tf, "%s in the %s (%s)", time_secs_to_str(secs), (dtg & 0x80) ? dtg_sign.true_string : dtg_sign.false_string, (dtg & 0x80) ? - abs_time_secs_to_str (dmp.subm_time + secs) : - abs_time_secs_to_str (dmp.subm_time - secs)); + abs_time_secs_to_str (dmp.subm_time + secs, FALSE) : + abs_time_secs_to_str (dmp.subm_time - secs, FALSE)); } offset += 1; } |