Merge pull request #10730 from mobash-rasool/fixes

lib: Route-map failed for OSPF routes even for matching prefixes
This commit is contained in:
Donald Sharp 2022-03-04 08:27:11 -05:00 committed by GitHub
commit 808fc9db0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1799,12 +1799,11 @@ static struct list *route_map_get_index_list(struct route_node **rn,
/*
* This function returns the route-map index that best matches the prefix.
*/
static struct route_map_index *route_map_get_index(struct route_map *map,
const struct prefix *prefix,
void *object,
uint8_t *match_ret)
static struct route_map_index *
route_map_get_index(struct route_map *map, const struct prefix *prefix,
void *object, enum route_map_cmd_result_t *match_ret)
{
int ret = 0;
enum route_map_cmd_result_t ret = RMAP_NOMATCH;
struct list *candidate_rmap_list = NULL;
struct route_node *rn = NULL;
struct listnode *ln = NULL, *nn = NULL;
@ -2559,7 +2558,7 @@ route_map_result_t route_map_apply_ext(struct route_map *map,
if ((!map->optimization_disabled)
&& (map->ipv4_prefix_table || map->ipv6_prefix_table)) {
index = route_map_get_index(map, prefix, match_object,
(uint8_t *)&match_ret);
&match_ret);
if (index) {
index->applied++;
if (rmap_debug)