diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-04-21 13:58:53 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-04-21 19:15:32 +0000 |
| commit | 4bf38d7c21c5091cf803f79873a41e20facb4e22 (patch) | |
| tree | 44b4d8280f7a997813bb7cf979899ed30a9afeb4 /epan/dissectors/packet-capwap.c | |
| parent | 5d1a2a57a0833030507ec9741137fcc05a8ce1a6 (diff) | |
capwap: fix conflicting entry in its value_string
Field 'Cisco Element ID' (capwap.control.cisco.element_id) has a conflicting entry in its value_string: 125 is at indices 31 (SPAM AP Led State) and 34 (AP Led State Config))
Rename also some variable name...
Change-Id: I4e3c1fa925492a570dad47a3d274d1f3e950c483
Reviewed-on: https://code.wireshark.org/review/21271
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-capwap.c')
| -rw-r--r-- | epan/dissectors/packet-capwap.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 1cc9868ae8..bc6d70e24c 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -547,7 +547,7 @@ static int hf_capwap_cisco_ap_static_ip_reserved = -1; static int hf_capwap_cisco_ap_uptime_current = -1; static int hf_capwap_cisco_ap_uptime_last = -1; static int hf_capwap_cisco_ap_group_name = -1; -static int hf_capwap_cisco_spam_ap_led_state = -1; +static int hf_capwap_cisco_ap_led_state = -1; static int hf_capwap_cisco_ap_timesync = -1; static int hf_capwap_cisco_ap_timesync_type = -1; static int hf_capwap_cisco_board_data_options_ant_type = -1; @@ -1932,12 +1932,11 @@ dissect_capwap_message_element_vendor_fortinet_type(tvbuff_t *tvb, proto_tree *s #define VSP_CISCO_AP_UPTIME 108 #define VSP_CISCO_AP_GROUP_NAME 123 -#define VSP_CISCO_SPAM_AP_LED_STATE 125 -#define VSP_CISCO_AP_MODEL 127 -#define VSP_CISCO_AP_RESET_BUTTON_STATE 128 #define VSP_CISCO_AP_LED_STATE_CONFIG 125 #define VSP_CISCO_AP_REGULATORY_DOMAIN 126 +#define VSP_CISCO_AP_MODEL 127 +#define VSP_CISCO_AP_RESET_BUTTON_STATE 128 #define VSP_CISCO_LWAPP_CHANNEL_POWER 134 #define VSP_CISCO_AP_PRE_STD_SWITCH_CONFIG 137 @@ -2003,7 +2002,6 @@ static const value_string cisco_element_id_vals[] = { { VSP_CISCO_AP_UPTIME, "AP Uptime" }, { VSP_CISCO_AP_GROUP_NAME, "AP Group Name" }, - { VSP_CISCO_SPAM_AP_LED_STATE, "SPAM AP Led State" }, { VSP_CISCO_AP_MODEL, "AP Model" }, { VSP_CISCO_AP_RESET_BUTTON_STATE, "AP reset button state" }, @@ -2110,8 +2108,8 @@ dissect_capwap_message_element_vendor_cisco_type(tvbuff_t *tvb, proto_tree *sub_ proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_ap_group_name, tvb, offset, optlen, ENC_ASCII|ENC_NA); offset += optlen; break; - case VSP_CISCO_SPAM_AP_LED_STATE: /* SPAM AP Led State (125) */ - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_spam_ap_led_state, tvb, offset, 2, ENC_NA); + case VSP_CISCO_AP_LED_STATE_CONFIG: /* AP Led State (125) */ + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_cisco_ap_led_state, tvb, offset, 2, ENC_NA); offset += 2; break; case VSP_CISCO_AP_TIMESYNC: /* AP Timesync (151) */ @@ -5608,8 +5606,8 @@ proto_register_capwap_control(void) FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_capwap_cisco_spam_ap_led_state, - { "Led State", "capwap.control.cisco.spam_ap_led_state", + { &hf_capwap_cisco_ap_led_state, + { "Led State", "capwap.control.cisco.ap_led_state", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, |