]> git.proxmox.com Git - mirror_frr.git/commit - zebra/zebra_mpls.c
zebra: lsp_install() failed due to ZEBRA_FLAG_SELECTED check
authorDaniel Walton <dwalton@cumulusnetworks.com>
Wed, 10 May 2017 13:42:00 +0000 (09:42 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 10 May 2017 14:06:47 +0000 (10:06 -0400)
commit4caac24b23148a1ed37dd389b13e4475dc40bb64
tree1ebda6b30cb49a5c6c8c4124b9e06ec78b7e06fc
parentb5ab78e69144efb4dbd9429451e8391b013b434d
zebra: lsp_install() failed due to ZEBRA_FLAG_SELECTED check

ZEBRA_FLAG_SELECTED hasn't been set yet by the time lsp_install is
called.  The call path is:
rib_process -> rib_process_add_fib -> zebra_mpls_lsp_install -> lsp_install

but ZEBRA_FLAG_SELECTED is set in rib_process after it calls
rib_process_add_fib.  I can't think of anything that it would hurt to
install the LSP regardless of whether ZEBRA_FLAG_SELECTED is set later.

I also cleaned up some UI (json and display the pretty label names
instead of their numeric values).

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
zebra/zebra_mpls.c
zebra/zebra_mpls.h
zebra/zebra_mpls_null.c
zebra/zebra_vty.c