proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: For rnh handling use actual resolved nexthop

Browse Source 
For nexthop handling use the actual resolved nexthop.
Nexthops are stored as a `special` list:

Suppose we have 3 way ecmp A, B, C:
nhop A  -> resolves to nhop D
  |
nhop B
  |
nhop C -> resolves to nhop E

A and C are typically NEXTHOP_TYPE_IPV4( or 6 ) if they recursively resolve
We do not necessarily store the ifindex that this resolves to.

Current nexthop code only loops over A,B and C and uses those for
the zebra_rnh.c handling.  So interested parties might receive non-fully
resolved nexthops( and they assume they are! ).

Let's convert the looping to go over all nexthops and only deal with
the resolved ones, so we will look at and use D,B and E.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-12-12 08:02:08 -05:00
parent 27dcf6d901
commit 72366a6e97
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zebra/zebra_rnh.c
View File

@ -528,8 +528,7 @@ static void zebra_rnh_process_pbr_tables(int family,
*/ */
static bool rnh_nexthop_valid(const struct nexthop *nh) static bool rnh_nexthop_valid(const struct nexthop *nh)
{ {
return ((CHECK_FLAG(nh->flags, NEXTHOP_FLAG_FIB) return (CHECK_FLAG(nh->flags, NEXTHOP_FLAG_FIB)
|| CHECK_FLAG(nh->flags, NEXTHOP_FLAG_RECURSIVE))
&& CHECK_FLAG(nh->flags, NEXTHOP_FLAG_ACTIVE)); && CHECK_FLAG(nh->flags, NEXTHOP_FLAG_ACTIVE));
} }
@ -581,8 +580,7 @@ zebra_rnh_resolve_nexthop_entry(struct zebra_vrf *zvrf, int family,
/* Just being SELECTED isn't quite enough - must /* Just being SELECTED isn't quite enough - must
* have an installed nexthop to be useful. * have an installed nexthop to be useful.
*/ */
for (nexthop = re->ng.nexthop; nexthop; for (ALL_NEXTHOPS(re->ng, nexthop)) {
nexthop = nexthop->next) {
if (rnh_nexthop_valid(nexthop)) if (rnh_nexthop_valid(nexthop))
break; break;
} }
@ -915,7 +913,7 @@ static int send_client(struct rnh *rnh, struct zserv *client, rnh_type_t type,
num = 0; num = 0;
nump = stream_get_endp(s); nump = stream_get_endp(s);
stream_putc(s, 0); stream_putc(s, 0);
for (nh = re->ng.nexthop; nh; nh = nh->next) for (ALL_NEXTHOPS(re->ng, nh))
if (rnh_nexthop_valid(nh)) { if (rnh_nexthop_valid(nh)) {
stream_putl(s, nh->vrf_id); stream_putl(s, nh->vrf_id);
stream_putc(s, nh->type); stream_putc(s, nh->type);