Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use new modbus event prototypes for Zeek v6.1.0+ #8

Merged
merged 2 commits into from
Nov 7, 2023

Conversation

mmguero
Copy link
Contributor

@mmguero mmguero commented Oct 30, 2023

The Zeek v6.1.0 release states:

The ModBus file record read and write events now provide the full data from
the request and response messages as part of the event data.

The full PDU length was added to the ModBusHeader record type passed with
all of the ModBus events.

This commit handles the deprecated function warnings:

warning in /opt/zeek/share/zeek/site/packages/icsnpp-modbus/main.zeek, line 761 and /opt/zeek/share/zeek/base/bif/plugins/Zeek_Modbus.events.bif.zeek, line 220: use of deprecated 'modbus_read_file_record_request' prototype: Remove in v7.1. Use the version that takes a byte_count and vector of references (event(c:connection, headers:ModbusHeaders))
warning in /opt/zeek/share/zeek/site/packages/icsnpp-modbus/main.zeek, line 786 and /opt/zeek/share/zeek/base/bif/plugins/Zeek_Modbus.events.bif.zeek, line 234: use of deprecated 'modbus_read_file_record_response' prototype: Remove in v7.1. Use the version that takes a byte_count and vector of references (event(c:connection, headers:ModbusHeaders))
warning in /opt/zeek/share/zeek/site/packages/icsnpp-modbus/main.zeek, line 811 and /opt/zeek/share/zeek/base/bif/plugins/Zeek_Modbus.events.bif.zeek, line 248: use of deprecated 'modbus_write_file_record_request' prototype: Remove in v7.1. Use the version that takes a byte_count and vector of references (event(c:connection, headers:ModbusHeaders))
warning in /opt/zeek/share/zeek/site/packages/icsnpp-modbus/main.zeek, line 836 and /opt/zeek/share/zeek/base/bif/plugins/Zeek_Modbus.events.bif.zeek, line 262: use of deprecated 'modbus_write_file_record_response' prototype: Remove in v7.1. Use the version that takes a byte_count and vector of references (event(c:connection, headers:ModbusHeaders))

…st, modbus_read_file_record_response, modbus_write_file_record_request, modbus_write_file_record_response)
…st, modbus_read_file_record_response, modbus_write_file_record_request, modbus_write_file_record_response), but retain compatibility with earlier versions
mmguero added a commit to mmguero-dev/Malcolm that referenced this pull request Oct 30, 2023
@Kleinspider Kleinspider merged commit 92e7ad5 into cisagov:main Nov 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants