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-dhcpv6.c | |
| parent | 4dcaf67f37f89d699a42089001f04c5daf9558e2 (diff) | |
| download | wireshark-927b7da34668bc9c0b2dd4c339e45278fd109c77.tar.gz | |
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-dhcpv6.c')
| -rw-r--r-- | epan/dissectors/packet-dhcpv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index bf57278f99..a6be1191f1 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -1127,7 +1127,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, /* XXX seconds since Jan 1 2000 */ proto_tree_add_text(subtree, tvb, off + 4, 4, "Time: %s", - abs_time_secs_to_str(tvb_get_ntohl(tvb, off + 4)+630822816U, ABSOLUTE_TIME_LOCAL)); + abs_time_secs_to_str(tvb_get_ntohl(tvb, off + 4)+630822816U, ABSOLUTE_TIME_LOCAL, TRUE)); if (optlen > 8) { proto_tree_add_text(subtree, tvb, off + 8, optlen - 8, "Link-layer address: %s", |