From: Renato Westphal Date: Tue, 6 Jun 2017 01:48:10 +0000 (-0300) Subject: zebra: add implicit-null labels to the rib X-Git-Tag: frr-4.0-dev~439^2~9 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2f9c59f031a76db29235cf17dc6b1e62c39370ac;p=matthieu%2Ffrr.git zebra: add implicit-null labels to the rib Implicit-null labels are never installed in the FIB but we need to keep track of them because of L2/L3 VPN nexthop resolution. Signed-off-by: Renato Westphal --- diff --git a/zebra/zserv.c b/zebra/zserv.c index aac3d23a9e..dae6785aee 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -1877,14 +1877,12 @@ static void zread_mpls_labels(int command, struct zserv *client, u_short length, if (command == ZEBRA_MPLS_LABELS_ADD) { mpls_lsp_install(zvrf, type, in_label, out_label, gtype, &gate, ifindex); - if (out_label != MPLS_IMP_NULL_LABEL) - mpls_ftn_update(1, zvrf, type, &prefix, gtype, &gate, - ifindex, distance, out_label); + mpls_ftn_update(1, zvrf, type, &prefix, gtype, &gate, ifindex, + distance, out_label); } else if (command == ZEBRA_MPLS_LABELS_DELETE) { mpls_lsp_uninstall(zvrf, type, in_label, gtype, &gate, ifindex); - if (out_label != MPLS_IMP_NULL_LABEL) - mpls_ftn_update(0, zvrf, type, &prefix, gtype, &gate, - ifindex, distance, out_label); + mpls_ftn_update(0, zvrf, type, &prefix, gtype, &gate, ifindex, + distance, out_label); } } /* Send response to a label manager connect request to client */