Blame SOURCES/0005-inactive-paths.patch
|
 |
f1b9df |
diff --git a/lib/routemap.c b/lib/routemap.c
|
|
|
f1b9df |
index 7f733c811..9afe18d10 100644
|
|
|
f1b9df |
--- a/lib/routemap.c
|
|
|
f1b9df |
+++ b/lib/routemap.c
|
|
|
f1b9df |
@@ -1799,12 +1799,11 @@ static struct list *route_map_get_index_list(struct route_node **rn,
|
|
|
f1b9df |
/*
|
|
|
f1b9df |
* This function returns the route-map index that best matches the prefix.
|
|
|
f1b9df |
*/
|
|
|
f1b9df |
-static struct route_map_index *route_map_get_index(struct route_map *map,
|
|
|
f1b9df |
- const struct prefix *prefix,
|
|
|
f1b9df |
- void *object,
|
|
|
f1b9df |
- uint8_t *match_ret)
|
|
|
f1b9df |
+static struct route_map_index *
|
|
|
f1b9df |
+route_map_get_index(struct route_map *map, const struct prefix *prefix,
|
|
|
f1b9df |
+ void *object, enum route_map_cmd_result_t *match_ret)
|
|
|
f1b9df |
{
|
|
|
f1b9df |
- int ret = 0;
|
|
|
f1b9df |
+ enum route_map_cmd_result_t ret = RMAP_NOMATCH;
|
|
|
f1b9df |
struct list *candidate_rmap_list = NULL;
|
|
|
f1b9df |
struct route_node *rn = NULL;
|
|
|
f1b9df |
struct listnode *ln = NULL, *nn = NULL;
|
|
|
f1b9df |
@@ -2559,7 +2558,7 @@ route_map_result_t route_map_apply_ext(struct route_map *map,
|
|
|
f1b9df |
if ((!map->optimization_disabled)
|
|
|
f1b9df |
&& (map->ipv4_prefix_table || map->ipv6_prefix_table)) {
|
|
|
f1b9df |
index = route_map_get_index(map, prefix, match_object,
|
|
|
f1b9df |
- (uint8_t *)&match_ret);
|
|
|
f1b9df |
+ &match_ret);
|
|
|
f1b9df |
if (index) {
|
|
|
f1b9df |
index->applied++;
|
|
|
f1b9df |
if (rmap_debug)
|