Mirror/rayhunter
1
0
Fork 0
mirror of https://github.com/EFForg/rayhunter.git synced 2026-07-21 23:18:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

appease clippy

Browse Source
This commit is contained in:
Will Greenberg
2023-12-04 16:54:46 -08:00
parent e6fab5c27d
commit ccd9dfa2a7
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/diag.rs
+2 -2
View File
@@ -1,6 +1,6 @@
//! Diag protocol serialization/deserialization //! Diag protocol serialization/deserialization
use chrono::{DateTime, Local, FixedOffset}; use chrono::{DateTime, FixedOffset};
use deku::prelude::*; use deku::prelude::*;
#[derive(Debug, Clone, DekuWrite)] #[derive(Debug, Clone, DekuWrite)]
@@ -137,7 +137,7 @@ pub fn build_log_mask_request(log_type: u32, log_mask_bitsize: u32) -> Request {
} }
Request::LogConfig(LogConfigRequest::SetMask { Request::LogConfig(LogConfigRequest::SetMask {
log_type: log_type as u32, log_type,
log_mask_bitsize, log_mask_bitsize,
log_mask, log_mask,
}) })
src/diag_device.rs
+3 -5
View File
@@ -2,8 +2,7 @@ use crate::hdlc::{hdlc_encapsulate, hdlc_decapsulate, HdlcError};
use crate::diag::{Message, ResponsePayload, Request, LogConfigRequest, LogConfigResponse, build_log_mask_request, RequestContainer, DataType, MessagesContainer}; use crate::diag::{Message, ResponsePayload, Request, LogConfigRequest, LogConfigResponse, build_log_mask_request, RequestContainer, DataType, MessagesContainer};
use std::fs::File; use std::fs::File;
use std::io::{Cursor, Read, Write}; use std::io::Read;
use bytes::{Buf, BufMut};
use std::os::fd::AsRawFd; use std::os::fd::AsRawFd;
use thiserror::Error; use thiserror::Error;
use crc::{Crc, Algorithm}; use crc::{Crc, Algorithm};
@@ -43,7 +42,6 @@ pub const CRC_CCITT_ALG: Algorithm<u16> = Algorithm {
}; };
const BUFFER_LEN: usize = 1024 * 1024 * 10; const BUFFER_LEN: usize = 1024 * 1024 * 10;
const USER_SPACE_DATA_TYPE: i32 = 32;
const MEMORY_DEVICE_MODE: i32 = 2; const MEMORY_DEVICE_MODE: i32 = 2;
const DIAG_IOCTL_REMOTE_DEV: u32 = 32; const DIAG_IOCTL_REMOTE_DEV: u32 = 32;
const DIAG_IOCTL_SWITCH_LOGGING: u32 = 7; const DIAG_IOCTL_SWITCH_LOGGING: u32 = 7;
@@ -151,7 +149,7 @@ impl DiagDevice {
} }
} }
return Err(DiagDeviceError::NoResponse(req)); Err(DiagDeviceError::NoResponse(req))
} }
fn set_log_mask(&mut self, log_type: u32, log_mask_bitsize: u32) -> DiagResult<()> { fn set_log_mask(&mut self, log_type: u32, log_mask_bitsize: u32) -> DiagResult<()> {
@@ -173,7 +171,7 @@ impl DiagDevice {
} }
} }
return Err(DiagDeviceError::NoResponse(req)); Err(DiagDeviceError::NoResponse(req))
} }
pub fn config_logs(&mut self) -> DiagResult<()> { pub fn config_logs(&mut self) -> DiagResult<()> {
src/hdlc.rs
+1 -2
View File
@@ -49,8 +49,7 @@ pub fn hdlc_decapsulate(mut data: Vec<u8>, crc: &Crc<u16>) -> Result<Vec<u8>, Hd
let mut unescaped = Vec::new(); let mut unescaped = Vec::new();
let mut escaping = false; let mut escaping = false;
for i in 0..data.len() { for b in data {
let b = data[i];
if escaping { if escaping {
match b { match b {
0x5e => unescaped.push(0x7e), 0x5e => unescaped.push(0x7e),