diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-05-21 06:33:25 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-05-21 06:33:25 +0000 |
| commit | 927b7da34668bc9c0b2dd4c339e45278fd109c77 (patch) | |
| tree | 7017587d5ae078490ee9b3be8ec6551e7df71d13 /epan/dissectors/packet-dtn.c | |
| parent | 4dcaf67f37f89d699a42089001f04c5daf9558e2 (diff) | |
Have abs_time_to_str() and abs_time_to_str_secs() take an additional
argument indicating whether to include the time zone in the string. If
we're constructing a display filter, don't include the time zone,
otherwise do. Fixes bug 4756.
svn path=/trunk/; revision=32913
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 0a5f7704ad..35da151088 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -1285,7 +1285,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, ABSOLUTE_TIME_LOCAL); + time_string = abs_time_secs_to_str(time_since_2000, ABSOLUTE_TIME_LOCAL, TRUE); proto_item_set_text(timestamp_item, "Timestamp: 0x%x [%s]", timestamp, time_string); offset += sdnv_length; @@ -2090,7 +2090,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, ABSOLUTE_TIME_LOCAL); + time_string = abs_time_secs_to_str(time_since_2000, ABSOLUTE_TIME_LOCAL, TRUE); proto_tree_add_text(tree, tvb, offset, sdnv_length, "%s (sec): %d [%s]", field_id, sdnv_value, time_string); offset += sdnv_length; @@ -2121,7 +2121,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, ABSOLUTE_TIME_LOCAL); + time_string = abs_time_secs_to_str(time_since_2000, ABSOLUTE_TIME_LOCAL, TRUE); proto_tree_add_text(tree, tvb, offset, sdnv_length, "%s: %d [%s]", field_id, sdnv_value, time_string); return sdnv_length; |