Fix length of tx buffers returned by fault injector.

whitequark · whitequark · commit 1c7f972a86c3 · 2016-12-31T01:10:46.000Z
diff --git a/src/phy/fault_injector.rs b/src/phy/fault_injector.rs
@@ -119,19 +119,20 @@ impl<T: Device> Device for FaultInjector<T>
         Ok(buffer)
     }
 
-    fn transmit(&mut self, len: usize) -> Result<Self::TxBuffer, Error> {
+    fn transmit(&mut self, length: usize) -> Result<Self::TxBuffer, Error> {
         let buffer;
         if check_rng(&mut self.state, self.config.drop_pct) {
             net_trace!("rx: dropping a packet");
             buffer = None;
         } else {
-            buffer = Some(try!(self.lower.transmit(len)));
+            buffer = Some(try!(self.lower.transmit(length)));
         }
         Ok(TxBuffer {
             buffer: buffer,
             state:  xorshift32(&mut self.state),
             config: self.config,
-            junk:   [0; MTU]
+            junk:   [0; MTU],
+            length: length
         })
     }
 }
@@ -141,15 +142,16 @@ pub struct TxBuffer<T: AsRef<[u8]> + AsMut<[u8]>> {
     state:  u32,
     config: Config,
     buffer: Option<T>,
-    junk:   [u8; MTU]
+    junk:   [u8; MTU],
+    length: usize
 }
 
 impl<T: AsRef<[u8]> + AsMut<[u8]>> AsRef<[u8]>
         for TxBuffer<T> {
     fn as_ref(&self) -> &[u8] {
         match self.buffer {
             Some(ref buf) => buf.as_ref(),
-            None => &self.junk[..]
+            None => &self.junk[..self.length]
         }
     }
 }
@@ -159,7 +161,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> AsMut<[u8]>
     fn as_mut(&mut self) -> &mut [u8] {
         match self.buffer {
             Some(ref mut buf) => buf.as_mut(),
-            None => &mut self.junk[..]
+            None => &mut self.junk[..self.length]
         }
     }
 }
diff --git a/src/phy/mod.rs b/src/phy/mod.rs
@@ -51,5 +51,5 @@ pub trait Device {
     /// It is expected that a `transmit` implementation would gain ownership of a buffer with
     /// the requested length, provide it for emission, and schedule it to be read from
     /// memory by the network device once it is dropped.
-    fn transmit(&mut self, len: usize) -> Result<Self::TxBuffer, Error>;
+    fn transmit(&mut self, length: usize) -> Result<Self::TxBuffer, Error>;
 }
diff --git a/src/phy/raw_socket.rs b/src/phy/raw_socket.rs
@@ -43,10 +43,10 @@ impl Device for RawSocket {
         Ok(buffer)
     }
 
-    fn transmit(&mut self, len: usize) -> Result<Self::TxBuffer, Error> {
+    fn transmit(&mut self, length: usize) -> Result<Self::TxBuffer, Error> {
         Ok(TxBuffer {
             lower:  self.lower.clone(),
-            buffer: vec![0; len]
+            buffer: vec![0; length]
         })
     }
 }
diff --git a/src/phy/tap_interface.rs b/src/phy/tap_interface.rs
@@ -43,10 +43,10 @@ impl Device for TapInterface {
         Ok(buffer)
     }
 
-    fn transmit(&mut self, len: usize) -> Result<Self::TxBuffer, Error> {
+    fn transmit(&mut self, length: usize) -> Result<Self::TxBuffer, Error> {
         Ok(TxBuffer {
             lower:  self.lower.clone(),
-            buffer: vec![0; len]
+            buffer: vec![0; length]
         })
     }
 }
diff --git a/src/phy/tracer.rs b/src/phy/tracer.rs
@@ -51,8 +51,8 @@ impl<T: Device, U: PrettyPrint> Device for Tracer<T, U> {
         Ok(buffer)
     }
 
