enable AfiSafiType optionally coming from a field on a NLRI struct

src/bgp/message/update.rs

@@ -25,7 +25,7 @@
 };
 
 use crate::bgp::nlri::afisafi::{
-    AfiSafiNlri, AfiSafiParse, NlriIter, NlriEnumIter, Nlri, NlriType
+    AfiSafi as Saif_al_Afi, AfiSafiNlri, AfiSafiParse, Nlri, NlriEnumIter, NlriIter, NlriType
 };
 
 use crate::util::parser::ParseError;
@@ -291,7 +291,7 @@
     where
         O: Octets,
         Octs: Octets<Range<'a> = O>,
-        ASP: AfiSafiNlri + AfiSafiParse<'a, O, Octs>
+        ASP: AfiSafiNlri + Saif_al_Afi + AfiSafiParse<'a, O, Octs>
     {
         if ASP::afi_safi() == AfiSafi::Ipv4Unicast && !self.withdrawals.is_empty() {
             return Ok(Some(NlriIter::<_, _, ASP>::new(
@@ -442,7 +442,7 @@
     where
         O: Octets,
         Octs: Octets<Range<'a> = O>,
-        ASP: AfiSafiNlri + AfiSafiParse<'a, O, Octs>
+        ASP: AfiSafiNlri + Saif_al_Afi + AfiSafiParse<'a, O, Octs>
     {
         // If the requested announcements are of type Ipv4Unicast, and the
         // conventional announcements range is non-zero, return that.
@@ -1553,7 +1553,7 @@
         Tag, Wellknown,
     };
 
     use crate::bgp::nlri::afisafi::{AfiSafiNlri, Nlri, Ipv4UnicastNlri, Ipv4MulticastNlri};
     use crate::bgp::types::{PathId, RouteDistinguisher};
     use crate::bgp::message::Message;
     use inetnum::addr::Prefix;

src/bgp/message/update_builder.rs

@@ -8,9 +8,10 @@
 use crate::bgp::aspath::HopPath;
 use crate::bgp::communities::StandardCommunity;
 use crate::bgp::message::{Header, MsgType, UpdateMessage, SessionConfig};
-use crate::bgp::nlri::afisafi::{AfiSafiNlri, AfiSafiParse, NlriCompose};
+use crate::bgp::nlri::afisafi::{AfiSafi, AfiSafiNlri, AfiSafiParse, NlriCompose};
 use crate::bgp::path_attributes::{Attribute, PaMap, PathAttributeType};
-use crate::bgp::types::{AfiSafi, NextHop};
+use crate::bgp::types::{AfiSafi as AfiSafiTrait, NextHop};
+use crate::bgp::nlri::afisafi::IsNlri;
 use crate::util::parser::ParseError;
 
 //------------ UpdateBuilder -------------------------------------------------
@@ -30,7 +31,7 @@
 
 impl<Target, A> UpdateBuilder<Target, A>
 where
-    A: AfiSafiNlri + NlriCompose,
+    A: AfiSafiNlri + AfiSafi + NlriCompose,
     Target: OctetsBuilder + octseq::Truncate,
 {
 
@@ -59,7 +60,7 @@
 
     pub fn from_workshop(
         ws: crate::bgp::workshop::route::RouteWorkshop<A>
-    ) -> UpdateBuilder<Vec<u8>, A> {
+    ) -> UpdateBuilder<Vec<u8>, A> where A: AfiSafi + IsNlri {
 
         let mut res = Self::from_attributes_builder(ws.attributes().clone());
         let nlri = ws.nlri();
@@ -270,7 +271,7 @@
 
 impl<Target, A> UpdateBuilder<Target, A>
 where
-    A: Clone + AfiSafiNlri + NlriCompose
+    A: Clone + AfiSafiNlri + AfiSafi + NlriCompose
 {
     pub fn into_message(self, session_config: &SessionConfig) ->
         Result<UpdateMessage<<Target as FreezeBuilder>::Octets>, ComposeError>
@@ -679,7 +680,7 @@
 
 impl<'a, Target, A> Iterator for PduIterator<'a, Target, A>
 where
-    A: AfiSafiNlri + NlriCompose,
+    A: AfiSafiNlri + AfiSafi + NlriCompose,
     Target: Clone + OctetsBuilder + FreezeBuilder + AsMut<[u8]> + octseq::Truncate,
     <Target as FreezeBuilder>::Octets: Octets
 {
@@ -722,13 +723,13 @@
 }
 */
 
-impl<A: AfiSafiNlri + NlriCompose> UpdateBuilder<Vec<u8>, A> {
+impl<A: AfiSafiNlri + AfiSafi + NlriCompose> UpdateBuilder<Vec<u8>, A> {
     pub fn new_vec() -> Self {
         UpdateBuilder::from_target(Vec::with_capacity(23)).unwrap()
     }
 }
 
-impl<A: AfiSafiNlri + NlriCompose> UpdateBuilder<BytesMut, A> {
+impl<A: AfiSafiNlri + AfiSafi + NlriCompose> UpdateBuilder<BytesMut, A> {
     pub fn new_bytes() -> Self {
         Self::from_target(BytesMut::new()).unwrap()
     }
@@ -764,7 +765,7 @@
         _session_config: &SessionConfig
     )
     where
-        A: AfiSafiNlri + NlriCompose + AfiSafiParse<'a, O, Octs, Output = A>,
+        A: AfiSafiNlri + AfiSafi + NlriCompose + AfiSafiParse<'a, O, Octs, Output = A>,
         Octs: Octets<Range<'a> = O>,
         O: Octets,
     {
@@ -776,7 +777,7 @@
     }
 }
 
-impl<A: AfiSafiNlri + NlriCompose> MpReachNlriBuilder<A> {
+impl<A: AfiSafiNlri + AfiSafi + NlriCompose> MpReachNlriBuilder<A> {
     pub fn new() -> Self {
         Self {
             announcements: Vec::new(),
@@ -810,7 +811,7 @@
     }
 
 
-    pub fn afi_safi(&self) -> AfiSafi {
+    pub fn afi_safi(&self) -> AfiSafiTrait {
         A::afi_safi()
     }
 
@@ -883,7 +884,7 @@
     }
 }
 
-impl<A: AfiSafiNlri + NlriCompose> Default for MpReachNlriBuilder<A> {
+impl<A: AfiSafiNlri + AfiSafi + NlriCompose> Default for MpReachNlriBuilder<A> {
     fn default() -> Self {
         Self::new()
     }
@@ -1130,7 +1131,7 @@
         _session_config: &SessionConfig
     )
     where
-        A: AfiSafiNlri + NlriCompose + AfiSafiParse<'a, O, Octs, Output = A>,
+        A: AfiSafiNlri + AfiSafi + NlriCompose + AfiSafiParse<'a, O, Octs, Output = A>,
         Octs: Octets<Range<'a> = O>,
         O: Octets,
     {
@@ -1142,7 +1143,7 @@
     }
 }
 
-impl<A: NlriCompose> MpUnreachNlriBuilder<A> {
+impl<A: NlriCompose + AfiSafi> MpUnreachNlriBuilder<A> {
     pub fn new() -> Self {
         Self {
             withdrawals: Vec::new(),
@@ -1335,7 +1336,7 @@
 
     //use std::collections::BTreeSet;
     use std::fs::File;
     use std::net::{Ipv4Addr, Ipv6Addr};
     use std::str::FromStr;
 
     use memmap2::Mmap;
@@ -1345,8 +1346,8 @@
     //use crate::bgp::path_attributes::AttributeHeader;
     use inetnum::addr::Prefix;
     use inetnum::asn::Asn;
     use crate::bgp::aspath::HopPath;
     use crate::bgp::communities::{StandardCommunity, Tag};
     use crate::bgp::nlri::afisafi::{
         Ipv4UnicastNlri,
         Ipv4MulticastNlri,

src/bgp/nlri/afisafi.rs

@@ -44,6 +44,10 @@
         fn nlri(&self) -> Self::Nlri {
             self.1.nlri()
         }
+
+        fn afi_safi_type(&self) -> AfiSafiType {
+            <[<$nlri Nlri>]$(<$gen>)? as AfiSafi>::afi_safi()
+        }
     }
 
     impl$(<$gen>)? AfiSafi for [<$nlri AddpathNlri>]$(<$gen>)? {
@@ -475,9 +479,10 @@
 }
 
 /// A type representing an NLRI for a certain AFI+SAFI.
-pub trait AfiSafiNlri: AfiSafi + IsNlri + Clone + Hash + Debug {
+pub trait AfiSafiNlri: Clone + Hash + Debug {
     type Nlri;
     fn nlri(&self) -> Self::Nlri;
+    fn afi_safi_type(&self) -> AfiSafiType;
 
     // TODO
     //fn nexthop_compatible(&self, nh: &super::nexthop::NextHop) -> bool;
@@ -490,7 +495,7 @@
     fn parse(parser: &mut Parser<'a, P>) -> Result<Self::Output, ParseError>;
 }
 
-pub trait NlriCompose: AfiSafiNlri {
+pub trait NlriCompose: AfiSafiNlri + AfiSafi + IsNlri {
     fn compose<Target: OctetsBuilder>(&self, target: &mut Target)
         -> Result<(), Target::AppendError>;
 
@@ -590,6 +595,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl FromStr for Ipv4UnicastNlri {
@@ -682,6 +690,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl FromStr for Ipv4MulticastNlri {
@@ -760,6 +771,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0.clone()
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv4MplsUnicastNlri<O>
@@ -815,6 +829,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0.clone()
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv4MplsVpnUnicastNlri<O>
@@ -870,6 +887,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0.clone()
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv4RouteTargetNlri<O>
@@ -922,6 +942,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0.clone()
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv4FlowSpecNlri<O>
@@ -1008,6 +1031,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 impl FromStr for Ipv6UnicastNlri {
     type Err = &'static str;
@@ -1086,6 +1112,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv6MulticastNlri
@@ -1125,6 +1154,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0.clone()
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv6MplsUnicastNlri<O>
@@ -1180,6 +1212,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0.clone()
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv6MplsVpnUnicastNlri<O>
@@ -1235,6 +1270,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0.clone()
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv6FlowSpecNlri<O>
@@ -1318,6 +1356,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl<'a, O, P> AfiSafiParse<'a, O, P> for L2VpnVplsNlri
@@ -1358,6 +1399,9 @@
     fn nlri(&self) -> Self::Nlri {
         self.0.clone()
     }
+    fn afi_safi_type(&self) -> AfiSafiType {
+        <Self as AfiSafi>::afi_safi()
+    }
 }
 
 impl<'a, O, P> AfiSafiParse<'a, O, P> for L2VpnEvpnNlri<O>
@@ -1584,8 +1628,8 @@
 mod tests {
 
     use super::*;
     use inetnum::addr::Prefix;
     use std::str::FromStr;
 
     #[test]
     fn test1() {

src/bgp/workshop/route.rs

@@ -126,9 +126,10 @@ impl<N: AfiSafiNlri + Clone + Debug + Hash> RouteWorkshop<N> {
     where
         for<'a> Vec<u8>: OctetsFrom<Octs::Range<'a>>,
     {
+        let afi_safi_type = nlri.afi_safi_type();
         let mut res = Self::new(nlri);
 
-        if N::afi_safi() == AfiSafiType::Ipv4Unicast &&
+        if afi_safi_type == AfiSafiType::Ipv4Unicast &&
             pdu.has_conventional_nlri()
         {
             if let Ok(Some(nh)) = pdu.conventional_next_hop() {