Merge pull request #5412 from opensourcerouting/bfdd-vrf-fix

[mirror_frr.git] / ldpd / lde.c

diff --git a/ldpd/lde.c b/ldpd/lde.c
index ac680b47a93230b1a7d88fffc2195a2c12dbe7ec..006d27f6abb873fbd6a1afee0c001b1b8bc0af77 100644 (file)
--- a/ldpd/lde.c
+++ b/ldpd/lde.c
@@ -520,7 +520,8 @@ lde_dispatch_parent(struct thread *thread)
                        switch (imsg.hdr.type) {
                        case IMSG_NETWORK_ADD:
                                lde_kernel_insert(&fec, kr->af, &kr->nexthop,
-                                   kr->ifindex, kr->priority,
+                                   kr->ifindex, kr->route_type,
+                                   kr->route_instance,
                                    kr->flags & F_CONNECTED, NULL);
                                break;
                        case IMSG_NETWORK_UPDATE:
@@ -747,7 +748,8 @@ lde_send_change_klabel(struct fec_node *fn, struct fec_nh *fnh)
                kr.ifindex = fnh->ifindex;
                kr.local_label = fn->local_label;
                kr.remote_label = fnh->remote_label;
-               kr.priority = fnh->priority;
+               kr.route_type = fnh->route_type;
+               kr.route_instance = fnh->route_instance;
 
                lde_imsg_compose_parent(IMSG_KLABEL_CHANGE, 0, &kr,
                    sizeof(kr));
@@ -761,7 +763,8 @@ lde_send_change_klabel(struct fec_node *fn, struct fec_nh *fnh)
                kr.ifindex = fnh->ifindex;
                kr.local_label = fn->local_label;
                kr.remote_label = fnh->remote_label;
-               kr.priority = fnh->priority;
+               kr.route_type = fnh->route_type;
+               kr.route_instance = fnh->route_instance;
 
                lde_imsg_compose_parent(IMSG_KLABEL_CHANGE, 0, &kr,
                    sizeof(kr));
@@ -798,7 +801,8 @@ lde_send_delete_klabel(struct fec_node *fn, struct fec_nh *fnh)
                kr.ifindex = fnh->ifindex;
                kr.local_label = fn->local_label;
                kr.remote_label = fnh->remote_label;
-               kr.priority = fnh->priority;
+               kr.route_type = fnh->route_type;
+               kr.route_instance = fnh->route_instance;
 
                lde_imsg_compose_parent(IMSG_KLABEL_DELETE, 0, &kr,
                    sizeof(kr));
@@ -812,7 +816,8 @@ lde_send_delete_klabel(struct fec_node *fn, struct fec_nh *fnh)
                kr.ifindex = fnh->ifindex;
                kr.local_label = fn->local_label;
                kr.remote_label = fnh->remote_label;
-               kr.priority = fnh->priority;
+               kr.route_type = fnh->route_type;
+               kr.route_instance = fnh->route_instance;
 
                lde_imsg_compose_parent(IMSG_KLABEL_DELETE, 0, &kr,
                    sizeof(kr));