From 04e94d3929829c79e097f9b0d435da02cc6322f1 Mon Sep 17 00:00:00 2001 From: rgirada Date: Sun, 17 May 2020 22:02:34 -0700 Subject: [PATCH] ospfd: Restoring the original tag in external lsas Description: When a routemap applied to set a tag, all the permitted routes are refreshed with new tag, but when a different route map applied with a different action still the same tag persits in the external route. The actual tag received from zebra is expected to be set back to the routes here. Corrected this behaviour by restoring a original tag received from zebra. Signed-off-by: Rajesh Girada --- ospfd/ospf_asbr.c | 1 + ospfd/ospf_asbr.h | 3 +++ ospfd/ospf_zebra.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c index 6d00935347..3682b4cdd3 100644 --- a/ospfd/ospf_asbr.c +++ b/ospfd/ospf_asbr.c @@ -149,6 +149,7 @@ ospf_external_info_add(struct ospf *ospf, uint8_t type, unsigned short instance, new->ifindex = ifindex; new->nexthop = nexthop; new->tag = tag; + new->orig_tag = tag; /* we don't unlock rn from the get() because we're attaching the info */ if (rn) diff --git a/ospfd/ospf_asbr.h b/ospfd/ospf_asbr.h index ac7bd68b5f..1bcc32e3d8 100644 --- a/ospfd/ospf_asbr.h +++ b/ospfd/ospf_asbr.h @@ -46,6 +46,9 @@ struct external_info { /* Additional Route tag. */ route_tag_t tag; + /* Actual tag received from zebra*/ + route_tag_t orig_tag; + struct route_map_set_values route_map_set; #define ROUTEMAP_METRIC(E) (E)->route_map_set.metric #define ROUTEMAP_METRIC_TYPE(E) (E)->route_map_set.metric_type diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index f3f54f7b51..e8e2fbeaa6 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -726,7 +726,10 @@ int ospf_redistribute_check(struct ospf *ospf, struct external_info *ei, save_values = ei->route_map_set; ospf_reset_route_map_set_values(&ei->route_map_set); + saved_tag = ei->tag; + /* Resetting with original route tag */ + ei->tag = ei->orig_tag; /* apply route-map if needed */ red = ospf_redist_lookup(ospf, type, instance); -- 2.39.5