diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-05-10 15:42:00 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-10 16:06:47 +0200 |
| commit | 4caac24b23148a1ed37dd389b13e4475dc40bb64 (patch) | |
| tree | 1ebda6b30cb49a5c6c8c4124b9e06ec78b7e06fc /zebra/zebra_mpls_null.c | |
| parent | zebra: ZEBRA_MIN_FEC_LENGTH should be 5 (diff) | |
| download | frr-4caac24b23148a1ed37dd389b13e4475dc40bb64.tar.xz frr-4caac24b23148a1ed37dd389b13e4475dc40bb64.zip | |
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>
Diffstat (limited to 'zebra/zebra_mpls_null.c')
| -rw-r--r-- | zebra/zebra_mpls_null.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zebra/zebra_mpls_null.c b/zebra/zebra_mpls_null.c index 168c8d003..0333b6e6b 100644 --- a/zebra/zebra_mpls_null.c +++ b/zebra/zebra_mpls_null.c @@ -32,7 +32,7 @@ int mpls_enabled; char * mpls_label2str (u_int8_t num_labels, mpls_label_t *labels, - char *buf, int len) + char *buf, int len, int pretty) { return NULL; } |