From: Jason Ish Date: Mon, 5 May 2025 15:03:28 +0000 (-0600) Subject: rust/modbus: replace rs_ naming to SC X-Git-Tag: suricata-8.0.0-rc1~358 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01ce0f92e879f61ffd62e540e11ce92d2ec2927d;p=thirdparty%2Fsuricata.git rust/modbus: replace rs_ naming to SC This was missed in the previous round. --- diff --git a/rust/src/modbus/log.rs b/rust/src/modbus/log.rs index a77b920604..75fb6b2636 100644 --- a/rust/src/modbus/log.rs +++ b/rust/src/modbus/log.rs @@ -21,7 +21,7 @@ use crate::jsonbuilder::{JsonBuilder, JsonError}; use sawp_modbus::{Data, Message, Read, Write}; #[no_mangle] -pub extern "C" fn rs_modbus_to_json(tx: &ModbusTransaction, js: &mut JsonBuilder) -> bool { +pub extern "C" fn SCModbusToJson(tx: &ModbusTransaction, js: &mut JsonBuilder) -> bool { log(tx, js).is_ok() } diff --git a/src/output.c b/src/output.c index 276534b428..9cc7030b48 100644 --- a/src/output.c +++ b/src/output.c @@ -901,8 +901,7 @@ void OutputRegisterRootLoggers(void) // ALPROTO_DCERPC special: uses state RegisterSimpleJsonApplayerLogger(ALPROTO_DNS, (EveJsonSimpleTxLogFunc)AlertJsonDns, NULL); // either need a cast here or in rust for ModbusTransaction, done here - RegisterSimpleJsonApplayerLogger( - ALPROTO_MODBUS, (EveJsonSimpleTxLogFunc)rs_modbus_to_json, NULL); + RegisterSimpleJsonApplayerLogger(ALPROTO_MODBUS, (EveJsonSimpleTxLogFunc)SCModbusToJson, NULL); RegisterSimpleJsonApplayerLogger(ALPROTO_ENIP, (EveJsonSimpleTxLogFunc)SCEnipLoggerLog, NULL); RegisterSimpleJsonApplayerLogger(ALPROTO_DNP3, (EveJsonSimpleTxLogFunc)AlertJsonDnp3, NULL); // ALPROTO_NFS special: uses state