proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-14 13:22:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #518 from dwalton76/zebra-mpls-lsp-uninstall

Browse Source 
zebra: zebra_mpls_lsp_uninstall was not being called
This commit is contained in:
Renato Westphal 2017-05-12 12:51:06 -03:00 committed by GitHub
commit 51cd5cc35e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zebra/zebra_rib.c
View File

@ -1382,6 +1382,11 @@ rib_process_update_fib (struct zebra_vrf *zvrf, struct route_node *rn,
zlog_debug ("%u:%s: Updating route rn %p, rib %p (type %d)", zlog_debug ("%u:%s: Updating route rn %p, rib %p (type %d)",
zvrf_id (zvrf), buf, rn, new, new->type); zvrf_id (zvrf), buf, rn, new, new->type);
} }
/* If labeled-unicast route, uninstall transit LSP. */
if (zebra_rib_labeled_unicast (old))
zebra_mpls_lsp_uninstall (zvrf, rn, old);
/* Non-system route should be installed. */ /* Non-system route should be installed. */
if (!RIB_SYSTEM_ROUTE (new)) if (!RIB_SYSTEM_ROUTE (new))
{ {
@ -1403,10 +1408,6 @@ rib_process_update_fib (struct zebra_vrf *zvrf, struct route_node *rn,
{ {
if (RIB_SYSTEM_ROUTE(new)) if (RIB_SYSTEM_ROUTE(new))
{ {
/* If labeled-unicast route, uninstall transit LSP. */
if (zebra_rib_labeled_unicast (old))
zebra_mpls_lsp_uninstall (zvrf, rn, old);
if (!RIB_SYSTEM_ROUTE (old)) if (!RIB_SYSTEM_ROUTE (old))
rib_uninstall_kernel (rn, old); rib_uninstall_kernel (rn, old);
} }