From 949ae9ba1531be3629da0b5be47ff4dae763baa0 Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Fri, 16 Dec 2016 10:48:37 -0200 Subject: zebra: fix FIB route updates on *BSD On *BSD, we update a route in the FIB by removing the old one and then installing the new version. With that said, on kernel_route_rib() we need to provide a pointer to both the old version and the new version of the route. We were, however, passing a pointer to the new version to both the 'old' and 'new' parameters. This is not a problem on Linux, which uses NLM_F_REPLACE to update routes, but it breaks route updates on *BSD because the 'old' parameter points to a route that is not installed in the kernel. The kernel_route_rib() function then fails to uninstall the supposedly 'old' route and can fail to install the new version as well if the kernel doesn't support ECMP (e.g. FreeBSD with default configuration). Signed-off-by: Renato Westphal --- zebra/zebra_rib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'zebra/zebra_rib.c') diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index c573f6bd5c..a792bcc657 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -1212,7 +1212,7 @@ nexthop_active_update (struct route_node *rn, struct rib *rib, int set) * is only used for IPv4. */ int -rib_install_kernel (struct route_node *rn, struct rib *rib, int update) +rib_install_kernel (struct route_node *rn, struct rib *rib, struct rib *old) { int ret = 0; struct nexthop *nexthop, *tnexthop; @@ -1231,7 +1231,7 @@ rib_install_kernel (struct route_node *rn, struct rib *rib, int update) * the kernel. */ zfpm_trigger_update (rn, "installing in kernel"); - ret = kernel_route_rib (&rn->p, update ? rib : NULL, rib); + ret = kernel_route_rib (&rn->p, old, rib); /* If install succeeds, update FIB flag for nexthops. */ if (!ret) @@ -1388,7 +1388,7 @@ rib_process_add_fib(struct zebra_vrf *zvrf, struct route_node *rn, if (!RIB_SYSTEM_ROUTE (new)) { - if (rib_install_kernel (rn, new, 0)) + if (rib_install_kernel (rn, new, NULL)) { inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN); zlog_warn ("%u:%s/%d: Route install failed", @@ -1470,7 +1470,7 @@ rib_process_update_fib (struct zebra_vrf *zvrf, struct route_node *rn, /* Non-system route should be installed. */ if (!RIB_SYSTEM_ROUTE (new)) { - if (rib_install_kernel (rn, new, 1)) + if (rib_install_kernel (rn, new, old)) { installed = 0; inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN); @@ -1542,7 +1542,7 @@ rib_process_update_fib (struct zebra_vrf *zvrf, struct route_node *rn, break; } if (!in_fib) - rib_install_kernel (rn, new, 0); + rib_install_kernel (rn, new, NULL); } } @@ -2779,7 +2779,7 @@ rib_delete (afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, u_short instance, { /* This means someone else, other than Zebra, has deleted * a Zebra router from the kernel. We will add it back */ - rib_install_kernel(rn, fib, 0); + rib_install_kernel(rn, fib, NULL); } } else -- cgit v1.2.3 From e3edd1d1d4c118acdcd6424a43d57fd7d7584aa7 Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Fri, 16 Dec 2016 12:51:07 -0200 Subject: zebra: remove unused variable It looks like 'nexthop_fib_num' has been lingering around since 2003 without any use. Remove it. Signed-off-by: Renato Westphal --- zebra/rib.h | 1 - zebra/zebra_rib.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'zebra/zebra_rib.c') diff --git a/zebra/rib.h b/zebra/rib.h index a30c093fba..d80ea6cbd8 100644 --- a/zebra/rib.h +++ b/zebra/rib.h @@ -93,7 +93,6 @@ struct rib /* Nexthop information. */ u_char nexthop_num; u_char nexthop_active_num; - u_char nexthop_fib_num; }; /* meta-queue structure: diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index a792bcc657..e48da0479b 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -2459,11 +2459,10 @@ void _rib_dump (const char * func, ); zlog_debug ( - "%s: nexthop_num == %u, nexthop_active_num == %u, nexthop_fib_num == %u", + "%s: nexthop_num == %u, nexthop_active_num == %u", func, rib->nexthop_num, - rib->nexthop_active_num, - rib->nexthop_fib_num + rib->nexthop_active_num ); for (ALL_NEXTHOPS_RO(rib->nexthop, nexthop, tnexthop, recursing)) -- cgit v1.2.3