diff options
author | Guy Harris <guy@alum.mit.edu> | 2009-12-10 22:19:29 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2009-12-10 22:19:29 +0000 |
commit | 4fde145bd2dceda9edf1f231a57794965ddc0bd7 (patch) | |
tree | 7c14448b49715a60aefc583ab03dc2796a151499 /epan/dissectors/packet-dtn.c | |
parent | e1a76d5e2bfd3ecf9ab082a46dc2aa9c4bd4d4e2 (diff) | |
download | wireshark-4fde145bd2dceda9edf1f231a57794965ddc0bd7.tar.gz wireshark-4fde145bd2dceda9edf1f231a57794965ddc0bd7.tar.bz2 wireshark-4fde145bd2dceda9edf1f231a57794965ddc0bd7.zip |
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.
svn path=/trunk/; revision=31227
Diffstat (limited to 'epan/dissectors/packet-dtn.c')
-rw-r--r-- | epan/dissectors/packet-dtn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index 6d8dd5026c..0a38fd12d3 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -1286,7 +1286,7 @@ dissect_version_5_primary_header(packet_info *pinfo, return 0; } time_since_2000 = (time_t) (timestamp + 946684800); - time_string = abs_time_secs_to_str(time_since_2000); + time_string = abs_time_secs_to_str(time_since_2000, FALSE); proto_item_set_text(timestamp_item, "Timestamp: 0x%x [%s]", timestamp, time_string); offset += sdnv_length; @@ -2093,7 +2093,7 @@ add_dtn_time_to_tree(proto_tree *tree, tvbuff_t *tvb, int offset, char *field_id return 0; } time_since_2000 = (time_t) (sdnv_value + 946684800); - time_string = abs_time_secs_to_str(time_since_2000); + time_string = abs_time_secs_to_str(time_since_2000, FALSE); proto_tree_add_text(tree, tvb, offset, sdnv_length, "%s (sec): %d [%s]", field_id, sdnv_value, time_string); offset += sdnv_length; @@ -2124,7 +2124,7 @@ add_sdnv_time_to_tree(proto_tree *tree, tvbuff_t *tvb, int offset, char *field_i return 0; } time_since_2000 = (time_t) (sdnv_value + 946684800); - time_string = abs_time_secs_to_str(time_since_2000); + time_string = abs_time_secs_to_str(time_since_2000, FALSE); proto_tree_add_text(tree, tvb, offset, sdnv_length, "%s: %d [%s]", field_id, sdnv_value, time_string); return sdnv_length; |