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.

Sign up for GitHub

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
+40 −8
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b696f72
Fix use of deprecated event prototypes (modbus_read_file_record_reque…
mmguero Oct 30, 2023
fd4254e
Fix use of deprecated event prototypes (modbus_read_file_record_reque…
mmguero Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 40 additions & 8 deletions scripts/main.zeek
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,8 +757,16 @@ event modbus_read_write_multiple_registers_response(c: connection,
#############################################################################################################################
##################### Defines logging of modbus_read_file_record_request event -> modbus_detailed.log #####################
#############################################################################################################################
event modbus_read_file_record_request(c: connection,
headers: ModbusHeaders) {
@if (Version::at_least("6.1.0"))
event modbus_read_file_record_request(c: connection,
headers: ModbusHeaders,
byte_count: count,
refs: ModbusFileRecordRequests)
@else
event modbus_read_file_record_request(c: connection,
headers: ModbusHeaders)
@endif
{

local read_file_record_request: Modbus_Detailed;

Expand All @@ -782,8 +790,16 @@ event modbus_read_file_record_request(c: connection,
#############################################################################################################################
#################### Defines logging of modbus_read_file_record_response event -> modbus_detailed.log #####################
#############################################################################################################################
event modbus_read_file_record_response(c: connection,
headers: ModbusHeaders) {
@if (Version::at_least("6.1.0"))
event modbus_read_file_record_response(c: connection,
headers: ModbusHeaders,
byte_count: count,
refs: ModbusFileRecordResponses)
@else
event modbus_read_file_record_response(c: connection,
headers: ModbusHeaders)
@endif
{

local read_file_record_response: Modbus_Detailed;

Expand All @@ -807,8 +823,16 @@ event modbus_read_file_record_response(c: connection,
#############################################################################################################################
#################### Defines logging of modbus_write_file_record_request event -> modbus_detailed.log #####################
#############################################################################################################################
event modbus_write_file_record_request(c: connection,
headers: ModbusHeaders){
@if (Version::at_least("6.1.0"))
event modbus_write_file_record_request(c: connection,
headers: ModbusHeaders,
byte_count: count,
refs: ModbusFileReferences)
@else
event modbus_write_file_record_request(c: connection,
headers: ModbusHeaders)
@endif
{

local write_file_record_request: Modbus_Detailed;

Expand All @@ -832,8 +856,16 @@ event modbus_write_file_record_request(c: connection,
#############################################################################################################################
################### Defines logging of modbus_write_file_record_response event -> modbus_detailed.log #####################
#############################################################################################################################
event modbus_write_file_record_response(c: connection,
headers: ModbusHeaders) {
@if (Version::at_least("6.1.0"))
event modbus_write_file_record_response(c: connection,
headers: ModbusHeaders,
byte_count: count,
refs: ModbusFileReferences)
@else
event modbus_write_file_record_response(c: connection,
headers: ModbusHeaders)
@endif
{

local write_file_record_response: Modbus_Detailed;

Expand Down