diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-02-09 02:27:41 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-02-09 02:27:41 +0000 |
| commit | 1d78fa36741df04576637efbf9411e2b727d2a6f (patch) | |
| tree | 816ebf3404824f2e0d482636064a9a5c65a57e2d /epan/dissectors/packet-rtp.c | |
| parent | d49271b556e866adb112027b56daa0672941723c (diff) | |
Add NTP times using proto_tree_add_item().
Replace a couple not-very-descriptive blurbs with NULL.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35883 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-rtp.c')
| -rw-r--r-- | epan/dissectors/packet-rtp.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 11832a5bf1..1c8f992b02 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -67,7 +67,6 @@ #include "packet-rtp.h" #include <epan/rtp_pt.h> -#include "packet-ntp.h" #include <epan/conversation.h> #include <epan/reassemble.h> #include <epan/tap.h> @@ -1626,15 +1625,14 @@ dissect_pkt_ccc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti = NULL; proto_tree *pkt_ccc_tree = NULL; - const guint8 *ptime = tvb_get_ptr(tvb, 4, 8); if ( tree ) { ti = proto_tree_add_item(tree, proto_pkt_ccc, tvb, 0, 12, FALSE); pkt_ccc_tree = proto_item_add_subtree(ti, ett_pkt_ccc); proto_tree_add_item(pkt_ccc_tree, hf_pkt_ccc_id, tvb, 0, 4, FALSE); - proto_tree_add_bytes_format(pkt_ccc_tree, hf_pkt_ccc_ts, tvb, - 4, 8, ptime, "NTP timestamp: %s", ntp_fmt_ts(ptime)); + proto_tree_add_item(pkt_ccc_tree, hf_pkt_ccc_ts, tvb, 4, 8, + ENC_TIME_NTP|ENC_BIG_ENDIAN); } dissect_rtp(tvb, pinfo, tree); @@ -1657,7 +1655,7 @@ proto_register_pkt_ccc(void) BASE_DEC, NULL, 0x0, - "CCC_ID", HFILL + NULL, HFILL } }, { @@ -1665,11 +1663,11 @@ proto_register_pkt_ccc(void) { "PacketCable CCC Timestamp", "pkt_ccc.ts", - FT_BYTES, - BASE_NONE, + FT_ABSOLUTE_TIME, + ABSOLUTE_TIME_UTC, NULL, 0x0, - "Timestamp", HFILL + NULL, HFILL } }, |