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

fix hdlc ops

Browse Source
This commit is contained in:
Will Greenberg
2023-12-07 18:49:39 -08:00
parent 76555fe68c
commit 10bafc3faa
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/hdlc.rs
View File

@@ -23,16 +23,23 @@ pub enum HdlcError {
pub fn hdlc_encapsulate(data: &[u8], crc: &Crc<u16>) -> Vec<u8> { pub fn hdlc_encapsulate(data: &[u8], crc: &Crc<u16>) -> Vec<u8> {
let mut result: Vec<u8> = vec![]; let mut result: Vec<u8> = vec![];
result.put_u16_le(crc.checksum(&data));
let escaped = data.iter() for &b in data {
.flat_map(|&b| match b { match b {
// TODO: is this too expensive? 0x7e => result.extend([0x7d, 0x5e]),
0x7e => vec![0x7d, 0x5e], 0x7d => result.extend([0x7d, 0x5d]),
0x7d => vec![0x7d, 0x5d], _ => result.push(b),
_ => vec![b], }
}); }
result.extend(escaped);
for b in crc.checksum(&data).to_le_bytes() {
match b {
0x7e => result.extend([0x7d, 0x5e]),
0x7d => result.extend([0x7d, 0x5d]),
_ => result.push(b),
}
}
result.push(0x7e); result.push(0x7e);
result result
} }
@@ -43,14 +50,13 @@ pub fn hdlc_decapsulate(data: &[u8], crc: &Crc<u16>) -> Result<Vec<u8>, HdlcErro
return Err(HdlcError::TooShort); return Err(HdlcError::TooShort);
} }
let last_char = data[data.len() - 1]; // safe since len() >= 3 if data[data.len() - 1] != 0x7e {
if last_char != 0x7e { return Err(HdlcError::NoTrailingCharacter(data[data.len() - 1]));
return Err(HdlcError::NoTrailingCharacter(last_char));
} }
let mut unescaped = Vec::new(); let mut unescaped = Vec::new();
let mut escaping = false; let mut escaping = false;
for &b in data { for &b in &data[..data.len() - 1] {
if escaping { if escaping {
match b { match b {
0x5e => unescaped.push(0x7e), 0x5e => unescaped.push(0x7e),