diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
| commit | c3af1555bb4c1eb47d86a0576d3dd7944572e6f5 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-m2tp.c | |
| parent | 8210e1b06b7f866f3bc60e22b8fb54a12adba06c (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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-m2tp.c')
| -rw-r--r-- | epan/dissectors/packet-m2tp.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c index 596a318d0e..eb6bfa5609 100644 --- a/epan/dissectors/packet-m2tp.c +++ b/epan/dissectors/packet-m2tp.c @@ -566,87 +566,87 @@ proto_register_m2tp(void) { &hf_m2tp_version, { "Version", "m2tp.version", FT_UINT8, BASE_DEC, VALS(m2tp_protocol_version_values), 0x0, - "", HFILL} + NULL, HFILL} }, { &hf_m2tp_reserved, { "Reserved", "m2tp.reserved", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL} + NULL, HFILL} }, { &hf_m2tp_message_class, { "Message class", "m2tp.message_class", FT_UINT8, BASE_DEC, VALS(m2tp_message_class_values), 0x0, - "", HFILL} + NULL, HFILL} }, { &hf_m2tp_message_type, { "Message Type", "m2tp.message_type", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL} + NULL, HFILL} }, { &hf_m2tp_message_length, { "Message length", "m2tp.message_length", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL} + NULL, HFILL} }, { &hf_m2tp_parameter_tag, { "Parameter Tag", "m2tp.parameter_tag", FT_UINT16, BASE_DEC, VALS(m2tp_parameter_tag_values), 0x0, - "", HFILL} + NULL, HFILL} }, { &hf_m2tp_parameter_length, { "Parameter length", "m2tp.parameter_length", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL} + NULL, HFILL} }, { &hf_m2tp_parameter_value, { "Parameter Value", "m2tp.parameter_value", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_m2tp_parameter_padding, { "Padding", "m2tp.parameter_padding", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_m2tp_interface_identifier, { "Interface Identifier", "m2tp.interface_identifier", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL} + NULL, HFILL} }, { &hf_m2tp_user, { "M2tp User Identifier", "m2tp.user_identifier", FT_UINT32, BASE_DEC, VALS(m2tp_user_identifier_values), 0x0, - "", HFILL} + NULL, HFILL} }, { &hf_m2tp_master_slave, { "Master Slave Indicator", "m2tp.master_slave", FT_UINT32, BASE_DEC, VALS(m2tp_mode_values), 0x0, - "", HFILL} + NULL, HFILL} }, { &hf_m2tp_info_string, { "Info string", "m2tp.info_string", - FT_STRING, BASE_DEC, NULL, 0x0, - "", HFILL} + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL} }, { &hf_m2tp_diagnostic_info, { "Diagnostic information", "m2tp.diagnostic_info", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_m2tp_heartbeat_data, { "Heartbeat data", "m2tp.heartbeat_data", FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_m2tp_error_code, { "Error code", "m2tp.error_code", FT_UINT32, BASE_DEC, VALS(m2tp_error_code_values), 0x0, - "", HFILL} + NULL, HFILL} }, { &hf_m2tp_reason, { "Reason", "m2tp.reason", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL} + NULL, HFILL} }, }; |