bgpd: fix several issues in sourcing AIGP attribute

Fix several issues in sourcing AIGP attribute:

1) AIGP should not be set as default for a redistributed route or a
   static network. It should be set by config instead.

2) AIGP sourced by "set aigp-metric igp-metric" in a route-map does
   not set the correct value for a redistributed route.

3) When redistribute a connected route like loopback, the AGIP (with
   value 0) is sourced by "set aigp-metric igp-metric", but the
   attribute is not propagated as the attribute flag is not set.

Signed-off-by: Enke Chen <enchen@paloaltonetworks.com>
(cherry picked from commit f65356d8bb9a43b1725fafdbd30aba0de9d214fa)

diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h
index 7e735f0f0c658f3d4b6d2b62f1fee1d06bd9dd7f..2271a67c5f9913be1053614e8fde351a6cd8fc8c 100644 (file)
--- a/bgpd/bgp_attr.h
+++ b/bgpd/bgp_attr.h
@@ -596,9 +596,7 @@ static inline uint64_t bgp_attr_get_aigp_metric(const struct attr *attr)
 static inline void bgp_attr_set_aigp_metric(struct attr *attr, uint64_t aigp)
 {
        attr->aigp_metric = aigp;
-
-       if (aigp)
-               SET_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_AIGP));
+       SET_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_AIGP));
 }
 
 static inline uint64_t bgp_aigp_metric_total(struct bgp_path_info *bpi)

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index c7580ae0a7125352a9e906437d571183db05da28..404d7b153ca10a359dfcc3fdc3b5b92286671b8c 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -6394,9 +6394,6 @@ void bgp_static_update(struct bgp *bgp, const struct prefix *p,
        if (afi == AFI_IP)
                attr.mp_nexthop_len = BGP_ATTR_NHLEN_IPV4;
 
-       if (bgp_static->igpmetric)
-               bgp_attr_set_aigp_metric(&attr, bgp_static->igpmetric);
-
        if (bgp_static->atomic)
                attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_ATOMIC_AGGREGATE);
 
@@ -8661,9 +8658,6 @@ void bgp_redistribute_add(struct bgp *bgp, struct prefix *p,
        attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_MULTI_EXIT_DISC);
        attr.tag = tag;
 
-       if (metric)
-               bgp_attr_set_aigp_metric(&attr, metric);
-
        afi = family2afi(p->family);
 
        red = bgp_redist_lookup(bgp, afi, type, instance);
@@ -8673,10 +8667,8 @@ void bgp_redistribute_add(struct bgp *bgp, struct prefix *p,
                /* Copy attribute for modification. */
                attr_new = attr;
 
-               if (red->redist_metric_flag) {
+               if (red->redist_metric_flag)
                        attr_new.med = red->redist_metric;
-                       bgp_attr_set_aigp_metric(&attr_new, red->redist_metric);
-               }
 
                /* Apply route-map. */
                if (red->rmap.name) {

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index bd5f93b0ab76bb460f6121780cf2f73e0ed9aaa8..dd7e7b90a4bebcee13a71035b0d1c6f081e34e91 100644 (file)
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -3439,19 +3439,15 @@ route_set_aigp_metric(void *rule, const struct prefix *pfx, void *object)
 {
        const char *aigp_metric = rule;
        struct bgp_path_info *path = object;
-       uint32_t aigp = 0;
+       uint32_t aigp;
 
-       if (strmatch(aigp_metric, "igp-metric")) {
-               if (!path->nexthop)
-                       return RMAP_NOMATCH;
-
-               bgp_attr_set_aigp_metric(path->attr, path->nexthop->metric);
-       } else {
+       /* Note: the metric is stored as MED for a locally redistributed. */
+       if (strmatch(aigp_metric, "igp-metric"))
+               aigp = path->nexthop ? path->nexthop->metric : path->attr->med;
+       else
                aigp = atoi(aigp_metric);
-               bgp_attr_set_aigp_metric(path->attr, aigp);
-       }
 
-       path->attr->flag |= ATTR_FLAG_BIT(BGP_ATTR_AIGP);
+       bgp_attr_set_aigp_metric(path->attr, aigp);
 
        return RMAP_OKAY;
 }