diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2021-07-11 13:19:10 +0100 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2021-07-11 14:55:55 +0000 |
| commit | 030d659f884f09d02deaeba9832f6f62b4c7c334 (patch) | |
| tree | aaa02949d5f3b2261591b8da08f7f27e74fbb46d /plugins/epan | |
| parent | 89acb935bcc0c4efdf13b22b49d0b0e4da5b31f3 (diff) | |
More mask checks and some fixes.
Diffstat (limited to 'plugins/epan')
| -rw-r--r-- | plugins/epan/ethercat/packet-ecatmb.c | 6 | ||||
| -rw-r--r-- | plugins/epan/profinet/packet-pn-dcp.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/plugins/epan/ethercat/packet-ecatmb.c b/plugins/epan/ethercat/packet-ecatmb.c index 696a681db0..d3e2fde551 100644 --- a/plugins/epan/ethercat/packet-ecatmb.c +++ b/plugins/epan/ethercat/packet-ecatmb.c @@ -1855,11 +1855,11 @@ void proto_register_ecat_mailbox(void) }, { &hf_ecat_mailbox_soe_header_opcode, { "SoE OpCode", "ecat_mailbox.soe_opcode", - FT_UINT16, BASE_DEC, VALS(SoeOpcode), 0x00000007, NULL, HFILL } + FT_UINT16, BASE_DEC, VALS(SoeOpcode), 0x0007, NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_incomplete, { "More Follows...", "ecat_mailbox.soe_header_incomplete", - FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x00000008, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&flags_set_truth), 0x0008, NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_error, { "Error", "ecat_mailbox.soe_header_error", @@ -1868,7 +1868,7 @@ void proto_register_ecat_mailbox(void) }, { &hf_ecat_mailbox_soe_header_driveno, { "Drive No", "ecat_mailbox.soe_header_driveno", - FT_UINT16, BASE_DEC, NULL, 0x000000e0, NULL, HFILL } + FT_UINT16, BASE_DEC, NULL, 0x00e0, NULL, HFILL } }, { &hf_ecat_mailbox_soe_header_datastate, { "Datastate", "ecat_mailbox.soe_header_datastate", diff --git a/plugins/epan/profinet/packet-pn-dcp.c b/plugins/epan/profinet/packet-pn-dcp.c index 6a306a938c..1392eb8405 100644 --- a/plugins/epan/profinet/packet-pn-dcp.c +++ b/plugins/epan/profinet/packet-pn-dcp.c @@ -285,8 +285,8 @@ static const value_string pn_dcp_suboption_device[] = { { 0, NULL } }; -static const true_false_string pn_dcp_rsi_properties_value_bit[] = - { { "Available", "Not available" } }; +static const true_false_string pn_dcp_rsi_properties_value_bit = + { "Available", "Not available" }; #define PNDCP_SUBOPTION_DHCP_CLIENT_ID 61 #define PNDCP_SUBOPTION_DHCP_CONTROL_FOR_ADDRESS_RES 255 @@ -1622,32 +1622,32 @@ proto_register_pn_dcp (void) { &hf_pn_dcp_rsi_properties_value_bit0, { "IP Stack", "pn_dcp.suboption_device_rsi_properties_value.bit0", - FT_BOOLEAN, 16, TFS(pn_dcp_rsi_properties_value_bit), 0x0001, + FT_BOOLEAN, 16, TFS(&pn_dcp_rsi_properties_value_bit), 0x0001, NULL, HFILL } }, { &hf_pn_dcp_rsi_properties_value_bit1, { "CLRPC Interface", "pn_dcp.suboption_device_rsi_properties_value.bit1", - FT_BOOLEAN, 16, TFS(pn_dcp_rsi_properties_value_bit), 0x0002, + FT_BOOLEAN, 16, TFS(&pn_dcp_rsi_properties_value_bit), 0x0002, NULL, HFILL } }, { &hf_pn_dcp_rsi_properties_value_bit2, { "RSI AR Interface", "pn_dcp.suboption_device_rsi_properties_value.bit2", - FT_BOOLEAN, 16, TFS(pn_dcp_rsi_properties_value_bit), 0x0004, + FT_BOOLEAN, 16, TFS(&pn_dcp_rsi_properties_value_bit), 0x0004, NULL, HFILL } }, { &hf_pn_dcp_rsi_properties_value_bit3, { "RSI AR Read Implicit Interface", "pn_dcp.suboption_device_rsi_properties_value.bit3", - FT_BOOLEAN, 16, TFS(pn_dcp_rsi_properties_value_bit), 0x0008, + FT_BOOLEAN, 16, TFS(&pn_dcp_rsi_properties_value_bit), 0x0008, NULL, HFILL } }, { &hf_pn_dcp_rsi_properties_value_bit4, { "RSI CIM Interface", "pn_dcp.suboption_device_rsi_properties_value.bit4", - FT_BOOLEAN, 16, TFS(pn_dcp_rsi_properties_value_bit), 0x0010, + FT_BOOLEAN, 16, TFS(&pn_dcp_rsi_properties_value_bit), 0x0010, NULL, HFILL } }, { &hf_pn_dcp_rsi_properties_value_bit5, { "RSI CIM Read Implicit Interface", "pn_dcp.suboption_device_rsi_properties_value.bit5", - FT_BOOLEAN, 16, TFS(pn_dcp_rsi_properties_value_bit), 0x0020, + FT_BOOLEAN, 16, TFS(&pn_dcp_rsi_properties_value_bit), 0x0020, NULL, HFILL } }, { &hf_pn_dcp_rsi_properties_value_otherbits, |