Add limited MRT support (#60)

* Add limited MRT support

* Bump minimal version in ci to 1.76

* Fix compiler warning about irrefutable pattern for Infallible Error case

* Bump inetnum to 1.1

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        rust: [1.71, stable, beta]
+        rust: [1.76, stable, beta]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v1

Cargo.toml

@@ -7,12 +7,12 @@ description = "A Library with Building Blocks for BGP Routing"
 documentation = "https://docs.rs/routecore/"
 repository = "https://github.com/NLnetLabs/routecore"
 edition = "2021"
-rust-version = "1.71"
+rust-version = "1.76"
 keywords = ["routing", "bgp"]
 license = "BSD-3-Clause"
 
 [dependencies]
-inetnum     = { version = "0.1.0", features = ["arbitrary", "serde"] }
+inetnum     = { version = "0.1.1", features = ["arbitrary", "serde"] }
 arbitrary   = { version = "1.3.1", optional = true, features = ["derive"] }
 bytes       = { version = "1.2", optional = true }
 chrono      = { version = "0.4.20", optional = true, default-features = false }
@@ -22,6 +22,7 @@ octseq      = { version = "0.4.0", optional = true, features = ["bytes"] }
 paste       = { version = "1" }
 serde       = { version = "1.0.165", optional = true, features = ["derive"] }
 tokio       = { version = ">=1.24.2", optional = true, features = ["io-util", "macros", "net", "sync", "rt-multi-thread", "time"] }
+rayon       = { version = "1.10", optional = true }
 
 [dev-dependencies]
 memmap2         = "0.9"
@@ -32,5 +33,6 @@ default = ["bgp"]
 bgp = ["bytes", "log", "octseq", "const-str"]
 bmp = ["bgp", "chrono"]
 fsm = ["tokio"]
+mrt = ["bgp", "fsm", "rayon", "serde"]
 bgpsec = []
 

src/bgp/message/update_builder.rs

@@ -137,15 +137,15 @@ where
     {
         // XXX there should be a HopPath::compose_len really, instead of
         // relying on .to_as_path() first.
-        if let Ok(wireformat) = aspath.to_as_path::<Vec<u8>>() {
-            if wireformat.compose_len() > u16::MAX.into() {
-                return Err(ComposeError::AttributeTooLarge(
-                     PathAttributeType::AsPath,
-                     wireformat.compose_len()
-                ));
-            }
-        } else {
-            return Err(ComposeError::InvalidAttribute)
+        let wireformat = octseq::builder::infallible(
+            aspath.to_as_path::<Vec<u8>>()
+        );
+
+        if wireformat.compose_len() > u16::MAX.into() {
+            return Err(ComposeError::AttributeTooLarge(
+                    PathAttributeType::AsPath,
+                    wireformat.compose_len()
+            ));
         }
 
         self.attributes.set(aspath);

src/bgp/nlri/common.rs

@@ -66,7 +66,7 @@ pub fn parse_prefix_for_len<R: Octets>(
     Ok(res)
 }
 
-pub(super) fn parse_v4_prefix<R: Octets>(parser: &mut Parser<'_, R>)
+pub(crate) fn parse_v4_prefix<R: Octets>(parser: &mut Parser<'_, R>)
     -> Result<Prefix, ParseError>
 {
     let prefix_bits = parser.parse_u8()?;
@@ -89,7 +89,7 @@ pub(super) fn parse_v4_prefix_for_len<R: Octets>(
     )
 }
 
-pub(super) fn parse_v6_prefix<R: Octets>(parser: &mut Parser<'_, R>)
+pub(crate) fn parse_v6_prefix<R: Octets>(parser: &mut Parser<'_, R>)
     -> Result<Prefix, ParseError>
 {
     let prefix_bits = parser.parse_u8()?;

src/lib.rs

@@ -7,6 +7,9 @@ pub mod bgpsec;
 #[cfg(feature = "bmp")]
 pub mod bmp;
 
+#[cfg(feature = "mrt")]
+pub mod mrt;
+
 pub mod flowspec;
 
 pub use octseq::Octets;