-    fn transmit(&mut self, len: usize) -> Result<Self::TxBuffer, Error> {
-        let buffer = try!(self.lower.transmit(len));
+    fn transmit(&mut self, length: usize) -> Result<Self::TxBuffer, Error> {
+        let buffer = try!(self.lower.transmit(length));
         Ok(TxBuffer {
             buffer:  buffer,
             writer:  self.writer

Original file line number	Diff line number	Diff line change
`@@ -119,19 +119,20 @@ impl<T: Device> Device for FaultInjector<T>`
`119`	`119`	`Ok(buffer)`
`120`	`120`	`}`
`121`	`121`
`122`		`- fn transmit(&mut self, len: usize) -> Result<Self::TxBuffer, Error> {`
	`122`	`+ fn transmit(&mut self, length: usize) -> Result<Self::TxBuffer, Error> {`
`123`	`123`	`let buffer;`
`124`	`124`	`if check_rng(&mut self.state, self.config.drop_pct) {`
`125`	`125`	`net_trace!("rx: dropping a packet");`
`126`	`126`	`buffer = None;`
`127`	`127`	`} else {`
`128`		`- buffer = Some(try!(self.lower.transmit(len)));`
	`128`	`+ buffer = Some(try!(self.lower.transmit(length)));`
`129`	`129`	`}`
`130`	`130`	`Ok(TxBuffer {`
`131`	`131`	`buffer: buffer,`
`132`	`132`	`state: xorshift32(&mut self.state),`
`133`	`133`	`config: self.config,`
`134`		`- junk: [0; MTU]`
	`134`	`+ junk: [0; MTU],`
	`135`	`+ length: length`
`135`	`136`	`})`
`136`	`137`	`}`
`137`	`138`	`}`
`@@ -141,15 +142,16 @@ pub struct TxBuffer<T: AsRef<[u8]> + AsMut<[u8]>> {`
`141`	`142`	`state: u32,`
`142`	`143`	`config: Config,`
`143`	`144`	`buffer: Option<T>,`
`144`		`- junk: [u8; MTU]`
	`145`	`+ junk: [u8; MTU],`
	`146`	`+ length: usize`
`145`	`147`	`}`
`146`	`148`
`147`	`149`	`impl<T: AsRef<[u8]> + AsMut<[u8]>> AsRef<[u8]>`
`148`	`150`	`for TxBuffer<T> {`
`149`	`151`	`fn as_ref(&self) -> &[u8] {`
`150`	`152`	`match self.buffer {`
`151`	`153`	`Some(ref buf) => buf.as_ref(),`
`152`		`- None => &self.junk[..]`
	`154`	`+ None => &self.junk[..self.length]`
`153`	`155`	`}`
`154`	`156`	`}`
`155`	`157`	`}`
`@@ -159,7 +161,7 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>> AsMut<[u8]>`
`159`	`161`	`fn as_mut(&mut self) -> &mut [u8] {`
`160`	`162`	`match self.buffer {`
`161`	`163`	`Some(ref mut buf) => buf.as_mut(),`
`162`		`- None => &mut self.junk[..]`
	`164`	`+ None => &mut self.junk[..self.length]`
`163`	`165`	`}`
`164`	`166`	`}`
`165`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,5 @@ pub trait Device {`
`51`	`51`	/// It is expected that a `transmit` implementation would gain ownership of a buffer with
`52`	`52`	`/// the requested length, provide it for emission, and schedule it to be read from`
`53`	`53`	`/// memory by the network device once it is dropped.`
`54`		`- fn transmit(&mut self, len: usize) -> Result<Self::TxBuffer, Error>;`
	`54`	`+ fn transmit(&mut self, length: usize) -> Result<Self::TxBuffer, Error>;`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,10 @@ impl Device for RawSocket {`
`43`	`43`	`Ok(buffer)`
`44`	`44`	`}`
`45`	`45`
`46`		`- fn transmit(&mut self, len: usize) -> Result<Self::TxBuffer, Error> {`
	`46`	`+ fn transmit(&mut self, length: usize) -> Result<Self::TxBuffer, Error> {`
`47`	`47`	`Ok(TxBuffer {`
`48`	`48`	`lower: self.lower.clone(),`
`49`		`- buffer: vec![0; len]`
	`49`	`+ buffer: vec![0; length]`
`50`	`50`	`})`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,10 @@ impl Device for TapInterface {`
`43`	`43`	`Ok(buffer)`
`44`	`44`	`}`
`45`	`45`
`46`		`- fn transmit(&mut self, len: usize) -> Result<Self::TxBuffer, Error> {`
	`46`	`+ fn transmit(&mut self, length: usize) -> Result<Self::TxBuffer, Error> {`
`47`	`47`	`Ok(TxBuffer {`
`48`	`48`	`lower: self.lower.clone(),`
`49`		`- buffer: vec![0; len]`
	`49`	`+ buffer: vec![0; length]`
`50`	`50`	`})`
`51`	`51`	`}`
`52`	`52`	`}`