From c3af1555bb4c1eb47d86a0576d3dd7944572e6f5 Mon Sep 17 00:00:00 2001 From: stig Date: Thu, 18 Jun 2009 21:30:42 +0000 Subject: From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-ipmi-session.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'epan/dissectors/packet-ipmi-session.c') diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c index 8147721a09..2310e2f8bf 100644 --- a/epan/dissectors/packet-ipmi-session.c +++ b/epan/dissectors/packet-ipmi-session.c @@ -270,40 +270,40 @@ proto_register_ipmi_session(void) static hf_register_info hf[] = { { &hf_ipmi_session_authtype, { "Authentication Type", "ipmi.session.authtype", - FT_UINT8, BASE_HEX, VALS(ipmi_authtype_vals), 0, "", HFILL }}, + FT_UINT8, BASE_HEX, VALS(ipmi_authtype_vals), 0, NULL, HFILL }}, { &hf_ipmi_session_payloadtype,{ "Payload Type", "ipmi.session.payloadtype", - FT_UINT8, BASE_HEX, VALS(ipmi_payload_vals), 0x3f, "", HFILL }}, + FT_UINT8, BASE_HEX, VALS(ipmi_payload_vals), 0x3f, NULL, HFILL }}, { &hf_ipmi_session_payloadtype_auth,{ "Authenticated","ipmi.session.payloadtype.auth", - FT_BOOLEAN,8, TFS(&ipmi_payload_aut_val), 0x40, "", HFILL }}, + FT_BOOLEAN,8, TFS(&ipmi_payload_aut_val), 0x40, NULL, HFILL }}, { &hf_ipmi_session_payloadtype_enc,{ "Encryption","ipmi.session.payloadtype.enc", - FT_BOOLEAN,8, TFS(&ipmi_payload_enc_val), 0x80, "", HFILL }}, + FT_BOOLEAN,8, TFS(&ipmi_payload_enc_val), 0x80, NULL, HFILL }}, { &hf_ipmi_session_oem_iana, { "OEM IANA", "ipmi.session.oem.iana", - FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ipmi_session_oem_payload_id, { "OEM Payload ID", "ipmi.session.oem.payloadid", - FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ipmi_session_sequence, { "Session Sequence Number", "ipmi.session.sequence", - FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }}, + FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_ipmi_session_id, { "Session ID", "ipmi.session.id", - FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }}, + FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_ipmi_session_authcode, { "Authentication Code", "ipmi.session.authcode", - FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_ipmi_session_msg_len_1b, { "Message Length", "ipmi.msg.len", - FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }}, + FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ipmi_session_msg_len_2b, { "Message Length", "ipmi.msg.len", - FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }}, + FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ipmi_session_trailer, { "IPMI Session Wrapper (trailer)", "ipmi.sess.trailer", - FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }}, + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, }; static gint *ett[] = { &ett_ipmi_session, &ett_ipmi_session_payloadtype }; -- cgit v1.2.3