Commit 843b10c8 authored by Ondřej Zajíček's avatar Ondřej Zajíček

Nest: Handle non-MPLS on MPLS case in recursive route update

When non-MPLS recursive route resolves to MPLS underlying route,
then it should get MPLS labels from the the underlying route.
parent 9eace843
Pipeline #54016 passed with stages
in 6 minutes and 31 seconds
......@@ -2115,6 +2115,7 @@ no_nexthop:
memset(nhp, 0, NEXTHOP_MAX_SIZE);
nhp->iface = nh->iface;
nhp->weight = nh->weight;
if (mls)
{
nhp->labels = nh->labels + mls->len;
......@@ -2132,6 +2133,13 @@ no_nexthop:
continue;
}
}
else if (nh->labels)
{
nhp->labels = nh->labels;
nhp->labels_orig = 0;
memcpy(nhp->label, nh->label, nh->labels * sizeof(u32));
}
if (ipa_nonzero(nh->gw))
{
nhp->gw = nh->gw; /* Router nexthop */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment