diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-02-12 08:32:27 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-02-12 21:24:43 +0000 |
| commit | a9dc8016e9d37663c3d09f1563f993182a979554 (patch) | |
| tree | 088bbe4c755072a15483d3673ff75c863cc939d9 /epan/dissectors/packet-capwap.c | |
| parent | d958ea8b1c9307d2e94128b4d782a3d0661f25e1 (diff) | |
Add message type from RFC5416 : Section 3 : IEEE 802.11 Specific CAPWAP Control Messages
Issue found by Massimo Vellucci (SmartCAPWAP)
Partial-Bug: 9752
Change-Id: I6f61a3c8706572e9ea7935e8f00818e6aa9fef7a
Reviewed-on: https://code.wireshark.org/review/193
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-capwap.c')
| -rw-r--r-- | epan/dissectors/packet-capwap.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index d5052f035e..3a538b09c1 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -388,6 +388,9 @@ static const value_string message_type[] = { { 24, "Clear Configuration Response" }, { 25, "Station Configuration Request" }, { 26, "Station Configuration Response" }, + /* RFC5416 : Section 3 : IEEE 802.11 Specific CAPWAP Control Messages */ + { 3398913, "IEEE 802.11 WLAN Configuration Request" }, + { 3398914, "IEEE 802.11 WLAN Configuration Response" }, { 0, NULL } }; /* ************************************************************************* */ @@ -1227,9 +1230,9 @@ dissect_capwap_control_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, gu capwap_control_msg_type_tree = proto_item_add_subtree(ti_flag, ett_capwap); proto_tree_add_item(capwap_control_msg_type_tree, hf_capwap_control_header_msg_type_enterprise_nbr, tvb, offset, 3, ENC_BIG_ENDIAN); - proto_tree_add_item(capwap_control_msg_type_tree, hf_capwap_control_header_msg_type_enterprise_specific, tvb, offset+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(capwap_control_msg_type_tree, hf_capwap_control_header_msg_type_enterprise_specific, tvb, offset, 4, ENC_BIG_ENDIAN); - col_append_fstr(pinfo->cinfo, COL_INFO, " - %s",val_to_str(tvb_get_guint8(tvb, offset+3),message_type,"Unknown Message Type (0x%02x)")); + col_append_fstr(pinfo->cinfo, COL_INFO, " - %s",val_to_str(tvb_get_ntohl(tvb, offset),message_type,"Unknown Message Type (0x%x)")); plen += 4; /* Sequence 8 bits */ @@ -1744,7 +1747,7 @@ proto_register_capwap_control(void) NULL, HFILL }}, { &hf_capwap_control_header_msg_type_enterprise_specific, { "Message Type (Enterprise Specific)", "capwap.control.header.message_type.enterprise_specific", - FT_UINT8, BASE_DEC, VALS(message_type), 0x00, + FT_UINT32, BASE_DEC, VALS(message_type), 0x00, NULL, HFILL }}, { &hf_capwap_control_header_seq_number, { "Sequence Number", "capwap.control.header.sequence_number", |