diff options
author | Michael Mann <mmann78@netscape.net> | 2017-04-04 10:43:51 -0400 |
---|---|---|
committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2017-04-05 07:13:17 +0000 |
commit | 9f71c86880cb5c3eab65c82e6fb3d32e603f3709 (patch) | |
tree | cc40d31c249ad449a53a6fb0a20709395078fb37 /epan | |
parent | 70eeeff25ce9aab6f4725d325e13aac690f48f00 (diff) | |
download | wireshark-9f71c86880cb5c3eab65c82e6fb3d32e603f3709.tar.gz |
A few more BASE_UNIT_STRING cases.
Change-Id: Ic443f773d19e63aad59292bfb540f58bda565241
Reviewed-on: https://code.wireshark.org/review/20917
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-ancp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-bfd.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee1722.c | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index 4204656fc5..69674fb2ef 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -674,8 +674,8 @@ proto_register_ancp(void) }, { &hf_ancp_timer, { "Timer", "ancp.timer", - FT_UINT8, BASE_DEC, - NULL, 0x0, + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, + &units_milliseconds, 0x0, NULL, HFILL } }, { &hf_ancp_adj_code, diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index 4eacc3ef76..d47c591682 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -310,7 +310,6 @@ dissect_bfd_authentication(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 24; guint8 auth_type; guint8 auth_len; - proto_item *ti = NULL; proto_item *auth_item = NULL; proto_tree *auth_tree = NULL; const guint8 *password; @@ -327,8 +326,7 @@ dissect_bfd_authentication(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(auth_tree, hf_bfd_auth_type, tvb, offset, 1, ENC_BIG_ENDIAN); - ti = proto_tree_add_item(auth_tree, hf_bfd_auth_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); - proto_item_append_text(ti, " bytes"); + proto_tree_add_item(auth_tree, hf_bfd_auth_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(auth_tree, hf_bfd_auth_key, tvb, offset + 2, 1, ENC_BIG_ENDIAN); } @@ -754,7 +752,7 @@ proto_register_bfd(void) }, { &hf_bfd_auth_len, { "Authentication Length", "bfd.auth.len", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &units_byte_bytes, 0x0, "The length, in bytes, of the authentication section", HFILL } }, { &hf_bfd_auth_key, diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index 360d99a575..a1256d94fc 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -576,7 +576,6 @@ static int dissect_1722_61883(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre offset += 4; ti_datalen = proto_tree_add_item_ret_uint(ti_61883_tree, hf_1722_61883_stream_data_length, tvb, offset, 2, ENC_BIG_ENDIAN, &datalen); - proto_item_append_text(ti_datalen, " bytes"); offset += 2; /* tag field defines if CIP header is included or not */ @@ -837,7 +836,7 @@ void proto_register_1722_61883(void) }, { &hf_1722_61883_stream_data_length, { "1394 Stream Data Length", "61883.stream_data_len", - FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } + FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &units_byte_bytes, 0x00, NULL, HFILL } }, { &hf_1722_61883_tag, { "1394 Packet Format Tag", "61883.tag", |