RFC4684 (MPLS with other AFI as nexthop) got lost

NLnetLabs · Dec 20, 2023 · 4397eed · 4397eed
1 parent 16ce7da
commit 4397eed
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/bgp/message/nlri.rs b/src/bgp/message/nlri.rs
@@ -670,7 +670,6 @@ impl NextHop {
 
             Ipv4Unicast |
                 Ipv4Multicast |
-                Ipv4MplsUnicast |
                 Ipv4RouteTarget |
                 L2VpnVpls |
                 L2VpnEvpn
@@ -690,14 +689,21 @@ impl NextHop {
                     _ => error!()
                 }
             }
-            Ipv6Multicast |
-                Ipv6MplsUnicast
-            => {
+            Ipv6Multicast => {
                 match len {
                     16 => NextHop::Unicast(parse_ipv6addr(parser)?.into()),
                     _ => error!()
                 }
             }
+            // RFC4684: the nexthop for MPLS can be of the other AFI than the
+            // NLRI themselves are.
+            Ipv4MplsUnicast | Ipv6MplsUnicast => {
+                match len {
+                    4 => NextHop::Unicast(parse_ipv4addr(parser)?.into()),
+                    16 => NextHop::Unicast(parse_ipv6addr(parser)?.into()),
+                    _ => error!()
+                }
+            }
             Ipv4MplsVpnUnicast => {
                 match len {
                     12 => NextHop::MplsVpnUnicast(