CAPWAP: Wrong usage of FT_BOOLEAN for Reserved field...
authorAlexis La Goutte <alexis.lagoutte@gmail.com>
Mon, 11 Aug 2014 15:34:28 +0000 (17:34 +0200)
committerAnders Broman <a.broman58@gmail.com>
Wed, 3 Sep 2014 07:39:33 +0000 (07:39 +0000)
Change-Id: Ie1c472f4db105a1a8db9dba265039282872dffb2
Reviewed-on: https://code.wireshark.org/review/3952
Reviewed-by: Anders Broman <a.broman58@gmail.com>
epan/dissectors/packet-capwap.c

index c91c7fadd660e14a82c3a1f6133ff150e545a308..2ac9e6645b97a01807d80d7314009a2e51950d2d 100644 (file)
@@ -1797,7 +1797,7 @@ proto_register_capwap_control(void)
             NULL, HFILL }},
         { &hf_capwap_header_flags_r,
         { "Reserved", "capwap.header.flags.r",
-            FT_BOOLEAN, 24, TFS(&tfs_set_notset), 0x000007,
+            FT_UINT24, BASE_HEX, 0x0, 0x000007,
             NULL, HFILL }},
         { &hf_capwap_header_fragment_id,
         { "Fragment ID", "capwap.header.fragment.id",
@@ -1984,8 +1984,8 @@ proto_register_capwap_control(void)
             NULL, HFILL }},
         { &hf_capwap_msg_element_type_ac_descriptor_dtls_policy_r,
         { "Reserved", "capwap.control.message_element.ac_descriptor.dtls_policy.r",
-            FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0xF9,
-            NULL, HFILL }},
+            FT_UINT8, BASE_HEX, 0x0, 0xF9,
+            "Must be zero", HFILL }},
 
         { &hf_capwap_msg_element_type_ac_information,
         { "AC Information", "capwap.control.message_element.ac_information",
@@ -1994,11 +1994,11 @@ 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, 0x00,
+            FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x0,
             NULL, HFILL }},
         { &hf_capwap_msg_element_type_ac_information_type,
         { "AC Information Type", "capwap.control.message_element.ac_information.type",
-            FT_UINT16, BASE_DEC, VALS(ac_information_type_vals), 0x00,
+            FT_UINT16, BASE_DEC, VALS(ac_information_type_vals), 0x0,
             NULL, HFILL }},
         { &hf_capwap_msg_element_type_ac_information_length,
         { "AC Information Length", "capwap.control.message_element.ac_information.length",
@@ -2256,7 +2256,7 @@ proto_register_capwap_control(void)
             NULL, HFILL }},
         { &hf_capwap_msg_element_type_wtp_frame_tunnel_mode_r,
         { "Reserved", "capwap.control.message_element.wtp_frame_tunnel_mode.r",
-            FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0xF1,
+            FT_UINT8, BASE_HEX, 0x0, 0xF1,
             NULL, HFILL }},
 
         { &hf_capwap_msg_element_type_wtp_mac_type,