Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: smoltcp-rs/smoltcp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a8d19a1da465
Choose a base ref
...
head repository: smoltcp-rs/smoltcp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2b824d6a9582
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 26, 2016

  1. Copy the full SHA
    0f9f897 View commit details
  2. Copy the full SHA
    2b824d6 View commit details
Showing with 43 additions and 11 deletions.
  1. +22 −6 examples/smoltcpserver.rs
  2. +0 −2 src/phy/mod.rs
  3. +21 −3 src/phy/tracer.rs
28 changes: 22 additions & 6 deletions examples/smoltcpserver.rs
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ use env_logger::{LogBuilder};
use smoltcp::Error;
use smoltcp::phy::{Tracer, TapInterface};
use smoltcp::wire::{EthernetFrame, EthernetAddress, IpAddress, IpEndpoint};
use smoltcp::wire::PrettyPrinter;
use smoltcp::iface::{SliceArpCache, EthernetInterface};
use smoltcp::socket::AsSocket;
use smoltcp::socket::{UdpSocket, UdpSocketBuffer, UdpPacketBuffer};
@@ -22,18 +23,28 @@ fn main() {
LogBuilder::new()
.format(move |record: &LogRecord| {
let elapsed = Instant::now().duration_since(startup_time);
format!("[{:6}.{:03}ms] ({}): {}",
elapsed.as_secs(), elapsed.subsec_nanos() / 1000000,
record.target().replace("smoltcp::", ""), record.args())
if record.target().starts_with("smoltcp::") {
format!("\x1b[0m[{:6}.{:03}ms] ({}): {}\x1b[0m",
elapsed.as_secs(), elapsed.subsec_nanos() / 1000000,
record.target().replace("smoltcp::", ""), record.args())
} else {
format!("\x1b[32m[{:6}.{:03}ms] ({}): {}\x1b[0m",
elapsed.as_secs(), elapsed.subsec_nanos() / 1000000,
record.target(), record.args())
}
})
.filter(None, LogLevelFilter::Trace)
.init()
.unwrap();

fn trace_writer(printer: PrettyPrinter<EthernetFrame<&[u8]>>) {
print!("\x1b[37m{}\x1b[0m", printer)
}

let ifname = env::args().nth(1).unwrap();

let device = TapInterface::new(ifname.as_ref()).unwrap();
let device = Tracer::<_, EthernetFrame<&[u8]>>::new(device);
let device = Tracer::<_, EthernetFrame<&[u8]>>::new(device, trace_writer);
let arp_cache = SliceArpCache::new(vec![Default::default(); 8]);

let endpoint = IpEndpoint::new(IpAddress::default(), 6969);
@@ -75,7 +86,9 @@ fn main() {
}
};
if let Some(endpoint) = client {
socket.send_slice(endpoint, b"yo dawg").unwrap()
let data = b"yo dawg";
debug!("udp send data: {:?}", data);
socket.send_slice(endpoint, data).unwrap()
}
}

@@ -91,7 +104,10 @@ fn main() {
}
data
};
socket.send_slice(data.as_ref());
if data.len() > 0 {
debug!("tcp send data: {:?}", &data[..]);
socket.send_slice(&data[..]);
}
}
}
}
2 changes: 0 additions & 2 deletions src/phy/mod.rs
Original file line number Diff line number Diff line change
@@ -10,14 +10,12 @@ use Error;
#[cfg(feature = "std")]
mod sys;

#[cfg(feature = "std")]
mod tracer;
#[cfg(feature = "std")]
mod raw_socket;
#[cfg(all(feature = "std", target_os = "linux"))]
mod tap_interface;

#[cfg(feature = "std")]
pub use self::tracer::Tracer;
#[cfg(feature = "std")]
pub use self::raw_socket::RawSocket;
24 changes: 21 additions & 3 deletions src/phy/tracer.rs
Original file line number Diff line number Diff line change
@@ -10,14 +10,30 @@ use super::Device;
/// to the standard output, and delegates to another device otherwise.
pub struct Tracer<T: Device, U: PrettyPrint> {
lower: T,
writer: fn(PrettyPrinter<U>),
phantom: PhantomData<U>
}

impl<T: Device, U: PrettyPrint> Tracer<T, U> {
/// Create a tracer device.
pub fn new(lower: T) -> Tracer<T, U> {
pub fn new(lower: T, writer: fn(PrettyPrinter<U>)) -> Tracer<T, U> {
Tracer {
lower: lower,
writer: writer,
phantom: PhantomData
}
}

/// Create a tracer device, printing to standard output.
#[cfg(feature = "std")]
pub fn new_stdout(lower: T) -> Tracer<T, U> {
fn writer<U: PrettyPrint>(printer: PrettyPrinter<U>) {
print!("{}", printer)
}

Tracer {
lower: lower,
writer: writer,
phantom: PhantomData
}
}
@@ -36,14 +52,15 @@ impl<T: Device, U: PrettyPrint> Device for Tracer<T, U> {

fn receive(&mut self) -> Result<Self::RxBuffer, Error> {
let buffer = try!(self.lower.receive());
print!("{}", PrettyPrinter::<U>::new("<- ", &buffer));
(self.writer)(PrettyPrinter::<U>::new("<- ", &buffer));
Ok(buffer)
}

fn transmit(&mut self, len: usize) -> Result<Self::TxBuffer, Error> {
let buffer = try!(self.lower.transmit(len));
Ok(TxBuffer {
buffer: buffer,
writer: self.writer,
phantom: PhantomData
})
}
@@ -52,6 +69,7 @@ impl<T: Device, U: PrettyPrint> Device for Tracer<T, U> {
#[doc(hidden)]
pub struct TxBuffer<T: AsRef<[u8]>, U: PrettyPrint> {
buffer: T,
writer: fn(PrettyPrinter<U>),
phantom: PhantomData<U>
}

@@ -67,6 +85,6 @@ impl<T: AsRef<[u8]> + AsMut<[u8]>, U: PrettyPrint> AsMut<[u8]>

impl<T: AsRef<[u8]>, U: PrettyPrint> Drop for TxBuffer<T, U> {
fn drop(&mut self) {
print!("{}", PrettyPrinter::<U>::new("-> ", &self.buffer));
(self.writer)(PrettyPrinter::<U>::new("-> ", &self.buffer));
}
}