aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ldap: fix clippy warnings (unneded conversions)

Browse Source
pull/13432/head
Pierre Chifflier 5 months ago committed by Victor Julien
parent bda22c1f4a
commit ebc1678c5c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
rust/src/ldap/ldap.rs
Unescape Escape View File

@ -234,7 +234,7 @@ impl LdapState {
} }
let mut tx = tx.unwrap(); let mut tx = tx.unwrap();
let tx_id = tx.id(); let tx_id = tx.id();
let request = LdapMessage::from(msg); let request = msg;
// check if STARTTLS was requested // check if STARTTLS was requested
if let ProtocolOp::ExtendedRequest(request) = &request.protocol_op { if let ProtocolOp::ExtendedRequest(request) = &request.protocol_op {
if request.request_name.0 == STARTTLS_OID { if request.request_name.0 == STARTTLS_OID {
@ -299,7 +299,7 @@ impl LdapState {
} }
match ldap_parse_msg(start) { match ldap_parse_msg(start) {
Ok((rem, msg)) => { Ok((rem, msg)) => {
let response = LdapMessage::from(msg); let response = msg;
// check if STARTTLS was requested // check if STARTTLS was requested
if self.request_tls { if self.request_tls {
if let ProtocolOp::ExtendedResponse(response) = &response.protocol_op { if let ProtocolOp::ExtendedResponse(response) = &response.protocol_op {
@ -395,7 +395,7 @@ impl LdapState {
return AppLayerResult::err(); return AppLayerResult::err();
} }
let mut tx = tx.unwrap(); let mut tx = tx.unwrap();
let request = LdapMessage::from(msg); let request = msg;
tx.complete |= tx_is_complete(&request.protocol_op, Direction::ToServer); tx.complete |= tx_is_complete(&request.protocol_op, Direction::ToServer);
tx.request = Some(request.to_static()); tx.request = Some(request.to_static());
self.transactions.push_back(tx); self.transactions.push_back(tx);
@ -436,7 +436,7 @@ impl LdapState {
} }
match ldap_parse_msg(start) { match ldap_parse_msg(start) {
Ok((rem, msg)) => { Ok((rem, msg)) => {
let response = LdapMessage::from(msg); let response = msg;
if let Some(tx) = self.find_request(response.message_id) { if let Some(tx) = self.find_request(response.message_id) {
tx.complete |= tx_is_complete(&response.protocol_op, Direction::ToClient); tx.complete |= tx_is_complete(&response.protocol_op, Direction::ToClient);
let tx_id = tx.id(); let tx_id = tx.id();
@ -535,7 +535,7 @@ fn tx_is_complete(op: &ProtocolOp, dir: Direction) -> bool {
fn probe(input: &[u8], direction: Direction, rdir: *mut u8) -> AppProto { fn probe(input: &[u8], direction: Direction, rdir: *mut u8) -> AppProto {
match ldap_parse_msg(input) { match ldap_parse_msg(input) {
Ok((_, msg)) => { Ok((_, msg)) => {
let ldap_msg = LdapMessage::from(msg); let ldap_msg = msg;
if direction == Direction::ToServer && !ldap_is_request(&ldap_msg) { if direction == Direction::ToServer && !ldap_is_request(&ldap_msg) {
unsafe { unsafe {
*rdir = Direction::ToClient.into(); *rdir = Direction::ToClient.into();

Write Preview
Loading…
Cancel
Save