]> git.proxmox.com Git - mirror_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)
committerDavid Lamparter <equinox@opensourcerouting.org>
Wed, 9 Aug 2017 10:35:15 +0000 (12:35 +0200)
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 aac3d23a9eaa2168557cac9a86204849c14ce388..dae6785aeed394c85d6ad98d70f6cfe0d691bd8a 100644 (file)
@@ -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 */