rust: bindgen SCDetectHelperKeywordSetCleanCString

Ticket: 7667

diff --git a/rust/src/detect/mod.rs b/rust/src/detect/mod.rs
index 74050e17a920c53018f5dff8dedcec227bcafdb4..c27347abe87196edf14f92e1c6436f4c31cf40d2 100644 (file)
--- a/rust/src/detect/mod.rs
+++ b/rust/src/detect/mod.rs
@@ -38,7 +38,10 @@ pub mod datasets;
 use std::os::raw::{c_int, c_void};
 use std::ffi::CString;
 
-use suricata_sys::sys::{AppProto, DetectEngineCtx, Signature, SCDetectHelperKeywordRegister, SCSigTableAppLiteElmt};
+use suricata_sys::sys::{
+    AppProto, DetectEngineCtx, SCDetectHelperKeywordRegister, SCDetectHelperKeywordSetCleanCString,
+    SCSigTableAppLiteElmt, Signature,
+};
 
 /// EnumString trait that will be implemented on enums that
 /// derive StringEnum.
@@ -87,7 +90,7 @@ pub fn helper_keyword_register_sticky_buffer(kw: &SigTableElmtStickyBuffer) -> c
     };
     unsafe {
         let r = SCDetectHelperKeywordRegister(&st);
-        DetectHelperKeywordSetCleanCString(r);
+        SCDetectHelperKeywordSetCleanCString(r);
         return r;
     }
 }
@@ -117,7 +120,6 @@ pub const SIGMATCH_INFO_STICKY_BUFFER: u16 = 0x200; // BIT_U16(9)
 
 /// cbindgen:ignore
 extern "C" {
-    pub fn DetectHelperKeywordSetCleanCString(id: c_int);
     pub fn DetectHelperGetData(
         de: *mut c_void, transforms: *const c_void, flow: *const c_void, flow_flags: u8,
         tx: *const c_void, list_id: c_int,

diff --git a/rust/sys/src/sys.rs b/rust/sys/src/sys.rs
index 4e42ffb4f201b56cc2a4fb9dab07b7eda66d8890..b7441777031ba406bffe40a29dc9b9c4f31536a4 100644 (file)
--- a/rust/sys/src/sys.rs
+++ b/rust/sys/src/sys.rs
@@ -176,6 +176,9 @@ extern "C" {
         KeywordsRegister: ::std::option::Option<unsafe extern "C" fn()>,
     ) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn SCDetectHelperKeywordSetCleanCString(id: ::std::os::raw::c_int);
+}
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct DetectEngineCtx_ {

diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c
index 16e1f3fbe657c985cca8b029f36d7f818e74f366..49d34ce5f9e506a43c0726fed05d243542648ffd 100644 (file)
--- a/src/detect-engine-register.c
+++ b/src/detect-engine-register.c
@@ -458,7 +458,7 @@ static void SigCleanCString(SigTableElmt *base)
     SCDetectSigMatchNamesFree(&kw);
 }
 
-void DetectHelperKeywordSetCleanCString(int id)
+void SCDetectHelperKeywordSetCleanCString(int id)
 {
     sigmatch_table[id].Cleanup = SigCleanCString;
 }

diff --git a/src/detect-engine-register.h b/src/detect-engine-register.h
index a2ba40e74947e723c784733e99aff276c53d6460..1f714e4b46384db4212dff7797c33457c2ff8a1f 100644 (file)
--- a/src/detect-engine-register.h
+++ b/src/detect-engine-register.h
@@ -350,6 +350,6 @@ void SigTableSetup(void);
 int SCSigTablePreRegister(void (*KeywordsRegister)(void));
 void SigTableRegisterTests(void);
 bool SigTableHasKeyword(const char *keyword);
-void DetectHelperKeywordSetCleanCString(int id);
+void SCDetectHelperKeywordSetCleanCString(int id);
 
 #endif /* SURICATA_DETECT_ENGINE_REGISTER_H */