Merge remote-tracking branch 'refs/remotes/origin/path-attributes-bui…

…lder' into path-attributes-builder
NLnetLabs · Feb 29, 2024 · 580ef94 · 580ef94
2 parents 08b459f + 8617b49
commit 580ef94
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/bgp/path_attributes.rs b/src/bgp/path_attributes.rs
@@ -1655,7 +1655,7 @@ pub struct ExtendedCommunitiesList {
 }
 
 impl ExtendedCommunitiesList {
-    fn new(communities: Vec<ExtendedCommunity>)
+    pub fn new(communities: Vec<ExtendedCommunity>)
         -> ExtendedCommunitiesList
     {
         ExtendedCommunitiesList {communities }
@@ -1876,7 +1876,7 @@ pub struct Ipv6ExtendedCommunitiesList {
 }
 
 impl Ipv6ExtendedCommunitiesList {
-    fn new(communities: Vec<Ipv6ExtendedCommunity>)
+    pub fn new(communities: Vec<Ipv6ExtendedCommunity>)
         -> Ipv6ExtendedCommunitiesList
     {
         Ipv6ExtendedCommunitiesList {communities }

diff --git a/src/bgp/workshop/route.rs b/src/bgp/workshop/route.rs
@@ -113,7 +113,7 @@ impl<Octs: Octets, N: Clone + Debug + Hash> RouteWorkshop<Octs, N> {
     pub fn get_attr<A: FromAttribute + WorkshopAttribute<N>>(
         &self,
     ) -> Option<A> {
-        self.1.get::<A>()
+        self.1.get::<A>().or_else(|| A::retrieve(&self.1))
     }
 
     pub fn clone_into_route(&self) -> Route<N> {
@@ -162,6 +162,7 @@ impl_workshop!(
     crate::bgp::path_attributes::ClusterIds
     crate::bgp::message::update_builder::StandardCommunitiesList
     crate::bgp::types::Otc
+    crate::bgp::message::update_builder::MpReachNlriBuilder
 );
 
 //------------ WorkshopAttribute ---------------------------------------------
@@ -182,25 +183,25 @@ impl<N: Clone + Hash + Debug> WorkshopAttribute<N> for Vec<Community> {
     fn retrieve(attrs: &PaMap) -> Option<Self> {
         let mut c = attrs
             .get::<StandardCommunitiesList>()
-            .unwrap()
-            .fmap(|c| Community::Standard(*c));
+            .map(|c| c.fmap(|c| Community::Standard(*c)))
+            .unwrap_or_default();
         c.append(
             &mut attrs
                 .get::<ExtendedCommunitiesList>()
-                .unwrap()
-                .fmap(Community::Extended),
+                .map(|c| c.fmap(Community::Extended))
+                .unwrap_or_default()
         );
         c.append(
             &mut attrs
                 .get::<Ipv6ExtendedCommunitiesList>()
-                .unwrap()
-                .fmap(Community::Ipv6Extended),
+                .map(|c| c.fmap(Community::Ipv6Extended))
+                .unwrap_or_default()
         );
         c.append(
             &mut attrs
                 .get::<LargeCommunitiesList>()
-                .unwrap()
-                .fmap(Community::Large),
+                .map(|c| c.fmap(Community::Large))
+                .unwrap_or_default()
         );
 
         Some(c)
@@ -288,7 +289,9 @@ impl<N: Clone + Hash> WorkshopAttribute<N> for crate::bgp::types::NextHop {
         attrs: &mut PaMap,
     ) -> Result<(), ComposeError> {
         if let Some(mut nlri) = attrs.get::<MpReachNlriBuilder>() {
-            nlri.set_nexthop(local_attr)
+            nlri.set_nexthop(local_attr)?;
+            attrs.set(nlri).ok_or(ComposeError::InvalidAttribute)?;
+            Ok(())
         } else {
             Err(ComposeError::InvalidAttribute)
         }