rust: make cargo clippy clean

Fixing single_match and manual_find intertwined with SCLogDebug

rust/src/dcerpc/dcerpc_udp.rs

@@ -141,13 +141,12 @@ impl DCERPCUDPState {
     }
 
     fn find_incomplete_tx(&mut self, hdr: &DCERPCHdrUdp) -> Option<&mut DCERPCTransaction> {
-        for tx in &mut self.transactions {
+        return self.transactions.iter_mut().find(|tx| {
-            if tx.seqnum == hdr.seqnum && tx.activityuuid == hdr.activityuuid && ((hdr.pkt_type == DCERPC_TYPE_REQUEST && !tx.req_done) || (hdr.pkt_type == DCERPC_TYPE_RESPONSE && !tx.resp_done)) {
+            tx.seqnum == hdr.seqnum
-                SCLogDebug!("found tx id {}, last tx_id {}, {} {}", tx.id, self.tx_id, tx.seqnum, tx.activityuuid[0]);
+                && tx.activityuuid == hdr.activityuuid
-                return Some(tx);
+                && ((hdr.pkt_type == DCERPC_TYPE_REQUEST && !tx.req_done)
-            }
+                    || (hdr.pkt_type == DCERPC_TYPE_RESPONSE && !tx.resp_done))
-        }
+        });
-        None
     }
 
     pub fn handle_fragment_data(&mut self, hdr: &DCERPCHdrUdp, input: &[u8]) -> bool {

rust/src/dns/dns.rs

@@ -358,15 +358,7 @@ impl DNSState {
     }
 
     pub fn get_tx(&mut self, tx_id: u64) -> Option<&DNSTransaction> {
-        SCLogDebug!("get_tx: tx_id={}", tx_id);
+        return self.transactions.iter().find(|&tx| tx.id == tx_id + 1);
-        for tx in &mut self.transactions {
-            if tx.id == tx_id + 1 {
-                SCLogDebug!("Found DNS TX with ID {}", tx_id);
-                return Some(tx);
-            }
-        }
-        SCLogDebug!("Failed to find DNS TX with ID {}", tx_id);
-        return None;
     }
 
     /// Set an event. The event is set on the most recent transaction.

rust/src/nfs/nfs.rs

@@ -462,27 +462,11 @@ impl NFSState {
     }
 
     pub fn get_tx_by_id(&mut self, tx_id: u64) -> Option<&NFSTransaction> {
-        SCLogDebug!("get_tx_by_id: tx_id={}", tx_id);
+        return self.transactions.iter().find(|&tx| tx.id == tx_id + 1);
-        for tx in &mut self.transactions {
-            if tx.id == tx_id + 1 {
-                SCLogDebug!("Found NFS TX with ID {}", tx_id);
-                return Some(tx);
-            }
-        }
-        SCLogDebug!("Failed to find NFS TX with ID {}", tx_id);
-        return None;
     }
 
     pub fn get_tx_by_xid(&mut self, tx_xid: u32) -> Option<&mut NFSTransaction> {
-        SCLogDebug!("get_tx_by_xid: tx_xid={}", tx_xid);
+        return self.transactions.iter_mut().find(|tx| !tx.is_file_tx && tx.xid == tx_xid);
-        for tx in &mut self.transactions {
-            if !tx.is_file_tx && tx.xid == tx_xid {
-                SCLogDebug!("Found NFS TX with ID {} XID {:04X}", tx.id, tx.xid);
-                return Some(tx);
-            }
-        }
-        SCLogDebug!("Failed to find NFS TX with XID {:04X}", tx_xid);
-        return None;
     }
 
     /// Set an event. The event is set on the most recent transaction.
@@ -685,15 +669,11 @@ impl NFSState {
     }
 
     pub fn xidmap_handle2name(&mut self, xidmap: &mut NFSRequestXidMap) {
-        match self.namemap.get(&xidmap.file_handle) {
+        if let Some(n) = self.namemap.get(&xidmap.file_handle) {
-            Some(n) => {
             SCLogDebug!("xidmap_handle2name: name {:?}", n);
             xidmap.file_name = n.to_vec();
-            },
+        } else {
-            _ => {
+            SCLogDebug!("xidmap_handle2name: object {:?} not found", xidmap.file_handle);
-                SCLogDebug!("xidmap_handle2name: object {:?} not found",
-                        xidmap.file_handle);
-            },
         }
     }
 

rust/src/smb/auth.rs

@@ -105,8 +105,7 @@ fn parse_secblob_spnego(blob: &[u8]) -> Option<SpnegoRequest>
             BerObjectContent::Sequence(ref seq) => {
                 for se in seq {
                     SCLogDebug!("SEQ {:?}", se);
-                    match se.content {
+                    if let BerObjectContent::OID(ref oid) = se.content {
-                        BerObjectContent::OID(ref oid) => {
                         SCLogDebug!("OID {:?}", oid);
                         match oid.to_string().as_str() {
                             "1.2.840.48018.1.2.2" => { SCLogDebug!("Microsoft Kerberos 5"); },
@@ -118,8 +117,8 @@ fn parse_secblob_spnego(blob: &[u8]) -> Option<SpnegoRequest>
                             "1.3.6.1.4.1.311.2.2.30" => { SCLogDebug!("NegoEx"); },
                             _ => { SCLogDebug!("unexpected OID {:?}", oid); },
                         }
-                        },
+                    } else {
-                        _ => { SCLogDebug!("expected OID, got {:?}", se); },
+                        SCLogDebug!("expected OID, got {:?}", se);
                     }
                 }
             },

rust/src/smb/smb.rs

@@ -2025,11 +2025,9 @@ fn smb_probe_tcp_midstream(direction: Direction, slice: &[u8], rdir: *mut u8, be
     } else {
         search_smb_record(slice)
     };
-    match r {
+    if let Ok((_, data)) = r {
-        Ok((_, data)) => {
         SCLogDebug!("smb found");
-            match parse_smb_version(data) {
+        if let Ok((_, ref smb)) = parse_smb_version(data) {
-                Ok((_, ref smb)) => {
             SCLogDebug!("SMB {:?}", smb);
             if smb.version == 0xff_u8 { // SMB1
                 SCLogDebug!("SMBv1 record");
@@ -2067,15 +2065,11 @@ fn smb_probe_tcp_midstream(direction: Direction, slice: &[u8], rdir: *mut u8, be
                 SCLogDebug!("SMB3 record");
             }
             return 1;
-                },
+        } else {
-                    _ => {
             SCLogDebug!("smb not found in {:?}", slice);
-                    },
         }
-        },
+    } else {
-        _ => {
         SCLogDebug!("no dice");
-        },
     }
     return 0;
 }

rust/src/smb/smb1.rs

@@ -725,8 +725,7 @@ fn smb1_response_record_one(state: &mut SMBState, r: &SmbRecord, command: u8, an
                         SCLogDebug!("Create AndX {:?}", cr);
 
                         let guid_key = SMBCommonHdr::from1(r, SMBHDR_TYPE_FILENAME);
-                        match state.ssn2vec_map.remove(&guid_key) {
+                        if let Some(mut p) = state.ssn2vec_map.remove(&guid_key) {
-                            Some(mut p) => {
                             p.retain(|&i|i != 0x00);
 
                             let mut fid = cr.fid.to_vec();
@@ -734,10 +733,8 @@ fn smb1_response_record_one(state: &mut SMBState, r: &SmbRecord, command: u8, an
                             SCLogDebug!("SMB1_COMMAND_NT_CREATE_ANDX fid {:?}", fid);
                             SCLogDebug!("fid {:?} name {:?}", fid, p);
                             state.guid2name_map.insert(fid, p);
-                            },
+                        } else {
-                            _ => {
                             SCLogDebug!("SMBv1 response: GUID NOT FOUND");
-                            },
                         }
 
                         let tx_hdr = SMBCommonHdr::from1(r, SMBHDR_TYPE_GENERICTX);

rust/src/smb/smb1_session.rs

@@ -187,16 +187,13 @@ pub fn smb1_session_setup_response(state: &mut SMBState, r: &SmbRecord, andx_off
     };
     // otherwise try match with ssn id 0 (e.g. NTLMSSP_NEGOTIATE)
     if !found {
-        match state.get_sessionsetup_tx(
+        if let Some(tx) = state.get_sessionsetup_tx(
                 SMBCommonHdr::new(SMBHDR_TYPE_HEADER, 0, 0, r.multiplex_id as u64))
         {
-            Some(tx) => {
             smb1_session_setup_update_tx(tx, r, andx_offset);
             SCLogDebug!("smb1_session_setup_response: tx {:?}", tx);
-            },
+        } else {
-            None => {
             SCLogDebug!("smb1_session_setup_response: tx not found for {:?}", r);
-            },
         }
     }
 }

rust/src/smb/smb2_session.rs

@@ -70,16 +70,13 @@ pub fn smb2_session_setup_response(state: &mut SMBState, r: &Smb2Record)
     };
     // otherwise try match with ssn id 0 (e.g. NTLMSSP_NEGOTIATE)
     if !found {
-        match state.get_sessionsetup_tx(
+        if let Some(tx) = state.get_sessionsetup_tx(
                 SMBCommonHdr::new(SMBHDR_TYPE_HEADER, 0, 0, r.message_id))
         {
-            Some(tx) => {
             smb2_session_setup_update_tx(tx, r);
             SCLogDebug!("smb2_session_setup_response: tx {:?}", tx);
-            },
+        } else {
-            None => {
             SCLogDebug!("smb2_session_setup_response: tx not found for {:?}", r);
-            },
         }
     }
 }