Implement (Partial)Ord for all NLRI types and enum Nlri, derive Copy …

…where possible

src/bgp/nlri/common.rs

@@ -11,7 +11,7 @@ use std::fmt;
 /// Path Identifier for BGP Multiple Paths (RFC7911).
 ///
 /// Used in all AddpathNlri variants.
-#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq)]
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct PathId(pub u32);
 

src/bgp/nlri/evpn.rs

@@ -1,3 +1,4 @@
+use std::cmp;
 use std::fmt;
 
 use octseq::{Octets, OctetsBuilder, Parser};
@@ -79,6 +80,25 @@ where Octs: AsRef<[u8]>,
     }
 }
 
+
+impl<Octs> PartialOrd for EvpnNlri<Octs>
+where Octs: AsRef<[u8]>,
+{
+    fn partial_cmp(&self, other: &EvpnNlri<Octs>) -> Option<cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl<Octs: AsRef<[u8]>> Eq for EvpnNlri<Octs> { }
+
+impl<Octs: AsRef<[u8]>> Ord for EvpnNlri<Octs> {
+    fn cmp(&self, other: &Self) -> cmp::Ordering {
+        self.route_type.cmp(&other.route_type)
+            .then(self.raw.as_ref().cmp(other.raw.as_ref()))
+    }
+}
+
+
 impl<T> fmt::Display for EvpnNlri<T> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "EVPN-{}", self.route_type)

src/bgp/nlri/flowspec.rs

@@ -1,4 +1,4 @@
-use std::fmt;
+use std::{cmp, fmt};
 
 use log::debug;
 use octseq::{Octets, OctetsBuilder, Parser};
@@ -98,6 +98,8 @@ impl<Octs: AsRef<[u8]>> FlowSpecNlri<Octs> {
     }
 }
 
+impl<Octs: AsRef<[u8]>> Eq for FlowSpecNlri<Octs> { }
+
 impl<Octs, Other> PartialEq<FlowSpecNlri<Other>> for FlowSpecNlri<Octs>
 where Octs: AsRef<[u8]>,
       Other: AsRef<[u8]>
@@ -109,6 +111,20 @@ where Octs: AsRef<[u8]>,
 }
 
 
+impl<Octs> PartialOrd for FlowSpecNlri<Octs>
+where Octs: AsRef<[u8]>,
+{
+    fn partial_cmp(&self, other: &FlowSpecNlri<Octs>) -> Option<cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl<Octs: AsRef<[u8]>> Ord for FlowSpecNlri<Octs> {
+    fn cmp(&self, other: &Self) -> cmp::Ordering {
+        self.raw.as_ref().cmp(other.raw.as_ref())
+    }
+}
+
 impl<T> fmt::Display for FlowSpecNlri<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "FLOWSPEC-NLRI")

src/bgp/nlri/mpls.rs

@@ -1,4 +1,6 @@
 use inetnum::addr::Prefix;
+use octseq::OctetsFrom;
+use std::cmp;
 use std::fmt;
 
 use octseq::{Octets, OctetsBuilder, Parser};
@@ -76,6 +78,8 @@ impl<Octs: AsRef<[u8]>> MplsNlri<Octs> {
     }
 }
 
+impl<Octs: AsRef<[u8]>> Eq for MplsNlri<Octs> { }
+
 impl<Octs, Other> PartialEq<MplsNlri<Other>> for MplsNlri<Octs>
 where Octs: AsRef<[u8]>,
       Other: AsRef<[u8]>
@@ -85,6 +89,20 @@ where Octs: AsRef<[u8]>,
     }
 }
 
+impl<Octs> PartialOrd for MplsNlri<Octs>
+where Octs: AsRef<[u8]>,
+{
+    fn partial_cmp(&self, other: &MplsNlri<Octs>) -> Option<cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl<Octs: AsRef<[u8]>> Ord for MplsNlri<Octs> {
+    fn cmp(&self, other: &Self) -> cmp::Ordering {
+        self.prefix.cmp(&other.prefix).then(self.labels.as_ref().cmp(other.labels.as_ref()))
+    }
+}
+
 
 impl<T> fmt::Display for MplsNlri<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -93,6 +111,21 @@ impl<T> fmt::Display for MplsNlri<T> {
     }
 }
 
