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.

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 4651b76a2f84bfb319aab98d23b7c9fb6485103c..f8146bdf7e0e3cdac158535f2e0d1a9fa76977b5 100644 (file)
--- 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 38441208713c625d73c73941041dd90eae66f898..b7f60504f10aec41beaa66c01be583396138175d 100644 (file)
--- 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;
   }
 }