aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-capwap.c
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-06-24 14:25:41 +0100
committerJoão Valverde <j@v6e.pt>2017-06-26 22:40:50 +0000
commit7466880e8a09aa7a9bb797b70fa44bca397881d9 (patch)
tree1634c5d6e433a4803ecd5543a4cb6420e7c886d7 /epan/dissectors/packet-capwap.c
parent3071f9dd7409bd5b0432dd8f1bebbeeee1b6c755 (diff)
Parse enterprise-numbers at run time
"enterprise-numbers" is converted to tab-separated values and renamed "enterprises". Unused fields are stripped. PENs are stored in a hash table loaded at run-time. User "enterprises" file is loaded from the personal config dir. Misc make-sminmpec.pl improvements and fixes. Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output. Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2 Reviewed-on: https://code.wireshark.org/review/22246 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/dissectors/packet-capwap.c')
-rw-r--r--epan/dissectors/packet-capwap.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index bc6d70e24c..5500373992 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -27,8 +27,9 @@
#include <epan/prefs.h>
#include <epan/reassemble.h>
#include <epan/expert.h>
-
#include <epan/sminmpec.h>
+#include <epan/addr_resolv.h>
+
#include "packet-ieee80211.h"
void proto_register_capwap_control(void);
@@ -3576,7 +3577,7 @@ proto_register_capwap_control(void)
},
{ &hf_capwap_control_header_msg_type_enterprise_nbr,
{ "Message Type (Enterprise Number)", "capwap.control.header.message_type.enterprise_number",
- FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x0,
+ FT_UINT32, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0x0,
NULL, HFILL }
},
{ &hf_capwap_control_header_msg_type_enterprise_specific,
@@ -3714,7 +3715,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|BASE_EXT_STRING, &sminmpec_values_ext, 0x0,
+ FT_UINT32, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0x0,
NULL, HFILL }
},
{ &hf_capwap_msg_element_type_ac_information_type,
@@ -3933,7 +3934,7 @@ proto_register_capwap_control(void)
},
{ &hf_capwap_msg_element_type_vsp_vendor_identifier,
{ "Vendor Identifier", "capwap.control.message_element.vsp.vendor_identifier",
- FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x0,
+ FT_UINT32, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0x0,
NULL, HFILL }
},
{ &hf_capwap_msg_element_type_vsp_vendor_element_id,
@@ -3954,7 +3955,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|BASE_EXT_STRING, &sminmpec_values_ext, 0x0,
+ FT_UINT32, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0x0,
NULL, HFILL }
},
{ &hf_capwap_msg_element_type_wtp_board_data_type,
@@ -4042,7 +4043,7 @@ proto_register_capwap_control(void)
},
{ &hf_capwap_msg_element_type_wtp_descriptor_vendor,
{ "WTP Descriptor Vendor", "capwap.control.message_element.wtp_descriptor.vendor",
- FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x0,
+ FT_UINT32, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0x0,
NULL, HFILL }
},
{ &hf_capwap_msg_element_type_wtp_descriptor_type,