dswd
/
vpncloud
mirror of https://github.com/dswd/vpncloud.git
1
0
Fork 0
Code Issues Releases Wiki Activity

treat vlan id 0x000 as untagged

This commit is contained in:
Dennis Schwerdel 2020-10-21 23:42:03 +02:00
parent 28d26830c9
commit 7e8b042055
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/payload.rs
View File

@ -36,8 +36,14 @@ impl Protocol for Frame {
src.copy_within(..6, 2); src.copy_within(..6, 2);
dst.copy_within(..6, 2); dst.copy_within(..6, 2);
cursor.read_exact(&mut src[..2]).map_err(|_| Error::Parse("Vlan frame is too short"))?; cursor.read_exact(&mut src[..2]).map_err(|_| Error::Parse("Vlan frame is too short"))?;
src[0] &= 0x0f; src[0] &= 0x0f; // restrict vlan id to 12 bits
dst[..2].copy_from_slice(&src[..2]); dst[..2].copy_from_slice(&src[..2]);
if src[0..1] == [0, 0] {
// treat vlan id 0x000 as untagged
src.copy_within(2..8, 0);
dst.copy_within(2..8, 0);
return Ok((Address { data: src, len: 6 }, Address { data: dst, len: 6 }))
}
Ok((Address { data: src, len: 8 }, Address { data: dst, len: 8 })) Ok((Address { data: src, len: 8 }, Address { data: dst, len: 8 }))
} else { } else {
Ok((Address { data: src, len: 6 }, Address { data: dst, len: 6 })) Ok((Address { data: src, len: 6 }, Address { data: dst, len: 6 }))