]> git.proxmox.com Git - mirror_frr.git/commitdiff
bgpd: fill the pmsi_tnl_type into the type-3 PMSI attr
authorAnuradha Karuppiah <anuradhak@cumulusnetworks.com>
Tue, 12 Feb 2019 20:51:49 +0000 (12:51 -0800)
committerAnuradha Karuppiah <anuradhak@cumulusnetworks.com>
Tue, 12 Feb 2019 21:06:48 +0000 (13:06 -0800)
Currently we are hardcoding it at the time of attr building to
ingress-replication. This is just a code clean-up and has no
functional impact.

Ticket: CM-23790

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
bgpd/bgp_attr.c
bgpd/bgp_evpn.c

index 03f31eddfc1582d469686572d8a2b1585d88e532..3b5261fdf944622c00d121136158a6be65000e8d 100644 (file)
@@ -3445,7 +3445,7 @@ bgp_size_t bgp_packet_attribute(struct bgp *bgp, struct peer *peer,
                stream_putc(s, BGP_ATTR_PMSI_TUNNEL);
                stream_putc(s, 9); // Length
                stream_putc(s, 0); // Flags
-               stream_putc(s, PMSI_TNLTYPE_INGR_REPL); // IR (6)
+               stream_putc(s, attr->pmsi_tnl_type);
                stream_put(s, &(attr->label),
                           BGP_LABEL_BYTES); // MPLS Label / VXLAN VNI
                stream_put_ipv4(s, attr->nexthop.s_addr);
index 5a67cc4209a3d029a5dfbe6e59a6e1d3cc508a3f..bf162b201a334869795e9c9920a4002d0185799d 100644 (file)
@@ -1769,8 +1769,10 @@ static int update_evpn_route(struct bgp *bgp, struct bgpevpn *vpn,
                                      ZEBRA_MACIP_TYPE_ROUTER_FLAG) ? 1 : 0;
 
        /* PMSI is only needed for type-3 routes */
-       if (p->prefix.route_type == BGP_EVPN_IMET_ROUTE)
+       if (p->prefix.route_type == BGP_EVPN_IMET_ROUTE) {
                attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_PMSI_TUNNEL);
+               attr.pmsi_tnl_type = PMSI_TNLTYPE_INGR_REPL;
+       }
 
        /* router mac is only needed for type-2 routes here. */
        if (p->prefix.route_type == BGP_EVPN_MAC_IP_ROUTE)