From: Renato Westphal <renato@opensourcerouting.org>
Date: Tue, 6 Jun 2017 01:48:10 +0000 (-0300)
Subject: zebra: add implicit-null labels to the rib
X-Git-Tag: reindent-3.0-before~1^2~8
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b557e0b6df1d076b51de7d357746388a5c969803;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 <renato@opensourcerouting.org>
---

diff --git a/zebra/zserv.c b/zebra/zserv.c
index 9beae9232e..f2d32d7798 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -1762,16 +1762,14 @@ zread_mpls_labels (int command, struct zserv *client, u_short length,
     {
       mpls_lsp_install (zvrf, type, in_label, out_label, gtype, &gate,
 			NULL, 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, NULL, 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 */