rust/dhcp: Support get-info-by-id

pull/3998/head
Jeff Lucovsky 7 years ago committed by Victor Julien
parent a5d9d37c34
commit e3ca6b43fc

@ -76,6 +76,16 @@ pub enum DHCPEvent {
MalformedOptions, MalformedOptions,
} }
impl DHCPEvent {
fn from_i32(value: i32) -> Option<DHCPEvent> {
match value {
0 => Some(DHCPEvent::TruncatedOptions),
1 => Some(DHCPEvent::MalformedOptions),
_ => None,
}
}
}
/// The concept of a transaction is more to satisfy the Suricata /// The concept of a transaction is more to satisfy the Suricata
/// app-layer. This DHCP parser is actually stateless where each /// app-layer. This DHCP parser is actually stateless where each
/// message is its own transaction. /// message is its own transaction.
@ -326,6 +336,26 @@ pub extern "C" fn rs_dhcp_tx_set_logged(_state: *mut std::os::raw::c_void,
tx.logged.set(logged); tx.logged.set(logged);
} }
#[no_mangle]
pub extern "C" fn rs_dhcp_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
{
if let Some(e) = DHCPEvent::from_i32(event_id as i32) {
let estr = match e {
DHCPEvent::TruncatedOptions => { "truncated_options\0" },
DHCPEvent::MalformedOptions => { "malformed_options\0" },
};
unsafe{
*event_name = estr.as_ptr() as *const std::os::raw::c_char;
*event_type = core::APP_LAYER_EVENT_TYPE_TRANSACTION;
};
0
} else {
-1
}
}
#[no_mangle] #[no_mangle]
pub extern "C" fn rs_dhcp_state_get_events(tx: *mut std::os::raw::c_void) pub extern "C" fn rs_dhcp_state_get_events(tx: *mut std::os::raw::c_void)
-> *mut core::AppLayerDecoderEvents -> *mut core::AppLayerDecoderEvents
@ -415,6 +445,7 @@ pub unsafe extern "C" fn rs_dhcp_register_parser() {
set_de_state : rs_dhcp_tx_set_detect_state, set_de_state : rs_dhcp_tx_set_detect_state,
get_events : Some(rs_dhcp_state_get_events), get_events : Some(rs_dhcp_state_get_events),
get_eventinfo : Some(rs_dhcp_state_get_event_info), get_eventinfo : Some(rs_dhcp_state_get_event_info),
get_eventinfo_byid : None,
localstorage_new : None, localstorage_new : None,
localstorage_free : None, localstorage_free : None,
get_tx_mpm_id : None, get_tx_mpm_id : None,

Loading…
Cancel
Save