+impl<Octs, SrcOcts: Octets> OctetsFrom<MplsNlri<SrcOcts>> for MplsNlri<Octs>
+    where Octs: OctetsFrom<SrcOcts>,
+{
+    type Error = Octs::Error;
+
+    fn try_octets_from(
+        source: MplsNlri<SrcOcts>
+    ) -> Result<Self, Self::Error> {
+        Ok(MplsNlri {
+            prefix: source.prefix,
+            labels: Labels::try_octets_from(source.labels)?
+        })
+    }
+}
+
 //------------ Labels --------------------------------------------------------
 
 /// MPLS labels, part of [`MplsNlri`] and [`MplsVpnNlri`].
@@ -191,3 +224,17 @@ impl<Octs: AsRef<[u8]>> AsRef<[u8]> for Labels<Octs> {
     }
 }
 
+impl<Octs, SrcOcts: Octets> OctetsFrom<Labels<SrcOcts>> for Labels<Octs>
+    where Octs: OctetsFrom<SrcOcts>,
+{
+    type Error = Octs::Error;
+
+    fn try_octets_from(
+        source: Labels<SrcOcts>
+    ) -> Result<Self, Self::Error> {
+        Ok(Labels {
+            octets: Octs::try_octets_from(source.octets)?
+        })
+    }
+}
+

src/bgp/nlri/mpls_vpn.rs

@@ -1,4 +1,5 @@
 use inetnum::addr::Prefix;
+use std::cmp;
 use std::fmt;
 
 #[cfg(feature = "serde")]
@@ -88,6 +89,8 @@ impl<Octs: AsRef<[u8]>> MplsVpnNlri<Octs> {
     }
 }
 
+impl<Octs: AsRef<[u8]>> Eq for MplsVpnNlri<Octs> { }
+
 impl<Octs, Other> PartialEq<MplsVpnNlri<Other>> for MplsVpnNlri<Octs>
 where Octs: AsRef<[u8]>,
       Other: AsRef<[u8]>
@@ -99,6 +102,22 @@ where Octs: AsRef<[u8]>,
     }
 }
 
+impl<Octs> PartialOrd for MplsVpnNlri<Octs>
+where Octs: AsRef<[u8]>,
+{
+    fn partial_cmp(&self, other: &MplsVpnNlri<Octs>) -> Option<cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl<Octs: AsRef<[u8]>> Ord for MplsVpnNlri<Octs> {
+    fn cmp(&self, other: &Self) -> cmp::Ordering {
+        self.prefix.cmp(&other.prefix)
+            .then(self.labels.as_ref().cmp(other.labels.as_ref()))
+            .then(self.rd.cmp(&other.rd))
+    }
+}
+
 impl<T> fmt::Display for MplsVpnNlri<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "MPLS-VPN:{}", self.prefix())

src/bgp/nlri/routetarget.rs

@@ -1,4 +1,4 @@
-use std::fmt;
+use std::{cmp, fmt};
 
 use octseq::{Octets, OctetsBuilder, Parser};
 use crate::util::parser::ParseError;
@@ -42,6 +42,7 @@ impl<Octs: AsRef<[u8]>> RouteTargetNlri<Octs> {
     }
 }
 
+impl<Octs: AsRef<[u8]>> Eq for RouteTargetNlri<Octs> { }
 
 impl<Octs, Other> PartialEq<RouteTargetNlri<Other>> for RouteTargetNlri<Octs>
 where Octs: AsRef<[u8]>,
@@ -52,8 +53,23 @@ where Octs: AsRef<[u8]>,
     }
 }
 
+impl<Octs> PartialOrd for RouteTargetNlri<Octs>
+where Octs: AsRef<[u8]>,
+{
+    fn partial_cmp(&self, other: &RouteTargetNlri<Octs>) -> Option<cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl<Octs: AsRef<[u8]>> Ord for RouteTargetNlri<Octs> {
+    fn cmp(&self, other: &Self) -> cmp::Ordering {
+        self.raw.as_ref().cmp(other.raw.as_ref())
+    }
+}
+
 impl<T> fmt::Display for RouteTargetNlri<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "ROUTE-TARGET-NLRI")
     }
 }
+

src/bgp/nlri/vpls.rs

@@ -6,7 +6,7 @@ use crate::util::parser::ParseError;
 use super::mpls_vpn::RouteDistinguisher;
 
 /// VPLS Information as defined in RFC4761.
-#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq)]
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Ord, PartialOrd)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct VplsNlri {
     rd: RouteDistinguisher,
@@ -63,9 +63,6 @@ impl VplsNlri {
     }
 }
 
-
-
-
 impl fmt::Display for VplsNlri {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "VPLS-{}", self.rd)