osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Mann 2017-04-04 10:43:51 -04:00 committed by Jaap Keuter
parent 70eeeff25c
commit 9f71c86880
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-ancp.c
View File

@ -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,

6
epan/dissectors/packet-bfd.c
View File

@ -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,

3
epan/dissectors/packet-ieee1722.c
View File

@ -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",