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

Nest: Handle labels_orig correctly in attribute cache

parent cea2e25f
Pipeline #43450 passed with stages
in 45 minutes and 56 seconds
...@@ -188,7 +188,7 @@ nexthop__same(struct nexthop *x, struct nexthop *y) ...@@ -188,7 +188,7 @@ nexthop__same(struct nexthop *x, struct nexthop *y)
{ {
if (!ipa_equal(x->gw, y->gw) || (x->iface != y->iface) || if (!ipa_equal(x->gw, y->gw) || (x->iface != y->iface) ||
(x->flags != y->flags) || (x->weight != y->weight) || (x->flags != y->flags) || (x->weight != y->weight) ||
(x->labels != y->labels)) (x->labels_orig != y->labels_orig) || (x->labels != y->labels))
return 0; return 0;
for (int i = 0; i < x->labels; i++) for (int i = 0; i < x->labels; i++)
...@@ -348,6 +348,7 @@ nexthop_copy(struct nexthop *o) ...@@ -348,6 +348,7 @@ nexthop_copy(struct nexthop *o)
n->next = NULL; n->next = NULL;
n->flags = o->flags; n->flags = o->flags;
n->weight = o->weight; n->weight = o->weight;
n->labels_orig = o->labels_orig;
n->labels = o->labels; n->labels = o->labels;
for (int i=0; i<o->labels; i++) for (int i=0; i<o->labels; i++)
n->label[i] = o->label[i]; n->label[i] = o->label[i];
......
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