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

VLan as Option

This commit is contained in:
Dennis Schwerdel 2015-11-22 16:50:57 +01:00
parent e92f237d5e
commit 0a04c9f1b9
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ethernet.rs
View File

@ -28,7 +28,7 @@ pub type VlanId = u16;
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct EthAddr { pub struct EthAddr {
pub mac: Mac, pub mac: Mac,
pub vlan: VlanId pub vlan: Option<VlanId>
} }
#[derive(PartialEq)] #[derive(PartialEq)]
@ -39,7 +39,7 @@ pub struct Frame {
impl fmt::Debug for Frame { impl fmt::Debug for Frame {
fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
write!(formatter, "src: {:?}, dst: {:?}, vlan: {}", self.src.mac, self.dst.mac, self.src.vlan) write!(formatter, "src: {:?}, dst: {:?}, vlan: {:?}", self.src.mac, self.dst.mac, self.src.vlan)
} }
} }
@ -64,10 +64,10 @@ impl InterfaceMessage for Frame {
let src_dat = as_bytes::<Mac>(&self.src.mac); let src_dat = as_bytes::<Mac>(&self.src.mac);
ptr::copy_nonoverlapping(src_dat.as_ptr(), data[pos..].as_mut_ptr(), src_dat.len()); ptr::copy_nonoverlapping(src_dat.as_ptr(), data[pos..].as_mut_ptr(), src_dat.len());
pos += src_dat.len(); pos += src_dat.len();
if self.src.vlan != 0 { if let Some(vlan) = self.src.vlan {
data[pos] = 0x81; data[pos+1] = 0x00; data[pos] = 0x81; data[pos+1] = 0x00;
pos += 2; pos += 2;
let vlan_dat = mem::transmute::<u16, [u8; 2]>(self.src.vlan.to_be()); let vlan_dat = mem::transmute::<u16, [u8; 2]>(vlan.to_be());
ptr::copy_nonoverlapping(vlan_dat.as_ptr(), data[pos..].as_mut_ptr(), vlan_dat.len()); ptr::copy_nonoverlapping(vlan_dat.as_ptr(), data[pos..].as_mut_ptr(), vlan_dat.len());
pos += vlan_dat.len(); pos += vlan_dat.len();
} }
@ -86,14 +86,14 @@ impl InterfaceMessage for Frame {
pos += mem::size_of::<Mac>(); pos += mem::size_of::<Mac>();
let src = *unsafe { as_obj::<Mac>(&data[pos..]) }; let src = *unsafe { as_obj::<Mac>(&data[pos..]) };
pos += mem::size_of::<Mac>(); pos += mem::size_of::<Mac>();
let mut vlan = 0; let mut vlan = None;
let mut payload = &data[pos..]; let mut payload = &data[pos..];
if data[pos] == 0x81 && data[pos+1] == 0x00 { if data[pos] == 0x81 && data[pos+1] == 0x00 {
pos += 2; pos += 2;
if data.len() < pos + 2 { if data.len() < pos + 2 {
return Err(Error::ParseError("Vlan frame is too short")); return Err(Error::ParseError("Vlan frame is too short"));
} }
vlan = u16::from_be(* unsafe { as_obj::<u16>(&data[pos..]) }); vlan = Some(u16::from_be(* unsafe { as_obj::<u16>(&data[pos..]) }));
pos += 2; pos += 2;
payload = &data[pos..]; payload = &data[pos..];
} }
@ -179,7 +179,7 @@ impl Table for MacTable {
} }
} }
for key in del { for key in del {
info!("Forgot mac: {:?} (vlan {})", key.mac, key.vlan); info!("Forgot mac: {:?} (vlan {:?})", key.mac, key.vlan);
self.table.remove(&key); self.table.remove(&key);
} }
} }
@ -187,7 +187,7 @@ impl Table for MacTable {
fn learn(&mut self, key: Self::Address, addr: SocketAddr) { fn learn(&mut self, key: Self::Address, addr: SocketAddr) {
let value = MacTableValue{address: addr, timeout: SteadyTime::now()+self.timeout}; let value = MacTableValue{address: addr, timeout: SteadyTime::now()+self.timeout};
if self.table.insert(key, value).is_none() { if self.table.insert(key, value).is_none() {
info!("Learned mac: {:?} (vlan {}) => {}", key.mac, key.vlan, addr); info!("Learned mac: {:?} (vlan {:?}) => {}", key.mac, key.vlan, addr);
} }
} }
@ -206,7 +206,7 @@ fn without_vlan() {
let dst = Mac([6,5,4,3,2,1]); let dst = Mac([6,5,4,3,2,1]);
let payload = [1,2,3,4,5,6,7,8]; let payload = [1,2,3,4,5,6,7,8];
let mut buf = [0u8; 1024]; let mut buf = [0u8; 1024];
let frame = Frame{src: EthAddr{mac: src, vlan: 0}, dst: EthAddr{mac: dst, vlan: 0}}; let frame = Frame{src: EthAddr{mac: src, vlan: None}, dst: EthAddr{mac: dst, vlan: None}};
let size = frame.encode_to(&payload, &mut buf); let size = frame.encode_to(&payload, &mut buf);
assert_eq!(size, 20); assert_eq!(size, 20);
assert_eq!(&buf[..size], &[6,5,4,3,2,1,1,2,3,4,5,6,1,2,3,4,5,6,7,8]); assert_eq!(&buf[..size], &[6,5,4,3,2,1,1,2,3,4,5,6,1,2,3,4,5,6,7,8]);
@ -221,7 +221,7 @@ fn with_vlan() {
let dst = Mac([6,5,4,3,2,1]); let dst = Mac([6,5,4,3,2,1]);
let payload = [1,2,3,4,5,6,7,8]; let payload = [1,2,3,4,5,6,7,8];
let mut buf = [0u8; 1024]; let mut buf = [0u8; 1024];
let frame = Frame{src: EthAddr{mac: src, vlan: 1234}, dst: EthAddr{mac: dst, vlan: 1234}}; let frame = Frame{src: EthAddr{mac: src, vlan: Some(1234)}, dst: EthAddr{mac: dst, vlan: Some(1234)}};
let size = frame.encode_to(&payload, &mut buf); let size = frame.encode_to(&payload, &mut buf);
assert_eq!(size, 24); assert_eq!(size, 24);
assert_eq!(&buf[..size], &[6,5,4,3,2,1,1,2,3,4,5,6,0x81,0,4,210,1,2,3,4,5,6,7,8]); assert_eq!(&buf[..size], &[6,5,4,3,2,1,1,2,3,4,5,6,0x81,0,4,210,1,2,3,4,5,6,7,8]);

2
src/udpmessage.rs
View File

@ -189,7 +189,7 @@ fn encode_message_packet() {
let src = Mac([1,2,3,4,5,6]); let src = Mac([1,2,3,4,5,6]);
let dst = Mac([7,8,9,10,11,12]); let dst = Mac([7,8,9,10,11,12]);
let payload = [1,2,3,4,5]; let payload = [1,2,3,4,5];
let frame = ethernet::Frame{src: ethernet::EthAddr{mac: src, vlan: 0}, dst: ethernet::EthAddr{mac: dst, vlan: 0}}; let frame = ethernet::Frame{src: ethernet::EthAddr{mac: src, vlan: None}, dst: ethernet::EthAddr{mac: dst, vlan: None}};
let msg = Message::Frame(frame, &payload); let msg = Message::Frame(frame, &payload);
let mut buf = [0; 1024]; let mut buf = [0; 1024];
let size = encode(&options, &msg, &mut buf[..]); let size = encode(&options, &msg, &mut buf[..]);