fix: check that message sizes of ports match

Fixes #4
DLR-FT · Apr 8, 2024 · 1e8b725 · 1e8b725
1 parent 9b2a7e9
commit 1e8b725
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 8 deletions.
diff --git a/a653rs-router/src/network.rs b/a653rs-router/src/network.rs
@@ -158,6 +158,10 @@ impl<H: PlatformNetworkInterface> RouterInput for NetworkInterface<H> {
             PortError::Receive
         })
     }
+
+    fn mtu(&self) -> PayloadSize {
+        self.mtu
+    }
 }
 
 impl<H: PlatformNetworkInterface> RouterOutput for NetworkInterface<H> {
@@ -169,6 +173,10 @@ impl<H: PlatformNetworkInterface> RouterOutput for NetworkInterface<H> {
                 PortError::Send
             })
     }
+
+    fn mtu(&self) -> PayloadSize {
+        self.mtu
+    }
 }
 
 /// Inteface error type.

diff --git a/a653rs-router/src/ports.rs b/a653rs-router/src/ports.rs
@@ -3,6 +3,7 @@ use core::{fmt::Display, marker::PhantomData, str::FromStr, time::Duration};
 
 use crate::{
     config::{QueuingInCfg, QueuingOutCfg, SamplingInCfg, SamplingOutCfg},
+    network::PayloadSize,
     prelude::*,
     router::{RouterInput, RouterOutput},
 };
@@ -62,6 +63,10 @@ impl<H: ApexSamplingPortP4> RouterInput for SamplingIn<H> {
         }?;
         Ok((*vl, &buf[..(len as usize)]))
     }
+
+    fn mtu(&self) -> PayloadSize {
+        self.inner.msg_size as PayloadSize
+    }
 }
 
 impl<H: ApexQueuingPortP4> RouterInput for QueuingIn<H> {
@@ -78,6 +83,10 @@ impl<H: ApexQueuingPortP4> RouterInput for QueuingIn<H> {
         }?;
         Ok((*vl, &buf[..val as usize]))
     }
+
+    fn mtu(&self) -> PayloadSize {
+        self.inner.msg_size as PayloadSize
+    }
 }
 
 impl<H: ApexQueuingPortP4> RouterOutput for QueuingOut<H> {
@@ -87,6 +96,10 @@ impl<H: ApexQueuingPortP4> RouterOutput for QueuingOut<H> {
         <H as ApexQueuingPortP4>::send_queuing_message(self.inner.id, buf, timeout)
             .map_err(|_e| PortError::Send)
     }
+
+    fn mtu(&self) -> PayloadSize {
+        self.inner.msg_size as PayloadSize
+    }
 }
 
 impl<H: ApexSamplingPortP4> RouterOutput for SamplingOut<H> {
@@ -95,6 +108,10 @@ impl<H: ApexSamplingPortP4> RouterOutput for SamplingOut<H> {
         <H as ApexSamplingPortP4>::write_sampling_message(self.inner.id, buf)
             .map_err(|_e| PortError::Send)
     }
+
+    fn mtu(&self) -> PayloadSize {
+        self.inner.msg_size as PayloadSize
+    }
 }
 
 impl<H: ApexSamplingPortP4> SamplingIn<H> {
@@ -198,6 +215,10 @@ impl<const M: MessageSize, S: ApexSamplingPortP4> RouterInput for SamplingPortDe
         let (_val, data) = res.map_err(|_e| PortError::Receive)?;
         Ok((*vl, data))
     }
+
+    fn mtu(&self) -> PayloadSize {
+        M as PayloadSize
+    }
 }
 
 impl<const M: MessageSize, S: ApexSamplingPortP4> RouterOutput for SamplingPortSource<M, S> {
@@ -208,6 +229,10 @@ impl<const M: MessageSize, S: ApexSamplingPortP4> RouterOutput for SamplingPortS
         res.map_err(|_e| PortError::Send)?;
         Ok(())
     }
+
+    fn mtu(&self) -> PayloadSize {
+        M as PayloadSize
+    }
 }
 
 impl<const M: MessageSize, const R: MessageRange, Q: ApexQueuingPortP4> RouterInput
@@ -225,6 +250,10 @@ impl<const M: MessageSize, const R: MessageRange, Q: ApexQueuingPortP4> RouterIn
         let (buf, _overflow) = res.map_err(|_e| PortError::Receive)?;
         Ok((*vl, buf))
     }
