diff --git a/rust/src/dns/parser.rs b/rust/src/dns/parser.rs index d208875078..94b1762db2 100644 --- a/rust/src/dns/parser.rs +++ b/rust/src/dns/parser.rs @@ -50,7 +50,7 @@ pub fn dns_parse_header(i: &[u8]) -> IResult<&[u8], DNSHeader> { /// Parameters: /// start: the start of the name /// message: the complete message that start is a part of -pub fn dns_parse_name<'a, 'b>(start: &'b [u8], message: &'b [u8]) -> IResult<&'b [u8], Vec> { +pub fn dns_parse_name<'b>(start: &'b [u8], message: &'b [u8]) -> IResult<&'b [u8], Vec> { let mut pos = start; let mut pivot = start; let mut name: Vec = Vec::with_capacity(32); diff --git a/rust/src/lib.rs b/rust/src/lib.rs index ee5810c668..b814bf85a9 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -32,7 +32,6 @@ #![allow(clippy::collapsible_if)] #![allow(clippy::derive_partial_eq_without_eq)] #![allow(clippy::explicit_counter_loop)] -#![allow(clippy::extra_unused_lifetimes)] #![allow(clippy::field_reassign_with_default)] #![allow(clippy::manual_find)] #![allow(clippy::match_like_matches_macro)] diff --git a/rust/src/nfs/nfs.rs b/rust/src/nfs/nfs.rs index 97282ca9c8..26960cdccf 100644 --- a/rust/src/nfs/nfs.rs +++ b/rust/src/nfs/nfs.rs @@ -1113,7 +1113,7 @@ impl NFSState { } } - pub fn parse_tcp_data_ts_gap<'b>(&mut self, gap_size: u32) -> AppLayerResult { + pub fn parse_tcp_data_ts_gap(&mut self, gap_size: u32) -> AppLayerResult { SCLogDebug!("parse_tcp_data_ts_gap ({})", gap_size); let gap = vec![0; gap_size as usize]; let consumed = self.filetracker_update(Direction::ToServer, &gap, gap_size); @@ -1127,7 +1127,7 @@ impl NFSState { return AppLayerResult::ok(); } - pub fn parse_tcp_data_tc_gap<'b>(&mut self, gap_size: u32) -> AppLayerResult { + pub fn parse_tcp_data_tc_gap(&mut self, gap_size: u32) -> AppLayerResult { SCLogDebug!("parse_tcp_data_tc_gap ({})", gap_size); let gap = vec![0; gap_size as usize]; let consumed = self.filetracker_update(Direction::ToClient, &gap, gap_size); @@ -1198,7 +1198,7 @@ impl NFSState { } /// Parsing function, handling TCP chunks fragmentation - pub fn parse_tcp_data_ts<'b>(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult { + pub fn parse_tcp_data_ts(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult { let mut cur_i = stream_slice.as_slice(); // take care of in progress file chunk transfers // and skip buffer beyond it @@ -1362,7 +1362,7 @@ impl NFSState { } /// Parsing function, handling TCP chunks fragmentation - pub fn parse_tcp_data_tc<'b>(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult { + pub fn parse_tcp_data_tc(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult { let mut cur_i = stream_slice.as_slice(); // take care of in progress file chunk transfers // and skip buffer beyond it @@ -1466,7 +1466,7 @@ impl NFSState { AppLayerResult::ok() } /// Parsing function - pub fn parse_udp_ts<'b>(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult { + pub fn parse_udp_ts(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult { let input = stream_slice.as_slice(); SCLogDebug!("parse_udp_ts ({})", input.len()); self.add_rpc_udp_ts_pdu(flow, stream_slice, input, input.len() as i64); @@ -1498,7 +1498,7 @@ impl NFSState { } /// Parsing function - pub fn parse_udp_tc<'b>(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult { + pub fn parse_udp_tc(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult { let input = stream_slice.as_slice(); SCLogDebug!("parse_udp_tc ({})", input.len()); self.add_rpc_udp_tc_pdu(flow, stream_slice, input, input.len() as i64); diff --git a/rust/src/smb/dcerpc.rs b/rust/src/smb/dcerpc.rs index fccdac1b19..9e93232bf4 100644 --- a/rust/src/smb/dcerpc.rs +++ b/rust/src/smb/dcerpc.rs @@ -394,7 +394,7 @@ fn smb_read_dcerpc_record_error(state: &mut SMBState, return found; } -fn dcerpc_response_handle<'b>(tx: &mut SMBTransaction, +fn dcerpc_response_handle(tx: &mut SMBTransaction, vercmd: SMBVerCmdStat, dcer: &DceRpcRecord) { @@ -520,7 +520,7 @@ pub fn smb_read_dcerpc_record<'b>(state: &mut SMBState, } /// Try to find out if the input data looks like DCERPC -pub fn smb_dcerpc_probe<'b>(data: &[u8]) -> bool +pub fn smb_dcerpc_probe(data: &[u8]) -> bool { if let Ok((_, recr)) = parse_dcerpc_record(data) { SCLogDebug!("SMB: could be DCERPC {:?}", recr); diff --git a/rust/src/smb/smb.rs b/rust/src/smb/smb.rs index d5dc6421e4..32ce5f6218 100644 --- a/rust/src/smb/smb.rs +++ b/rust/src/smb/smb.rs @@ -1316,7 +1316,7 @@ impl SMBState { } /// Parsing function, handling TCP chunks fragmentation - pub fn parse_tcp_data_ts<'b>(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult + pub fn parse_tcp_data_ts(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult { let mut cur_i = stream_slice.as_slice(); let consumed = self.handle_skip(Direction::ToServer, cur_i.len() as u32); @@ -1645,7 +1645,7 @@ impl SMBState { } /// Parsing function, handling TCP chunks fragmentation - pub fn parse_tcp_data_tc<'b>(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult + pub fn parse_tcp_data_tc(&mut self, flow: *const Flow, stream_slice: &StreamSlice) -> AppLayerResult { let mut cur_i = stream_slice.as_slice(); let consumed = self.handle_skip(Direction::ToClient, cur_i.len() as u32);