More fussing with masks.

Mostly longer masks with odd numbers of digits.

10 files changed, 50 insertions, 50 deletions

diff --git a/epan/dissectors/packet-awdl.c b/epan/dissectors/packet-awdl.c
index dc03086333..b13d3564f3 100644
--- a/epan/dissectors/packet-awdl.c
+++ b/epan/dissectors/packet-awdl.c
@@ -1674,22 +1674,22 @@ void proto_register_awdl(void)
     },
     { &hf_awdl_datastate_flags_8,
       { "Country Code", "awdl.datastate.flags.8",
-        FT_BOOLEAN, 16, NULL, 0x100, NULL, HFILL
+        FT_BOOLEAN, 16, NULL, 0x0100, NULL, HFILL
       }
     },
     { &hf_awdl_datastate_flags_9,
       { "Social Channels", "awdl.datastate.flags.9",
-        FT_BOOLEAN, 16, NULL, 0x200, NULL, HFILL
+        FT_BOOLEAN, 16, NULL, 0x0200, NULL, HFILL
       }
     },
     { &hf_awdl_datastate_flags_10,
       { "Bit 10", "awdl.datastate.flags.10",
-        FT_BOOLEAN, 16, NULL, 0x400, NULL, HFILL
+        FT_BOOLEAN, 16, NULL, 0x0400, NULL, HFILL
       }
     },
     { &hf_awdl_datastate_flags_11,
       { "Bit 11", "awdl.datastate.flags.11",
-        FT_BOOLEAN, 16, NULL, 0x800, NULL, HFILL
+        FT_BOOLEAN, 16, NULL, 0x0800, NULL, HFILL
       }
     },
     { &hf_awdl_datastate_flags_12,
@@ -2277,22 +2277,22 @@ void proto_register_awdl(void)
     },
     { &hf_awdl_serviceparams_bitmask_8,
       { "8", "awdl.serviceparams.bitmask.8",
-        FT_BOOLEAN, 32, NULL, 0x100, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x0100, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_9,
       { "9", "awdl.serviceparams.bitmask.9",
-        FT_BOOLEAN, 32, NULL, 0x200, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x0200, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_10,
       { "10", "awdl.serviceparams.bitmask.10",
-        FT_BOOLEAN, 32, NULL, 0x400, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x0400, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_11,
       { "11", "awdl.serviceparams.bitmask.11",
-        FT_BOOLEAN, 32, NULL, 0x800, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x0800, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_12,
@@ -2317,22 +2317,22 @@ void proto_register_awdl(void)
     },
     { &hf_awdl_serviceparams_bitmask_16,
       { "16", "awdl.serviceparams.bitmask.16",
-        FT_BOOLEAN, 32, NULL, 0x10000, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x010000, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_17,
       { "17", "awdl.serviceparams.bitmask.17",
-        FT_BOOLEAN, 32, NULL, 0x20000, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x020000, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_18,
       { "18", "awdl.serviceparams.bitmask.18",
-        FT_BOOLEAN, 32, NULL, 0x40000, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x040000, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_19,
       { "19", "awdl.serviceparams.bitmask.19",
-        FT_BOOLEAN, 32, NULL, 0x80000, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x080000, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_20,
@@ -2357,22 +2357,22 @@ void proto_register_awdl(void)
     },
     { &hf_awdl_serviceparams_bitmask_24,
       { "24", "awdl.serviceparams.bitmask.24",
-        FT_BOOLEAN, 32, NULL, 0x1000000, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x01000000, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_25,
       { "25", "awdl.serviceparams.bitmask.25",
-        FT_BOOLEAN, 32, NULL, 0x2000000, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x02000000, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_26,
       { "26", "awdl.serviceparams.bitmask.26",
-        FT_BOOLEAN, 32, NULL, 0x4000000, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x04000000, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_27,
       { "27", "awdl.serviceparams.bitmask.27",
-        FT_BOOLEAN, 32, NULL, 0x8000000, NULL, HFILL
+        FT_BOOLEAN, 32, NULL, 0x08000000, NULL, HFILL
       }
     },
     { &hf_awdl_serviceparams_bitmask_28,
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index 70d994c829..e9a0751793 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -11706,7 +11706,7 @@ proto_register_bgp(void)
           BASE_NONE, NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_ls_nlri_multi_topology_id,
         { "Multi Topology ID", "bgp.ls.nlri_multi_topology_id", FT_UINT16,
-          BASE_DEC_HEX, NULL, 0xfff, NULL, HFILL}},
+          BASE_DEC_HEX, NULL, 0x0fff, NULL, HFILL}},
       { &hf_bgp_ls_nlri_ospf_route_type,
         { "OSPF Route Type", "bgp.ls.nlri_ospf_route_type", FT_UINT8,
           BASE_DEC, VALS(link_state_prefix_descriptors_ospf_route_type), 0x0, NULL, HFILL}},
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index f54b8e118d..c04368b826 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -8735,22 +8735,22 @@ proto_register_bthci_evt(void)
         },
         { &hf_bthci_evt_le_features_2m_phy,
           { "LE 2M PHY",            "bthci_evt.le_features.2m_phy",
-            FT_BOOLEAN, 64, NULL, 0x100,
+            FT_BOOLEAN, 64, NULL, 0x0100,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_stable_modulation_index_tx,
           { "Stable Modulation Index - Tx",            "bthci_evt.le_features.stable_modulation_index_tx",
-            FT_BOOLEAN, 64, NULL, 0x200,
+            FT_BOOLEAN, 64, NULL, 0x0200,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_stable_modulation_index_rx,
           { "Stable Modulation Index - Rx",            "bthci_evt.le_features.stable_modulation_index_rx",
-            FT_BOOLEAN, 64, NULL, 0x400,
+            FT_BOOLEAN, 64, NULL, 0x0400,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_coded_phy,
           { "LE Coded PHY",            "bthci_evt.le_features.coded_phy",
-            FT_BOOLEAN, 64, NULL, 0x800,
+            FT_BOOLEAN, 64, NULL, 0x0800,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_extended_advertising,
@@ -8775,22 +8775,22 @@ proto_register_bthci_evt(void)
         },
         { &hf_bthci_evt_le_features_minimum_number_of_used_channels_procedure,
           { "Minimum Number of Used Channels Procedure", "bthci_evt.le_features.minimum_number_of_used_channels_procedure",
-            FT_BOOLEAN, 64, NULL, 0x10000,
+            FT_BOOLEAN, 64, NULL, 0x010000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_connection_cte_request,
           { "Connection CTE Request", "bthci_evt.le_features.connection_cte_request",
-            FT_BOOLEAN, 64, NULL, 0x20000,
+            FT_BOOLEAN, 64, NULL, 0x020000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_connection_cte_response,
           { "Connection CTE Response", "bthci_evt.le_features.connection_cte_response",
-            FT_BOOLEAN, 64, NULL, 0x40000,
+            FT_BOOLEAN, 64, NULL, 0x040000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_connectionless_cte_tx,
           { "Connectionless CTE Tx", "bthci_evt.le_features.connectionless_cte_tx",
-            FT_BOOLEAN, 64, NULL, 0x80000,
+            FT_BOOLEAN, 64, NULL, 0x080000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_connectionless_cte_rx,
@@ -8815,22 +8815,22 @@ proto_register_bthci_evt(void)
         },
         { &hf_bthci_evt_le_features_periodic_advertising_sync_transfer_sender,
           { "Periodic Advertising Sync Transfer - Sender", "bthci_evt.le_features.periodic_advertising_sync_transfer_sender",
-            FT_BOOLEAN, 64, NULL, 0x1000000,
+            FT_BOOLEAN, 64, NULL, 0x01000000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_periodic_advertising_sync_transfer_receiver,
           { "Periodic Advertising Sync Transfer - Receiver", "bthci_evt.le_features.periodic_advertising_sync_transfer_receiver",
-            FT_BOOLEAN, 64, NULL, 0x2000000,
+            FT_BOOLEAN, 64, NULL, 0x02000000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_sleep_clock_accuracy_updates,
           { "Sleep Clock Accuracy Updates", "bthci_evt.le_features.sleep_clock_accuracy_updates",
-            FT_BOOLEAN, 64, NULL, 0x4000000,
+            FT_BOOLEAN, 64, NULL, 0x04000000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_remote_public_key_validation,
           { "Remote Public Key Validation", "bthci_evt.le_features.remote_public_key_validation",
-            FT_BOOLEAN, 64, NULL, 0x8000000,
+            FT_BOOLEAN, 64, NULL, 0x08000000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_cis_master,
@@ -8855,22 +8855,22 @@ proto_register_bthci_evt(void)
         },
         { &hf_bthci_evt_le_features_isochronous_channels_host_support,
           { "Isochronous Channels (Host_support)", "bthci_evt.le_features.isochronous_channels_host_support",
-            FT_BOOLEAN, 64, NULL, 0x100000000,
+            FT_BOOLEAN, 64, NULL, 0x0100000000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_power_control_request,
           { "Power Control Request", "bthci_evt.le_features.power_control_request",
-            FT_BOOLEAN, 64, NULL, 0x200000000,
+            FT_BOOLEAN, 64, NULL, 0x0200000000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_power_change_indication,
           { "Power Change Indication", "bthci_evt.le_features.power_change_indication",
-            FT_BOOLEAN, 64, NULL, 0x400000000,
+            FT_BOOLEAN, 64, NULL, 0x0400000000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_path_loss_monitoring,
           { "Path Loss Monitoring", "bthci_evt.le_features.path_loss_monitoring",
-            FT_BOOLEAN, 64, NULL, 0x800000000,
+            FT_BOOLEAN, 64, NULL, 0x0800000000,
             NULL, HFILL }
         },
         { &hf_bthci_evt_le_features_reserved,
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 035d7e98ad..3d031ad071 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -8698,7 +8698,7 @@ proto_register_cip(void)
       { &hf_cip_cco_format_number, { "Format Number", "cip.cco.format_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
       { &hf_cip_cco_edit_signature, { "Edit Signature", "cip.cco.edit_signature", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
       { &hf_cip_cco_con_flags, { "Connection Flags", "cip.cco.connflags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
-      { &hf_cip_cco_con_type, { "Connection O_T", "cip.cco.con", FT_UINT16, BASE_DEC, VALS(cip_con_vals), 0x001, NULL, HFILL }},
+      { &hf_cip_cco_con_type, { "Connection O_T", "cip.cco.con", FT_UINT16, BASE_DEC, VALS(cip_con_vals), 0x0001, NULL, HFILL }},
       { &hf_cip_cco_ot_rtf, { "O->T real time transfer format", "cip.cco.otrtf", FT_UINT16, BASE_DEC, VALS(cip_con_rtf_vals), 0x000E, NULL, HFILL }},
       { &hf_cip_cco_to_rtf, { "T->O real time transfer format", "cip.cco.tortf", FT_UINT16, BASE_DEC, VALS(cip_con_rtf_vals), 0x0070, NULL, HFILL }},
       { &hf_cip_cco_tdi_vendor, { "Vendor ID", "cip.cco.tdi.vendor", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_vendor_vals_ext, 0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index db1b78523d..4c45aa37c5 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -5669,19 +5669,19 @@ proto_register_epl(void)
 		},
 		{ &hf_epl_asnd_identresponse_feat_bit10,
 			{ "Multiple-ASend Support", "epl.asnd.ires.features.bit10",
-				FT_BOOLEAN, 32, NULL, 0x10000, NULL, HFILL }
+				FT_BOOLEAN, 32, NULL, 0x010000, NULL, HFILL }
 		},
 		{ &hf_epl_asnd_identresponse_feat_bit11,
 			{ "Ring Redundancy", "epl.asnd.ires.features.bit11",
-				FT_BOOLEAN, 32, NULL, 0x20000, NULL, HFILL }
+				FT_BOOLEAN, 32, NULL, 0x020000, NULL, HFILL }
 		},
 		{ &hf_epl_asnd_identresponse_feat_bit12,
 			{ "PResChaining", "epl.asnd.ires.features.bit12",
-				FT_BOOLEAN, 32, NULL, 0x40000, NULL, HFILL }
+				FT_BOOLEAN, 32, NULL, 0x040000, NULL, HFILL }
 		},
 		{ &hf_epl_asnd_identresponse_feat_bit13,
 			{ "Multiple PReq/PRes", "epl.asnd.ires.features.bit13",
-				FT_BOOLEAN, 32, NULL, 0x80000, NULL, HFILL }
+				FT_BOOLEAN, 32, NULL, 0x080000, NULL, HFILL }
 		},
 		{ &hf_epl_asnd_identresponse_feat_bit14,
 			{ "Dynamic Node Allocation", "epl.asnd.ires.features.bit14",
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
index 9f39df5e5b..d97073c2f5 100644
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -4337,12 +4337,12 @@ void proto_register_radiotap(void)
 
 		{&hf_radiotap_xchannel_flags_ht20,
 		 {"HT Channel (20MHz Channel Width)", "radiotap.xchannel.flags.ht20",
-		  FT_BOOLEAN, 24, NULL, 0x10000,
+		  FT_BOOLEAN, 24, NULL, 0x010000,
 		  "Channel Flags HT/20", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_ht40u,
 		 {"HT Channel (40MHz Channel Width with Extension channel above)", "radiotap.xchannel.flags.ht40u",
-		  FT_BOOLEAN, 24, NULL, 0x20000,
+		  FT_BOOLEAN, 24, NULL, 0x020000,
 		  "Channel Flags HT/40+", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_ht40d,
@@ -5774,7 +5774,7 @@ void proto_register_radiotap(void)
 
 		{&hf_radiotap_s1g_ndp_cts_early_sector_indic_2m,
 		 {"Early Sector Indicator", "radiotap.s1g.ndp.cts.early_sector_indic_2m",
-		  FT_BOOLEAN, 40, NULL, 0x020000000, NULL, HFILL }},
+		  FT_BOOLEAN, 40, NULL, 0x0020000000, NULL, HFILL }},
 
 		{&hf_radiotap_s1g_ndp_cts_bandwidth_indic_2m,
 		 {"Address Indicator", "radiotap.s1g.ndp.cts.address_indic",
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index e22a4a3ee7..2ae80f152b 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -36593,7 +36593,7 @@ proto_register_ieee80211(void)
 
     {&hf_ieee80211_ff_alloc_type,
      {"Allocation Type", "wlan.dynamic_allocation.alloc_type",
-      FT_UINT40, BASE_DEC, NULL, 0x000000070,
+      FT_UINT40, BASE_DEC, NULL, 0x0000000070,
       NULL, HFILL }},
 
     {&hf_ieee80211_ff_src_aid,
@@ -36890,7 +36890,7 @@ proto_register_ieee80211(void)
 
     {&hf_ieee80211_ff_bic_NBI_abft,
      {"Number of Beacon Intervals that are needed to allocate A-BFT", "wlan.bic.NBI_abft",
-      FT_UINT48, BASE_DEC, NULL, 0x00078000000,
+      FT_UINT48, BASE_DEC, NULL, 0x000078000000,
       NULL, HFILL }},
 
     {&hf_ieee80211_ff_bic_abft_count,
@@ -41272,7 +41272,7 @@ proto_register_ieee80211(void)
 
     {&hf_ieee80211_tclas_class_mask7_address_2_match_spec,
      {"Address 2 Spec", "wlan.tclas.class7.address_2_spec",
-      FT_UINT24, BASE_HEX, VALS(address_2_mask_vals), 0x00030, NULL, HFILL }},
+      FT_UINT24, BASE_HEX, VALS(address_2_mask_vals), 0x000030, NULL, HFILL }},
 
     {&hf_ieee80211_tclas_class_mask7_sequence_control_spec,
      {"Sequence Control Spec", "wlan.tclas.class7.sequence_control_spec",
@@ -45624,7 +45624,7 @@ proto_register_ieee80211(void)
 
     {&hf_ieee80211_tag_neighbor_report_bssid_info_capability_dback,
      {"Delayed Block Ack", "wlan.nreport.bssid.info.capability.dback",
-      FT_BOOLEAN, 32, NULL, 0x000000100,
+      FT_BOOLEAN, 32, NULL, 0x00000100,
       NULL, HFILL }},
 
     {&hf_ieee80211_tag_neighbor_report_bssid_info_capability_iback,
@@ -49070,12 +49070,12 @@ proto_register_ieee80211(void)
 
     {&hf_ieee80211_he_multi_tid_aggregation_tx_support,
      {"Multi-TID Aggregation Tx Support", "wlan.ext_tag.he_mac_cap.multi_tid_agg_tx_support",
-       FT_UINT48, BASE_DEC, NULL, 0x38000000000, NULL, HFILL }},
+       FT_UINT48, BASE_DEC, NULL, 0x038000000000, NULL, HFILL }},
 
     {&hf_ieee80211_he_subchannel_selective_trans_support,
      {"HE Subchannel Selective Transmission Support", "wlan.ext_tag.he_mac_cap.subchannel_selective_xmit_support",
       FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported),
-      0x40000000000, NULL, HFILL }},
+      0x040000000000, NULL, HFILL }},
 
     {&hf_ieee80211_he_2_996_tone_ru_support,
      {"UL 2x996-tone RU Support", "wlan.ext_tag.he_mac_cap.ul_2_996_tone_ru_support",
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 8c09068537..496a75030c 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -11918,7 +11918,7 @@ proto_register_nfs(void)
 			NULL, 0xfffc, "major file system ID", HFILL }},
 		{ &hf_nfs_fh_fsid_minor32, {
 			"minor", "nfs.fh.fsid.minor", FT_UINT32, BASE_DEC,
-			NULL, 0x3ffff, "minor file system ID", HFILL }},
+			NULL, 0x03ffff, "minor file system ID", HFILL }},
 		{ &hf_nfs_fh_fsid_inode, {
 			"inode", "nfs.fh.fsid.inode", FT_UINT32, BASE_DEC,
 			NULL, 0, "file system inode", HFILL }},
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index fabfedd096..b79e716f47 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -2714,7 +2714,7 @@ void proto_register_pdcp(void)
         },
         { &hf_pdcp_lte_seq_num_18,
             { "Seq Num",
-              "pdcp-lte.seq-num", FT_UINT24, BASE_DEC, NULL, 0x3ffff,
+              "pdcp-lte.seq-num", FT_UINT24, BASE_DEC, NULL, 0x03ffff,
               "PDCP Seq num", HFILL
             }
         },
diff --git a/epan/dissectors/packet-pdcp-nr.c b/epan/dissectors/packet-pdcp-nr.c
index a211b1391d..8c18d4d973 100644
--- a/epan/dissectors/packet-pdcp-nr.c
+++ b/epan/dissectors/packet-pdcp-nr.c
@@ -2598,7 +2598,7 @@ void proto_register_pdcp_nr(void)
         },
         { &hf_pdcp_nr_seq_num_18,
             { "Seq Num",
-              "pdcp-nr.seq-num", FT_UINT24, BASE_DEC, NULL, 0x3ffff,
+              "pdcp-nr.seq-num", FT_UINT24, BASE_DEC, NULL, 0x03ffff,
               "PDCP Seq num", HFILL
             }
         },