From 90a570ed27d874067d9b1e259a290966c7c8ef4e Mon Sep 17 00:00:00 2001 From: Emanuele Di Pascale Date: Wed, 18 Sep 2019 16:01:36 +0200 Subject: [PATCH] zebra: fix mpls ftn uninstall when a client disconnects, we iterate over the routing table to remove any label that originated from that client. However we were erroneously passing the route type to the function, while it was expecting the lsp type. As a result, for example, killing ldpd would not remove the ldp labels from the routes. Kudos to @rwestphal for pointing me to the source of the issue. Signed-off-by: Emanuele Di Pascale --- zebra/zebra_mpls.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index 3c4497ebd2..8088ec1bfe 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -2326,8 +2326,10 @@ static int zebra_mpls_cleanup_zclient_labels(struct zserv *client) &args); /* Cleanup FTNs. */ - mpls_ftn_uninstall_all(zvrf, AFI_IP, client->proto); - mpls_ftn_uninstall_all(zvrf, AFI_IP6, client->proto); + mpls_ftn_uninstall_all(zvrf, AFI_IP, + lsp_type_from_re_type(client->proto)); + mpls_ftn_uninstall_all(zvrf, AFI_IP6, + lsp_type_from_re_type(client->proto)); } return 0; -- 2.39.5