proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-05 01:03:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Use the re->metric instead of 0 for zebra_rmap_obj

Browse Source 
The zebra_rmap_obj was storing the re->metric and allowing
matches against it, but in most cases it was just using 0.
Use the Route entries metric instead.  This should fix
some bugs where a match metric never worked.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-08-11 11:17:29 -04:00
parent b7542d5af8
commit 17bcaad841
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra/zebra_routemap.c
View File

@ -34,7 +34,6 @@ char *zebra_import_table_routemap[AFI_MAX][ZEBRA_KERNEL_TABLE_MAX];
struct zebra_rmap_obj {
struct nexthop *nexthop;
struct route_entry *re;
int metric;
route_tag_t tag;
};
@ -1770,7 +1769,6 @@ route_map_result_t zebra_route_map_check(afi_t family, struct route_entry *re,
rm_obj.nexthop = nexthop;
rm_obj.re = re;
rm_obj.metric = 0;
rm_obj.tag = tag;
if (re->type >= 0 && re->type < ZEBRA_ROUTE_MAX) {
@ -1821,7 +1819,6 @@ route_map_result_t zebra_import_table_route_map_check(
rm_obj.nexthop = nexthop;
rm_obj.re = re;
rm_obj.metric = 0;
rm_obj.tag = tag;
if (re->type >= 0 && re->type < ZEBRA_ROUTE_MAX)
@ -1845,7 +1842,6 @@ route_map_result_t zebra_nht_route_map_check(afi_t afi, int client_proto,
rm_obj.nexthop = nexthop;
rm_obj.re = re;
rm_obj.metric = re->metric;
rm_obj.tag = re->tag;
if (client_proto >= 0 && client_proto < ZEBRA_ROUTE_MAX)