diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-04-02 17:12:43 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-04-02 17:59:05 +0000 |
| commit | cf7979c657e728f01b26b635939013ed290e74ba (patch) | |
| tree | 83b576048a3164ca76d749ea0e24968f18ab9cbe /epan/dissectors/packet-wsp.c | |
| parent | a68cb9e90f23d88c6c200d6a9f45f66429fe1a5b (diff) | |
WSP: fix addition of X-Wap-Tod header in tree
Bug: 13546
Change-Id: Ie1e78cc7ada338b17a21a32714fed4816724a4f8
Reviewed-on: https://code.wireshark.org/review/20850
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-wsp.c')
| -rw-r--r-- | epan/dissectors/packet-wsp.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 27718ae249..f4778b9160 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -2388,7 +2388,6 @@ wkh_tod_value_header_func(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, pa { wkh_0a_Declarations; guint32 val = 0, off = val_start, len; - gchar *str; /* may not be freed! */ proto_item *ti = NULL; gchar* header_name = wmem_strdup_printf(wmem_packet_scope(), "Time of Day: %s", name); @@ -2410,14 +2409,16 @@ wkh_tod_value_header_func(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, pa if (val_id <= 4) { /* Length field already parsed by macro! */ get_date_value(val, tvb, off, len, ok); if (ok) { + nstime_t t; + t.secs = (time_t)val; + t.nsecs = 0; if (val == 0) { - proto_tree_add_string(tree, hf, - tvb, hdr_start, offset - hdr_start, + proto_tree_add_time_format_value(tree, hf, + tvb, hdr_start, offset - hdr_start, &t, "Requesting Time Of Day"); } else { - str = abs_time_secs_to_str(wmem_packet_scope(), val, ABSOLUTE_TIME_LOCAL, TRUE); - proto_tree_add_string(tree, hf, - tvb, hdr_start, offset - hdr_start, str); + proto_tree_add_time(tree, hf, + tvb, hdr_start, offset - hdr_start, &t); } } } |