From d3bd008e331072171de2f6a1fe44f3180d051f46 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Wed, 18 Nov 2020 16:26:18 -0600 Subject: [PATCH] app-layer template: use derived app-layer event --- rust/src/applayertemplate/template.rs | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/rust/src/applayertemplate/template.rs b/rust/src/applayertemplate/template.rs index 8524061b23..5c6e87e1ba 100644 --- a/rust/src/applayertemplate/template.rs +++ b/rust/src/applayertemplate/template.rs @@ -24,6 +24,9 @@ use super::parser; static mut ALPROTO_TEMPLATE: AppProto = ALPROTO_UNKNOWN; +#[derive(AppLayerEvent)] +enum TemplateEvent {} + pub struct TemplateTransaction { tx_id: u64, pub request: Option, @@ -422,22 +425,6 @@ pub unsafe extern "C" fn rs_template_state_get_events( return tx.events; } -#[no_mangle] -pub extern "C" fn rs_template_state_get_event_info( - _event_name: *const std::os::raw::c_char, - _event_id: *mut std::os::raw::c_int, - _event_type: *mut core::AppLayerEventType, -) -> std::os::raw::c_int { - return -1; -} - -#[no_mangle] -pub extern "C" fn rs_template_state_get_event_info_by_id(_event_id: std::os::raw::c_int, - _event_name: *mut *const std::os::raw::c_char, - _event_type: *mut core::AppLayerEventType -) -> i8 { - return -1; -} #[no_mangle] pub unsafe extern "C" fn rs_template_state_get_tx_iterator( _ipproto: u8, @@ -534,8 +521,8 @@ pub unsafe extern "C" fn rs_template_register_parser() { get_de_state: rs_template_tx_get_detect_state, set_de_state: rs_template_tx_set_detect_state, get_events: Some(rs_template_state_get_events), - get_eventinfo: Some(rs_template_state_get_event_info), - get_eventinfo_byid : Some(rs_template_state_get_event_info_by_id), + get_eventinfo: Some(TemplateEvent::get_event_info), + get_eventinfo_byid : Some(TemplateEvent::get_event_info_by_id), localstorage_new: None, localstorage_free: None, get_files: None, -- 2.47.2