aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Krahl <me@robin-krahl.de>2018-03-18 20:20:28 +0100
committerRobin Krahl <me@robin-krahl.de>2018-03-18 20:20:28 +0100
commit84d42361984b3ab087222893eef912baed283757 (patch)
tree06d1995c571e4697c0d1669625cc62df5356d4b8
parent3dca4e35f8e76c3d367f801533994a98b8391fdb (diff)
downloadmidbro-84d42361984b3ab087222893eef912baed283757.tar.gz
midbro-84d42361984b3ab087222893eef912baed283757.tar.bz2
Adapt mid.bro for input registers
-rw-r--r--script/mid.bro63
1 files changed, 52 insertions, 11 deletions
diff --git a/script/mid.bro b/script/mid.bro
index fe1cf63..8f82a50 100644
--- a/script/mid.bro
+++ b/script/mid.bro
@@ -131,14 +131,8 @@ function midbro_generate_events(transaction: Transaction, c: connection,
}
}
-## EVENT HANDLERS
-
-event bro_init() &priority=5 {
- Log::create_stream(Midbro::LOG, [$columns=RegisterData, $path="midbro-parsed"]);
-}
-
-event modbus_read_holding_registers_request(c: connection,
- headers: ModbusHeaders, start_address: count, quantity: count) {
+function midbro_handle_read_request(c: connection, headers: ModbusHeaders,
+ start_address: count, quantity: count) {
if (!midbro_check_filter(c$id$resp_h, start_address, quantity)) {
if(verbose)
print fmt("Filtered %s/%d/%d", c$id$resp_h, start_address, quantity);
@@ -153,8 +147,8 @@ event modbus_read_holding_registers_request(c: connection,
c$midbro$transactions[tid] = transaction;
}
-event modbus_read_holding_registers_response(c: connection,
- headers: ModbusHeaders, registers: ModbusRegisters) {
+function midbro_handle_read_response(c: connection, headers: ModbusHeaders,
+ registers: ModbusRegisters, regtype: string) {
if (!midbro_check_filter(c$id$resp_h, 0, 0)) {
if(verbose)
print fmt("Filtered %s", c$id$resp_h);
@@ -168,5 +162,52 @@ event modbus_read_holding_registers_response(c: connection,
}
local transaction = c$midbro$transactions[tid];
delete c$midbro$transactions[tid];
- midbro_generate_events(transaction, c, headers, registers, "h");
+ midbro_generate_events(transaction, c, headers, registers, regtype);
+}
+
+function midbro_handle_write_request(c: connection, headers: ModbusHeaders,
+ start_address: count, registers: ModbusRegisters, regtype: string) {
+ local quantity = |registers|;
+ if (!midbro_check_filter(c$id$resp_h, start_address, quantity)) {
+ if(verbose)
+ print fmt("Filtered %s/%d/%d", c$id$resp_h, start_address, quantity);
+ return;
+ }
+
+ local transaction = Transaction(
+ $start_address=start_address,
+ $quantity=quantity
+ );
+ midbro_generate_events(transaction, c, headers, registers, regtype);
+}
+
+## EVENT HANDLERS
+
+event bro_init() &priority=5 {
+ Log::create_stream(Midbro::LOG, [$columns=RegisterData, $path="midbro-parsed"]);
+}
+
+event modbus_read_holding_registers_request(c: connection,
+ headers: ModbusHeaders, start_address: count, quantity: count) {
+ midbro_handle_read_request(c, headers, start_address, quantity);
+}
+
+event modbus_read_holding_registers_response(c: connection,
+ headers: ModbusHeaders, registers: ModbusRegisters) {
+ midbro_handle_read_response(c, headers, registers, "h");
+}
+
+event modbus_read_input_registers_request(c: connection,
+ headers: ModbusHeaders, start_address: count, quantity: count) {
+ midbro_handle_read_request(c, headers, start_address, quantity);
+}
+
+event modbus_read_input_registers_response(c: connection,
+ headers: ModbusHeaders, registers: ModbusRegisters) {
+ midbro_handle_read_response(c, headers, registers, "i");
+}
+
+event modbus_write_multiple_registers_request(c: connection, headers: ModbusHeaders,
+ start_address: count, registers: ModbusRegisters) {
+ midbro_handle_write_request(c, headers, start_address, registers, "i");
}