Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Nest: Handle labels_orig correctly in attribute cache

Browse source
This commit is contained in:
Ondrej Zajicek (work) 2018-12-18 14:41:12 +01:00
parent cea2e25f41
commit bda5863425
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nest/rt-attr.c
View file

@ -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)
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];