diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-03-14 10:06:44 +0100 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-04-06 18:14:08 +0200 |
| commit | 63cf5d5d8c8e156a1f427614c8017ca71c32191c (patch) | |
| tree | 0c47dab941db9e4fd20f10c2fd99ec4e2b2b60e1 /nest/rt-attr.c | |
| parent | af8568a8700b83f4d1946b7075fa3eac96d1d5b6 (diff) | |
Eattr flags (originated and fresh) get their own struct fields
Diffstat (limited to 'nest/rt-attr.c')
| -rw-r--r-- | nest/rt-attr.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nest/rt-attr.c b/nest/rt-attr.c index 863d411b..2f0395c7 100644 --- a/nest/rt-attr.c +++ b/nest/rt-attr.c @@ -623,7 +623,10 @@ ea_do_prune(ea_list *e) *d = *s0; /* Preserve info whether it originated locally */ - d->type = (d->type & ~(EAF_ORIGINATED|EAF_FRESH)) | (s[-1].type & EAF_ORIGINATED); + d->originated = s[-1].originated; + + /* Not fresh any more, we prefer surstroemming */ + d->fresh = 0; /* Next destination */ d++; @@ -737,6 +740,8 @@ ea_same(ea_list *x, ea_list *y) if (a->id != b->id || a->flags != b->flags || a->type != b->type || + a->originated != b->originated || + a->fresh != b->fresh || ((a->type & EAF_EMBEDDED) ? a->u.data != b->u.data : !adata_same(a->u.ptr, b->u.ptr))) return 0; } @@ -1004,7 +1009,7 @@ ea_dump(ea_list *e) eattr *a = &e->attrs[i]; debug(" %02x:%02x.%02x", EA_PROTO(a->id), EA_ID(a->id), a->flags); debug("=%c", "?iO?I?P???S?????" [a->type & EAF_TYPE_MASK]); - if (a->type & EAF_ORIGINATED) + if (a->originated) debug("o"); if (a->type & EAF_EMBEDDED) debug(":%08x", a->u.data); |