]> git.puffer.fish Git - matthieu/frr.git/commitdiff
zebra: add implicit-null labels to the rib
authorRenato Westphal <renato@opensourcerouting.org>
Tue, 6 Jun 2017 01:48:10 +0000 (22:48 -0300)
committerRenato Westphal <renato@opensourcerouting.org>
Tue, 25 Jul 2017 03:53:23 +0000 (00:53 -0300)
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>
zebra/zserv.c

index 9beae9232ed573039345e149379c90c3bf2d3d38..f2d32d77982608b8aeea9828d03956593befdbcb 100644 (file)
@@ -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 */