From d8130da86bda6244e1f5c06eb9b9033625b781e6 Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sat, 30 Sep 2023 23:18:04 +0200
Subject: [PATCH] BGP, L3VPN: Fix MPLS channel reload

When a MPLS channel is reloaded, it should reload all regular MPLS-aware
channels. This causes re-evaluation of routes in FEC map and possibly
reannouncement of MPLS routes.
---
 proto/bgp/bgp.c     | 10 ++++++++++
 proto/l3vpn/l3vpn.c |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 4651b76a..f8146bdf 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1414,6 +1414,16 @@ bgp_reload_routes(struct channel *C)
   struct bgp_proto *p = (void *) C->proto;
   struct bgp_channel *c = (void *) C;
 
+  /* For MPLS channel, reload all MPLS-aware channels */
+  if (C == p->p.mpls_channel)
+  {
+    BGP_WALK_CHANNELS(p, c)
+      if ((c->desc->mpls) && (p->route_refresh || c->c.in_table))
+	bgp_reload_routes(&c->c);
+
+    return;
+  }
+
   /* Ignore non-BGP channels */
   if (C->channel != &channel_bgp)
     return;
diff --git a/proto/l3vpn/l3vpn.c b/proto/l3vpn/l3vpn.c
index 38441208..b7f60504 100644
--- a/proto/l3vpn/l3vpn.c
+++ b/proto/l3vpn/l3vpn.c
@@ -296,7 +296,8 @@ l3vpn_reload_routes(struct channel *C)
     break;
 
   case NET_MPLS:
-    /* FIXME */
+    channel_request_feeding(p->ip4_channel);
+    channel_request_feeding(p->ip6_channel);
     break;
   }
 }