aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/epan
diff options
context:
space:
mode:
authorMartin Mathieson <martin.r.mathieson@googlemail.com>2021-09-21 11:04:31 +0100
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2021-09-21 11:04:31 +0100
commit543ea3968c2acc34e36a9a3983274498046e621a (patch)
tree433105cb75fed206614e60e6745f98c1aae4d3e6 /plugins/epan
parentb12644b629c21d4ddc6855e9642ce771148c23c5 (diff)
ethercat: Fix some too-wide mask widths.
N.B. Some other issues spotted have been reported in https://gitlab.com/wireshark/wireshark/~/issues/17605
Diffstat (limited to 'plugins/epan')
-rw-r--r--plugins/epan/ethercat/packet-ecatmb.c58
-rw-r--r--plugins/epan/ethercat/packet-ethercat-datagram.c2
2 files changed, 30 insertions, 30 deletions
diff --git a/plugins/epan/ethercat/packet-ecatmb.c b/plugins/epan/ethercat/packet-ecatmb.c
index d3e2fde551..8192d3e523 100644
--- a/plugins/epan/ethercat/packet-ecatmb.c
+++ b/plugins/epan/ethercat/packet-ecatmb.c
@@ -1527,27 +1527,27 @@ void proto_register_ecat_mailbox(void)
},
{ &hf_ecat_mailbox_coe_sdoccsid_sizeind,
{ "Size Ind.", "ecat_mailbox.coe.sdoccsid.sizeind",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000001,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x01,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoccsid_expedited,
{ "Expedited", "ecat_mailbox.coe.sdoccsid.expedited",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000002,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x02,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoccsid_size0,
{ "Bytes", "ecat_mailbox.coe.sdoccsid.size0",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000004,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x04,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoccsid_size1,
{ "Bytes", "ecat_mailbox.coe.sdoccsid.size1",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000008,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x08,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoccsid_complete,
{ "Access", "ecat_mailbox.coe.sdoccsid.complete",
- FT_BOOLEAN, 8, TFS(&tfs_complete), 0x00000010,
+ FT_BOOLEAN, 8, TFS(&tfs_complete), 0x10,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoccsds,
@@ -1557,17 +1557,17 @@ void proto_register_ecat_mailbox(void)
},
{ &hf_ecat_mailbox_coe_sdoccsds_lastseg,
{ "Last Segment", "ecat_mailbox.coe.sdoccsds.lastseg",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000001,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x01,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoccsds_size,
{ "Size", "ecat_mailbox.coe.sdoccsds.size",
- FT_UINT8, BASE_DEC, NULL, 0x0000000E,
+ FT_UINT8, BASE_DEC, NULL, 0x0E,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoccsds_toggle,
{ "Toggle Bit", "ecat_mailbox.coe.sdoccsds.toggle",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x10,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoccsiu,
@@ -1577,8 +1577,8 @@ void proto_register_ecat_mailbox(void)
},
#if 0
{ &hf_ecat_mailbox_coe_sdoccsiu_complete,
- { "Toggle Bit", "ecat_mailbox.coe.sdoccsiu_complete",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010,
+ { "Toggle Bit", "ecat_mailbox.coe.sdoccsiu.complete",
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x10,
NULL, HFILL }
},
#endif
@@ -1589,7 +1589,7 @@ void proto_register_ecat_mailbox(void)
},
{ &hf_ecat_mailbox_coe_sdoccsus_toggle,
{ "Toggle Bit", "ecat_mailbox.coe.sdoccsus_toggle",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x10,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoidx,
@@ -1651,27 +1651,27 @@ void proto_register_ecat_mailbox(void)
},
{ &hf_ecat_mailbox_coe_sdoscsiu_sizeind,
{ "Size Ind.", "ecat_mailbox.coe.sdoscsiu_sizeind",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000001,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x01,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoscsiu_expedited,
{ "Expedited", "ecat_mailbox.coe.sdoscsiu_expedited",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000002,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x02,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoscsiu_size0,
{ "Bytes", "ecat_mailbox.coe.sdoscsiu_size0",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000004,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x04,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoscsiu_size1,
{ "Bytes", "ecat_mailbox.coe.sdoscsiu_size1",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000008,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x08,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoscsiu_complete,
{ "Access", "ecat_mailbox.coe.sdoscsiu_complete",
- FT_BOOLEAN, 8, TFS(&tfs_complete), 0x00000010,
+ FT_BOOLEAN, 8, TFS(&tfs_complete), 0x10,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoscsds,
@@ -1681,7 +1681,7 @@ void proto_register_ecat_mailbox(void)
},
{ &hf_ecat_mailbox_coe_sdoscsds_toggle,
{ "Toggle Bit", "ecat_mailbox.coe.sdoscsds_toggle",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x10,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoscsus,
@@ -1691,17 +1691,17 @@ void proto_register_ecat_mailbox(void)
},
{ &hf_ecat_mailbox_coe_sdoscsus_lastseg,
{ "Last Segment", "ecat_mailbox.coe.sdoscsus_lastseg",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000001,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x01,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoscsus_bytes,
{ "Bytes", "ecat_mailbox.coe.sdoscsus_bytes",
- FT_UINT8, BASE_DEC, NULL, 0x0000000E,
+ FT_UINT8, BASE_DEC, NULL, 0x0E,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoscsus_toggle,
{ "Toggle Bit", "ecat_mailbox.coe.sdoscsus_toggle",
- FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010,
+ FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x10,
NULL, HFILL }
},
{ &hf_ecat_mailbox_coe_sdoinfoopcode,
@@ -1863,7 +1863,7 @@ void proto_register_ecat_mailbox(void)
},
{ &hf_ecat_mailbox_soe_header_error,
{ "Error", "ecat_mailbox.soe_header_error",
- FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000010,
+ FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x0010,
NULL, HFILL }
},
{ &hf_ecat_mailbox_soe_header_driveno,
@@ -1872,42 +1872,42 @@ void proto_register_ecat_mailbox(void)
},
{ &hf_ecat_mailbox_soe_header_datastate,
{ "Datastate", "ecat_mailbox.soe_header_datastate",
- FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000100,
+ FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x0100,
NULL, HFILL }
},
{ &hf_ecat_mailbox_soe_header_name,
{ "Name", "ecat_mailbox.soe_header_name",
- FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000200,
+ FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x0200,
NULL, HFILL }
},
{ &hf_ecat_mailbox_soe_header_attribute,
{ "Attribute", "ecat_mailbox.soe_header_attribute",
- FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000400,
+ FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x0400,
NULL, HFILL }
},
{ &hf_ecat_mailbox_soe_header_unit,
{ "Unit", "ecat_mailbox.soe_header_unit",
- FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000800,
+ FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x0800,
NULL, HFILL }
},
{ &hf_ecat_mailbox_soe_header_min,
{ "Min", "ecat_mailbox.soe_header_min",
- FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00001000,
+ FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x1000,
NULL, HFILL }
},
{ &hf_ecat_mailbox_soe_header_max,
{ "Max", "ecat_mailbox.soe_header_max",
- FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00002000,
+ FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x2000,
NULL, HFILL }
},
{ &hf_ecat_mailbox_soe_header_value,
{ "Value", "ecat_mailbox.soe_header_value",
- FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00004000,
+ FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x4000,
NULL, HFILL }
},
{ &hf_ecat_mailbox_soe_header_reserved,
{ "Reserved", "ecat_mailbox.soe_header_reserved",
- FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00008000,
+ FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x8000,
NULL, HFILL }
},
{ &hf_ecat_mailbox_soe_idn,
diff --git a/plugins/epan/ethercat/packet-ethercat-datagram.c b/plugins/epan/ethercat/packet-ethercat-datagram.c
index 00e423f276..129c0ab1ff 100644
--- a/plugins/epan/ethercat/packet-ethercat-datagram.c
+++ b/plugins/epan/ethercat/packet-ethercat-datagram.c
@@ -3024,7 +3024,7 @@ void proto_register_ecat(void)
},
{ &hf_ecat_reg_ctrlstat_wraccess,
{"Write access", "ecat.reg.ctrlstat.wraccess",
- FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x1, NULL, HFILL }
+ FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x01, NULL, HFILL }
},
{ &hf_ecat_reg_ctrlstat_eepromemul,
{"EEPROM emulation", "ecat.reg.ctrlstat.eepromemul",