From b4e45f67057be22133b6bec88cdf285d5c8214db Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Mon, 5 Dec 2011 16:35:14 +0400 Subject: fix zebra protocol after MP-BGP changes The previous commits modified both zebra and bgpd for additional SAFI field, but not any other routing daemon, which led to zebra daemon crashing with failed assertion. --- ripd/rip_zebra.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ripd/rip_zebra.c') diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c index c476d8f4..1d10b103 100644 --- a/ripd/rip_zebra.c +++ b/ripd/rip_zebra.c @@ -46,6 +46,7 @@ rip_zebra_ipv4_add (struct prefix_ipv4 *p, struct in_addr *nexthop, api.type = ZEBRA_ROUTE_RIP; api.flags = 0; api.message = 0; + api.safi = SAFI_UNICAST; SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP); api.nexthop_num = 1; api.nexthop = &nexthop; @@ -76,6 +77,7 @@ rip_zebra_ipv4_delete (struct prefix_ipv4 *p, struct in_addr *nexthop, api.type = ZEBRA_ROUTE_RIP; api.flags = 0; api.message = 0; + api.safi = SAFI_UNICAST; SET_FLAG (api.message, ZAPI_MESSAGE_NEXTHOP); api.nexthop_num = 1; api.nexthop = &nexthop; -- cgit v1.2.3 From 9c58fbd7d7658055c2b3074489c6d338448d88e9 Mon Sep 17 00:00:00 2001 From: Matthieu Boutier Date: Thu, 9 Feb 2012 21:51:17 +0100 Subject: ripd: add babel for redistribution. --- ripd/rip_zebra.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ripd/rip_zebra.c') diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c index 1d10b103..199e85e8 100644 --- a/ripd/rip_zebra.c +++ b/ripd/rip_zebra.c @@ -207,7 +207,8 @@ static struct { {ZEBRA_ROUTE_CONNECT, 1, "connected"}, {ZEBRA_ROUTE_STATIC, 1, "static"}, {ZEBRA_ROUTE_OSPF, 1, "ospf"}, - {ZEBRA_ROUTE_BGP, 1, "bgp"}, + {ZEBRA_ROUTE_BGP, 2, "bgp"}, + {ZEBRA_ROUTE_BABEL, 2, "babel"}, {0, 0, NULL} }; -- cgit v1.2.3