detect: rename with prefix SCSigTablePreRegister

to make it available to rust via bindgen

diff --git a/rust/src/applayer.rs b/rust/src/applayer.rs
index 8faed5c284fe9e541ba3a59a0043e3346c55a788..1a1e1f92dc1cf35baf428cdbfdbbce23d822ddfb 100644 (file)
--- a/rust/src/applayer.rs
+++ b/rust/src/applayer.rs
@@ -491,12 +491,6 @@ pub type ApplyTxConfigFn = unsafe extern "C" fn (*mut c_void, *mut c_void, c_int
 pub type GetFrameIdByName = unsafe extern "C" fn(*const c_char) -> c_int;
 pub type GetFrameNameById = unsafe extern "C" fn(u8) -> *const c_char;
 
-// Defined in detect-engine-register.h
-/// cbindgen:ignore
-extern "C" {
-    pub fn SigTablePreRegister(cb: unsafe extern "C" fn ());
-}
-
 // Defined in app-layer-register.h
 /// cbindgen:ignore
 extern "C" {

diff --git a/rust/src/snmp/snmp.rs b/rust/src/snmp/snmp.rs
index 34847eb682585dfda6ac6c898737132ed1227160..2271a931428bac833d8e00258c995d4b56382602 100644 (file)
--- a/rust/src/snmp/snmp.rs
+++ b/rust/src/snmp/snmp.rs
@@ -34,7 +34,7 @@ use nom7::{Err, IResult};
 use nom7::error::{ErrorKind, make_error};
 use suricata_sys::sys::{
     AppProto, AppProtoNewProtoFromString, EveJsonTxLoggerRegistrationData,
-    SCOutputJsonLogDirection, SCOutputEvePreRegisterLogger,
+    SCOutputJsonLogDirection, SCOutputEvePreRegisterLogger, SCSigTablePreRegister,
 };
 
 #[derive(AppLayerEvent)]
@@ -418,7 +418,7 @@ pub unsafe extern "C" fn SCRegisterSnmpParser() {
         LogTx: Some(snmp_log_json_response),
     };
     SCOutputEvePreRegisterLogger(reg_data);
-    SigTablePreRegister(detect_snmp_register);
+    SCSigTablePreRegister(Some(detect_snmp_register));
     if AppLayerProtoDetectConfProtoDetectionEnabled(ip_proto_str.as_ptr(), parser.name) != 0 {
         // port 161
         _ = AppLayerRegisterProtocolDetection(&parser, 1);

diff --git a/rust/sys/src/sys.rs b/rust/sys/src/sys.rs
index 2a3dcf526673e0f5b82847273824bfa2bc7af588..ae4902812bba2fc8d673eb4c6a8e978de0d5051c 100644 (file)
--- a/rust/sys/src/sys.rs
+++ b/rust/sys/src/sys.rs
@@ -171,6 +171,11 @@ extern "C" {
         reg_data: EveJsonTxLoggerRegistrationData,
     ) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn SCSigTablePreRegister(
+        KeywordsRegister: ::std::option::Option<unsafe extern "C" fn()>,
+    ) -> ::std::os::raw::c_int;
+}
 #[doc = " Structure of a configuration parameter."]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]

diff --git a/src/bindgen.h b/src/bindgen.h
index a568685b2cfce8327c2584fbede6680df240e762..6ff6dc038ad6d1f671d1c4b0109c943421187301 100644 (file)
--- a/src/bindgen.h
+++ b/src/bindgen.h
@@ -32,6 +32,7 @@
 #include "app-layer-protos.h"
 #include "suricata-plugin.h"
 #include "output-eve-bindgen.h"
+#include "detect-engine-register.h"
 
 #include "conf.h"
 

diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c
index d2e9e566e63625c776cbe19a362310b10f220172..e575f3a61b7ee8d842298843770ce374de6005fa 100644 (file)
--- a/src/detect-engine-register.c
+++ b/src/detect-engine-register.c
@@ -476,7 +476,7 @@ static size_t preregistered_callbacks_cap = 0;
 // When an app-layer plugin is loaded, it wants to register its keywords
 // But the plugin is loaded before keywords can register
 // The preregistration callbacks will later be called by SigTableSetup
-int SigTablePreRegister(void (*KeywordsRegister)(void))
+int SCSigTablePreRegister(void (*KeywordsRegister)(void))
 {
     if (preregistered_callbacks_nb == preregistered_callbacks_cap) {
         void *tmp = SCRealloc(PreregisteredCallbacks,

diff --git a/src/detect-engine-register.h b/src/detect-engine-register.h
index 64355e04e48770e2457fcbe9ff1a418a62902e20..2f19793a8ad1bf31521a2ce2fed93173499432bb 100644 (file)
--- a/src/detect-engine-register.h
+++ b/src/detect-engine-register.h
@@ -24,8 +24,6 @@
 #ifndef SURICATA_DETECT_ENGINE_REGISTER_H
 #define SURICATA_DETECT_ENGINE_REGISTER_H
 
-#include "suricata-common.h"
-
 enum DetectKeywordId {
     DETECT_SID,
     DETECT_PRIORITY,
@@ -350,7 +348,7 @@ int SigTableList(const char *keyword);
 void SigTableCleanup(void);
 void SigTableInit(void);
 void SigTableSetup(void);
-int SigTablePreRegister(void (*KeywordsRegister)(void));
+int SCSigTablePreRegister(void (*KeywordsRegister)(void));
 void SigTableRegisterTests(void);
 bool SigTableHasKeyword(const char *keyword);
 

diff --git a/src/detect-smb-ntlmssp.c b/src/detect-smb-ntlmssp.c
index b6d07ded3ebc6d362a04eff926076978c135753d..644704400eecbc36c8992e84f7a819d18a0f7160 100644 (file)
--- a/src/detect-smb-ntlmssp.c
+++ b/src/detect-smb-ntlmssp.c
@@ -22,8 +22,8 @@
  *
  */
 
-#include "detect-engine-register.h"
 #include "suricata-common.h"
+#include "detect-engine-register.h"
 
 #include "detect.h"
 #include "detect-parse.h"

diff --git a/src/util-plugin.c b/src/util-plugin.c
index 564c1f5dba7c3c004cdd5e748f45055441fd27d6..6081590a360882151c1c5a0c17375e3eacb9672e 100644 (file)
--- a/src/util-plugin.c
+++ b/src/util-plugin.c
@@ -171,7 +171,7 @@ int SCPluginRegisterAppLayer(SCAppLayerPlugin *plugin)
         }
     }
     if (plugin->KeywordsRegister) {
-        if (SigTablePreRegister(plugin->KeywordsRegister) != 0) {
+        if (SCSigTablePreRegister(plugin->KeywordsRegister) != 0) {
             return 1;
         }
     }