From e132dea0643499187cc51a332fd6616ee6df387c Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Thu, 8 Aug 2019 13:56:39 -0300 Subject: zebra: identify MPLS FTNs by route type and instance Use the route type and instance instead of the route distance to identify MPLS FTNs. This is a more robust approach since the routing daemons can modify the distance of their announced routes via configuration, which can cause inconsistencies. Signed-off-by: Renato Westphal --- zebra/zapi_msg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'zebra/zapi_msg.c') diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index 6915d84c0d..15ff4a8b97 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -1788,14 +1788,14 @@ static void zread_mpls_labels(ZAPI_HANDLER_ARGS) mpls_lsp_install(zvrf, zl.type, zl.local_label, zl.remote_label, gtype, &zl.nexthop, zl.ifindex); mpls_ftn_update(1, zvrf, zl.type, &zl.prefix, gtype, - &zl.nexthop, zl.ifindex, zl.distance, - zl.remote_label); + &zl.nexthop, zl.ifindex, zl.route_type, + zl.route_instance, zl.remote_label); } else if (hdr->command == ZEBRA_MPLS_LABELS_DELETE) { mpls_lsp_uninstall(zvrf, zl.type, zl.local_label, gtype, &zl.nexthop, zl.ifindex); mpls_ftn_update(0, zvrf, zl.type, &zl.prefix, gtype, - &zl.nexthop, zl.ifindex, zl.distance, - zl.remote_label); + &zl.nexthop, zl.ifindex, zl.route_type, + zl.route_instance, zl.remote_label); } } -- cgit v1.2.3