bgpd: IPv6 MP-BGP Routes addition and deletion

This patch contains the following:
1. Addition of IPv6 SAFI_MULTICAST BGP routes into the BGP Multicast RIB.
2. Deletion of IPv6 SAFI_MULTICAST BGP routes from the BGP Multicast RIB.

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index baf76fb052d84050d4faf53f0687ab0d3ae88fa1..20feba0f49830119b671a4183eac8f7308864328 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -753,6 +753,7 @@ bgp_zebra_announce (struct prefix *p, struct bgp_info *info, struct bgp *bgp, sa
       api.flags = flags;
       api.type = ZEBRA_ROUTE_BGP;
       api.message = 0;
+      api.safi = safi;
       SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP);
       api.nexthop_num = 1;
       api.nexthop = &nexthop;
@@ -869,6 +870,7 @@ bgp_zebra_withdraw (struct prefix *p, struct bgp_info *info, safi_t safi)
       api.flags = flags;
       api.type = ZEBRA_ROUTE_BGP;
       api.message = 0;
+      api.safi = safi;
       SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP);
       api.nexthop_num = 1;
       api.nexthop = &nexthop;

diff --git a/lib/zclient.c b/lib/zclient.c
index 0c3461e71b9f20948cd68fabcf7e2162c967e4be..3521d99eee55693990bd922623f6a60fb0a654f2 100644 (file)
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -538,6 +538,7 @@ zapi_ipv6_route (u_char cmd, struct zclient *zclient, struct prefix_ipv6 *p,
   stream_putc (s, api->type);
   stream_putc (s, api->flags);
   stream_putc (s, api->message);
+  stream_putw (s, api->safi);
   
   /* Put prefix information. */
   psize = PSIZE (p->prefixlen);

diff --git a/lib/zclient.h b/lib/zclient.h
index 8b3e71af89c87607bb9e3c4d2d52f772573269b6..73389ecd803f7a47361e8a38849f2709cced5fe5 100644 (file)
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -167,6 +167,8 @@ struct zapi_ipv6
 
   u_char message;
 
+  safi_t safi;
+
   u_char nexthop_num;
   struct in6_addr **nexthop;