add filter for packet counting, release 0.9.1

Cargo.toml

@@ -3,8 +3,8 @@ members = ["cli", "core", "machine", "macros", "nat", "router", "."]
 
 [package]
 name = "netsim-embed"
-version = "0.9.0"
-authors = ["David Craven <[email protected]>"]
+version = "0.9.1"
+authors = ["David Craven <[email protected]>", "Roland Kuhn <[email protected]>"]
 edition = "2018"
 description = "Network simulator."
 license = "MIT"
@@ -32,7 +32,7 @@ netsim-embed-core = { version = "0.4.3", path = "core" }
 netsim-embed-machine = { version = "0.6.4", path = "machine" }
 netsim-embed-macros = { version = "0.2.0", path = "macros", optional = true }
 netsim-embed-nat = { version = "0.4.2", path = "nat" }
-netsim-embed-router = { version = "0.4.6", path = "router" }
+netsim-embed-router = { version = "0.4.7", path = "router" }
 serde = { version = "1.0.158", optional = true }
 
 [dev-dependencies]

router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "netsim-embed-router"
-version = "0.4.6"
+version = "0.4.7"
 authors = ["David Craven <[email protected]>"]
 edition = "2018"
 description = "Implementation of a router for netsim embed."

router/src/lib.rs

@@ -9,7 +9,7 @@ use std::{
     net::Ipv4Addr,
     sync::{
         atomic::{AtomicUsize, Ordering},
-        Arc,
+        Arc, Mutex,
     },
     task::Poll,
 };
@@ -31,14 +31,28 @@ pub struct Ipv4Router {
     counters: Arc<Counters>,
 }
 
-#[derive(Debug, Default)]
+pub type Filter = Box<dyn Fn(&[u8]) -> bool + Send + Sync + 'static>;
+
+#[derive(Default)]
 struct Counters {
+    filter: Mutex<Option<Filter>>,
     forwarded: AtomicUsize,
     invalid: AtomicUsize,
     disabled: AtomicUsize,
     unroutable: AtomicUsize,
 }
 
+impl std::fmt::Debug for Counters {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Counters")
+            .field("forwarded", &self.forwarded)
+            .field("invalid", &self.invalid)
+            .field("disabled", &self.disabled)
+            .field("unroutable", &self.unroutable)
+            .finish()
+    }
+}
+
 impl Ipv4Router {
     pub fn new(addr: Ipv4Addr) -> Self {
         let (tx, rx) = mpsc::unbounded();
@@ -67,6 +81,10 @@ impl Ipv4Router {
         self.counters.unroutable.load(Ordering::Relaxed)
     }
 
+    pub fn set_filter(&self, filter: Option<Filter>) {
+        *self.counters.filter.lock().unwrap() = filter;
+    }
+
     pub fn add_connection(&self, id: usize, plug: Plug, routes: Vec<Ipv4Route>) {
         self.ctrl
             .unbounded_send(RouterCtrl::AddRoute(id, plug, routes))
@@ -153,10 +171,13 @@ fn forward_packet(
     conns: &mut [(usize, Plug, Vec<Ipv4Route>, bool)],
     bytes: Vec<u8>,
 ) {
+    let count = counters.filter.lock().unwrap().iter().all(|f| f(&bytes));
     let packet = if let Some(packet) = Ipv4Packet::new(&bytes) {
         packet
     } else {
-        counters.invalid.fetch_add(1, Ordering::Relaxed);
+        if count {
+            counters.invalid.fetch_add(1, Ordering::Relaxed);
+        }
         log::info!("router {}: dropping invalid ipv4 packet", addr);
         return;
     };
@@ -170,11 +191,15 @@ fn forward_packet(
         for route in routes {
             if route.dest().contains(dest) || dest.is_broadcast() || dest.is_multicast() {
                 if !*en {
-                    counters.disabled.fetch_add(1, Ordering::Relaxed);
+                    if count {
+                        counters.disabled.fetch_add(1, Ordering::Relaxed);
+                    }
                     log::trace!("router {}: route {:?} disabled", addr, route);
                 } else {
-                    counters.forwarded.fetch_add(1, Ordering::Relaxed);
-                    log::trace!("router {}: routing packet on route {:?}", addr, route);
+                    if count {
+                        counters.forwarded.fetch_add(1, Ordering::Relaxed);
+                    }
+                    log::trace!("router {}: routing packet on route {:?}", addr, route,);
                     tx.unbounded_send(bytes.clone());
                     forwarded = true;
                 }
@@ -183,7 +208,9 @@ fn forward_packet(
     }
     if !forwarded {
         let src = packet.get_source();
-        counters.unroutable.fetch_add(1, Ordering::Relaxed);
+        if count {
+            counters.unroutable.fetch_add(1, Ordering::Relaxed);
+        }
         log::debug!(
             "router {}: dropping unroutable packet from {} to {}",
             addr,

src/lib.rs

@@ -4,6 +4,7 @@ use netsim_embed_core::*;
 pub use netsim_embed_core::{DelayBuffer, Ipv4Range, Protocol};
 pub use netsim_embed_machine::{unshare_user, Machine, MachineId, Namespace};
 use netsim_embed_nat::*;
+pub use netsim_embed_router::Filter;
 use netsim_embed_router::*;
 use std::fmt::Display;
 use std::net::{Ipv4Addr, SocketAddrV4};
@@ -239,6 +240,10 @@ impl Network {
         self.range
     }
 
+    pub fn set_count_filter(&self, filter: Option<Filter>) {
+        self.router.set_filter(filter);
+    }
+
     pub fn num_forwarded(&self) -> usize {
         self.router.forwarded()
     }