Skip to content

Commit

Permalink
Merge pull request FRRouting#13894 from donaldsharp/route_map_applied…
Browse files Browse the repository at this point in the history
…_wrong

lib: Add two places we were not counting route-map applied
  • Loading branch information
ton31337 authored Jul 4, 2023
2 parents 18dd365 + bdcea06 commit 786bc97
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions lib/routemap.c
Original file line number Diff line number Diff line change
Expand Up @@ -2554,6 +2554,9 @@ route_map_result_t route_map_apply_ext(struct route_map *map,
struct prefix conv;

if (recursion > RMAP_RECURSION_LIMIT) {
if (map)
map->applied++;

flog_warn(
EC_LIB_RMAP_RECURSION_LIMIT,
"route-map recursion limit (%d) reached, discarding route",
Expand All @@ -2563,6 +2566,8 @@ route_map_result_t route_map_apply_ext(struct route_map *map,
}

if (map == NULL || map->head == NULL) {
if (map)
map->applied++;
ret = RMAP_DENYMATCH;
goto route_map_apply_end;
}
Expand Down

0 comments on commit 786bc97

Please sign in to comment.