diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-ncp-nmas.c | |
parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) |
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
svn path=/trunk/; revision=28770
Diffstat (limited to 'epan/dissectors/packet-ncp-nmas.c')
-rw-r--r-- | epan/dissectors/packet-ncp-nmas.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index 689b8d6def..812e719eec 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -662,124 +662,124 @@ proto_register_nmas(void) static hf_register_info hf_nmas[] = { { &hf_func, { "Function", "nmas.func", FT_UINT8, BASE_HEX, NULL, 0x0, - "Function", HFILL }}, + NULL, HFILL }}, { &hf_subfunc, { "Subfunction", "nmas.subfunc", FT_UINT8, BASE_HEX, NULL, 0x0, - "Subfunction", HFILL }}, + NULL, HFILL }}, { &hf_ping_version, { "Ping Version", "nmas.ping_version", FT_UINT32, BASE_HEX, NULL, 0x0, - "Ping Version", HFILL }}, + NULL, HFILL }}, { &hf_ping_flags, { "Flags", "nmas.ping_flags", FT_UINT32, BASE_HEX, NULL, 0x0, - "Flags", HFILL }}, + NULL, HFILL }}, { &hf_frag_handle, { "Fragment Handle", "nmas.frag_handle", FT_UINT32, BASE_HEX, NULL, 0x0, - "Fragment Handle", HFILL }}, + NULL, HFILL }}, { &hf_length, { "Length", "nmas.length", FT_UINT32, BASE_DEC, NULL, 0x0, - "Length", HFILL }}, + NULL, HFILL }}, { &hf_subverb, { "Sub Verb", "nmas.subverb", FT_UINT32, BASE_HEX, VALS(nmas_subverb_enum), 0x0, - "Sub Verb", HFILL }}, + NULL, HFILL }}, { &hf_tree, { "Tree", "nmas.tree", FT_STRING, BASE_NONE, NULL, 0x0, - "Tree", HFILL }}, + NULL, HFILL }}, { &hf_user, { "User", "nmas.user", FT_STRING, BASE_NONE, NULL, 0x0, - "User", HFILL }}, + NULL, HFILL }}, { &hf_nmas_version, { "NMAS Protocol Version", "nmas.version", FT_UINT32, BASE_HEX, NULL, 0x0, - "NMAS Protocol Version", HFILL }}, + NULL, HFILL }}, { &hf_msg_version, { "Message Version", "nmas.msg_version", FT_UINT32, BASE_HEX, NULL, 0x0, - "Message Version", HFILL }}, + NULL, HFILL }}, { &hf_session_ident, { "Session Identifier", "nmas.session_ident", FT_UINT32, BASE_HEX, NULL, 0x0, - "Session Identifier", HFILL }}, + NULL, HFILL }}, { &hf_msg_verb, { "Message Verb", "nmas.msg_verb", FT_UINT8, BASE_HEX, VALS(nmas_msgverb_enum), 0x0, - "Message Verb", HFILL }}, + NULL, HFILL }}, { &hf_attribute, { "Attribute Type", "nmas.attribute", FT_UINT32, BASE_DEC, VALS(nmas_attribute_enum), 0x0, - "Attribute Type", HFILL }}, + NULL, HFILL }}, { &hf_clearance, { "Requested Clearance", "nmas.clearance", FT_STRING, BASE_NONE, NULL, 0x0, - "Requested Clearance", HFILL }}, + NULL, HFILL }}, { &hf_login_sequence, { "Requested Login Sequence", "nmas.login_seq", FT_STRING, BASE_NONE, NULL, 0x0, - "Requested Login Sequence", HFILL }}, + NULL, HFILL }}, { &hf_opaque, { "Opaque Data", "nmas.opaque", FT_BYTES, BASE_NONE, NULL, 0x0, - "Opaque Data", HFILL }}, + NULL, HFILL }}, { &hf_data, { "Data", "nmas.data", FT_BYTES, BASE_NONE, NULL, 0x0, - "Data", HFILL }}, + NULL, HFILL }}, { &hf_return_code, { "Return Code", "nmas.return_code", FT_UINT32, BASE_HEX, VALS(nmas_errors_enum), 0x0, - "Return Code", HFILL }}, + NULL, HFILL }}, { &hf_lsm_verb, { "Login Store Message Verb", "nmas.lsm_verb", FT_UINT8, BASE_HEX, VALS(nmas_lsmverb_enum), 0x0, - "Login Store Message Verb", HFILL }}, + NULL, HFILL }}, { &hf_squeue_bytes, { "Server Queue Number of Bytes", "nmas.squeue_bytes", FT_UINT32, BASE_DEC, NULL, 0x0, - "Server Queue Number of Bytes", HFILL }}, + NULL, HFILL }}, { &hf_cqueue_bytes, { "Client Queue Number of Bytes", "nmas.cqueue_bytes", FT_UINT32, BASE_DEC, NULL, 0x0, - "Client Queue Number of Bytes", HFILL }}, + NULL, HFILL }}, { &hf_num_creds, { "Number of Credentials", "nmas.num_creds", FT_UINT32, BASE_DEC, NULL, 0x0, - "Number of Credentials", HFILL }}, + NULL, HFILL }}, { &hf_cred_type, { "Credential Type", "nmas.cred_type", FT_UINT32, BASE_DEC, NULL, 0x0, - "Credential Type", HFILL }}, + NULL, HFILL }}, { &hf_login_state, { "Login State", "nmas.login_state", FT_UINT32, BASE_DEC, NULL, 0x0, - "Login State", HFILL }}, + NULL, HFILL }}, { &hf_enc_cred, { "Encrypted Credential", "nmas.enc_cred", FT_BYTES, BASE_NONE, NULL, 0x0, - "Encrypted Credential", HFILL }}, + NULL, HFILL }}, { &hf_enc_data, { "Encrypted Data", "nmas.enc_data", FT_BYTES, BASE_NONE, NULL, 0x0, - "Encrypted Data", HFILL }}, + NULL, HFILL }}, { &hf_reply_buffer_size, { "Reply Buffer Size", "nmas.buf_size", FT_UINT32, BASE_DEC, NULL, 0x0, - "Reply Buffer Size", HFILL }}, + NULL, HFILL }}, { &hf_encrypt_error, { "Payload Error", "nmas.encrypt_error", FT_UINT32, BASE_HEX, VALS(nmas_errors_enum), 0x0, |