Merge pull request #4887 from vishaldhingra/lcomm_json

[mirror_frr.git] / bgpd / bgp_routemap.c

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index a69cf26b8b701b706e5e00a66cfa07964a1292d5..e7521c62ff7153e9c7f004963a3a0482c294d328 100644 (file)
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -2873,12 +2873,15 @@ route_set_ipv6_nexthop_peer(void *rule, const struct prefix *pfx,
                        /* Set next hop value and length in attribute. */
                        if (IN6_IS_ADDR_LINKLOCAL(&peer_address)) {
                                path->attr->mp_nexthop_local = peer_address;
-                               if (path->attr->mp_nexthop_len != 32)
-                                       path->attr->mp_nexthop_len = 32;
+                               if (path->attr->mp_nexthop_len
+                                   != BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL)
+                                       path->attr->mp_nexthop_len =
+                                               BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL;
                        } else {
                                path->attr->mp_nexthop_global = peer_address;
                                if (path->attr->mp_nexthop_len == 0)
-                                       path->attr->mp_nexthop_len = 16;
+                                       path->attr->mp_nexthop_len =
+                                               BGP_ATTR_NHLEN_IPV6_GLOBAL;
                        }
 
                } else if (CHECK_FLAG(peer->rmap_type, PEER_RMAP_TYPE_OUT)) {
@@ -2943,7 +2946,7 @@ route_set_vpnv4_nexthop(void *rule, const struct prefix *prefix,
 
                /* Set next hop value. */
                path->attr->mp_nexthop_global_in = *address;
-               path->attr->mp_nexthop_len = 4;
+               path->attr->mp_nexthop_len = BGP_ATTR_NHLEN_IPV4;
        }
 
        return RMAP_OKAY;