aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-capwap.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2010-09-17 04:51:21 +0000
committerBill Meier <wmeier@newsguy.com>2010-09-17 04:51:21 +0000
commit7219ee2a49ac2da22f3dcf77b0f343a9b0d61b9c (patch)
tree154454d44e42507215001b8a89a7bc65486dccbb /epan/dissectors/packet-capwap.c
parentd643e0366ade6d97ef936deb67bb0cf55a4c765d (diff)
Use val_to_str_ext() & friends to access sminmpec_values[];
Also: packet-nhrp.c: #include sminmpec.h not req'd; svn path=/trunk/; revision=34143
Diffstat (limited to 'epan/dissectors/packet-capwap.c')
-rw-r--r--epan/dissectors/packet-capwap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index fd7687cb75..5d1fa80104 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -1660,7 +1660,7 @@ proto_register_capwap_control(void)
NULL, HFILL }},
{ &hf_capwap_control_header_msg_type_enterprise_nbr,
{ "Message Type (Enterprise Number)", "capwap.control.header.message_type.enterprise_number",
- FT_UINT32, BASE_DEC, VALS(sminmpec_values), 0x00,
+ FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x00,
NULL, HFILL }},
{ &hf_capwap_control_header_msg_type_enterprise_specific,
{ "Message Type (Enterprise Specific)", "capwap.control.header.message_type.enterprise_specific",
@@ -1763,7 +1763,7 @@ proto_register_capwap_control(void)
{ &hf_capwap_msg_element_type_ac_information_vendor,
{ "AC Information Vendor", "capwap.control.message_element.ac_information.vendor",
- FT_UINT32, BASE_DEC, VALS(sminmpec_values), 0x00,
+ FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x00,
NULL, HFILL }},
{ &hf_capwap_msg_element_type_ac_information_type,
{ "AC Information Type", "capwap.control.message_element.ac_information.type",
@@ -1884,7 +1884,7 @@ proto_register_capwap_control(void)
NULL, HFILL }},
{ &hf_capwap_msg_element_type_vsp_vendor_identifier,
{ "Vendor Identifier", "capwap.control.message_element.vsp.vendor_identifier",
- FT_UINT32, BASE_DEC, VALS(sminmpec_values), 0x00,
+ FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x00,
NULL, HFILL }},
{ &hf_capwap_msg_element_type_vsp_vendor_element_id,
{ "Vendor Element ID", "capwap.control.message_element.vsp.vendor_element_id",
@@ -1897,7 +1897,7 @@ proto_register_capwap_control(void)
{ &hf_capwap_msg_element_type_wtp_board_data_vendor,
{ "WTP Board Data Vendor", "capwap.control.message_element.wtp_board_data.vendor",
- FT_UINT32, BASE_DEC, VALS(sminmpec_values), 0x00,
+ FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x00,
NULL, HFILL }},
{ &hf_capwap_msg_element_type_wtp_board_data_type,
{ "Board Data Type", "capwap.control.message_element.wtp_board_data.type",
@@ -1959,7 +1959,7 @@ proto_register_capwap_control(void)
NULL, HFILL }},
{ &hf_capwap_msg_element_type_wtp_descriptor_vendor,
{ "WTP Descriptor Vendor", "capwap.control.message_element.wtp_descriptor.vendor",
- FT_UINT32, BASE_DEC, VALS(sminmpec_values), 0x00,
+ FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x00,
NULL, HFILL }},
{ &hf_capwap_msg_element_type_wtp_descriptor_type,
{ "Descriptor Type", "capwap.control.message_element.wtp_descriptor.type",