+
+    fn mtu(&self) -> PayloadSize {
+        M as PayloadSize
+    }
 }
 
 impl<const M: MessageSize, const R: MessageRange, Q: ApexQueuingPortP4> RouterOutput
@@ -238,6 +267,10 @@ impl<const M: MessageSize, const R: MessageRange, Q: ApexQueuingPortP4> RouterOu
         res.map_err(|_e| PortError::Send)?;
         Ok(())
     }
+
+    fn mtu(&self) -> PayloadSize {
+        M as PayloadSize
+    }
 }
 
 trait BufferExt {

diff --git a/a653rs-router/src/router.rs b/a653rs-router/src/router.rs
@@ -5,7 +5,7 @@ use crate::{
         InterfacesConfig, PortConfig, PortName, PortsConfig, RouterConfigError, VirtualLinksConfig,
     },
     error::Error,
-    network::{CreateNetworkInterface, NetworkInterface, PlatformNetworkInterface},
+    network::{CreateNetworkInterface, NetworkInterface, PayloadSize, PlatformNetworkInterface},
     ports::{Port, PortError, QueuingIn, QueuingOut, SamplingIn, SamplingOut},
     prelude::InterfaceName,
     scheduler::{DeadlineRrScheduler, ScheduleError, Scheduler, TimeSource},
@@ -165,6 +165,9 @@ pub trait RouterInput {
         vl: &VirtualLinkId,
         buf: &'a mut [u8],
     ) -> Result<(VirtualLinkId, &'a [u8]), PortError>;
+
+    /// Maximum transfer unit
+    fn mtu(&self) -> PayloadSize;
 }
 
 /// An output from a virtual link.
@@ -173,6 +176,9 @@ pub trait RouterOutput {
     ///
     /// Returns a slice to the portion of `buf` that has *not* been transmitted.
     fn send(&self, vl: &VirtualLinkId, buf: &[u8]) -> Result<(), PortError>;
+
+    /// Maximum transfer unit
+    fn mtu(&self) -> PayloadSize;
 }
 
 type FwdTable<'a, const I: usize, const O: usize> =
@@ -259,14 +265,24 @@ impl<'a, const I: usize, const O: usize> RouteTable<'a, I, O> {
                 router_debug!("Unknown input: {}", cfg.src.deref());
                 RouterConfigError::Destination
             })?;
+            let input_msg_size = inp.mtu();
             let outs: Result<Vec<_, O>, RouterConfigError> = cfg
                 .dsts
                 .iter()
                 .map(|d| {
-                    outputs.get(d).ok_or_else(|| {
-                        router_debug!("Unknown output {}", d.deref());
-                        RouterConfigError::Source
-                    })
+                    outputs
+                        .get(d)
+                        .ok_or_else(|| {
+                            router_debug!("Unknown output {}", d.deref());
+                            RouterConfigError::Source
+                        })
+                        .and_then(|outp| {
+                            if outp.mtu() == input_msg_size {
+                                Ok(outp)
+                            } else {
+                                Err(RouterConfigError::Destination)
+                            }
+                        })
                 })
                 .map(|d| d.copied())
                 .collect();

diff --git a/examples/config/echo-remote/client-alt/router.yml b/examples/config/echo-remote/client-alt/router.yml
@@ -36,6 +36,6 @@ ports:
 interfaces:
   NodeB:
     destination: "192.168.1.2:8082"
-    mtu: 1500
+    mtu: 1000
     rate: 10000000
     source: "0.0.0.0:8081"
diff --git a/examples/config/echo-remote/client/router.yml b/examples/config/echo-remote/client/router.yml
@@ -26,6 +26,6 @@ ports:
 interfaces:
   NodeB:
     destination: "192.168.1.2:8082"
-    mtu: 1500
+    mtu: 1000
     rate: 10000000
     source: "0.0.0.0:8081"
diff --git a/examples/config/echo-remote/server/router.yml b/examples/config/echo-remote/server/router.yml
@@ -26,6 +26,6 @@ ports:
 interfaces:
   NodeA:
     destination: "192.168.1.1:8081"
-    mtu: 1500
+    mtu: 1000
     rate: 10000000
     source: "0.0.0.0:8082"