mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-08 12:18:42 +00:00
Code Releases Activity

Merge commit '2d0652dd1088395c50df8fe1a99f1111b44688c6' into thread-next

Browse Source
This commit is contained in:
Ondrej Zajicek 2024-04-01 03:00:10 +02:00
commit a0ec075de3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proto/bgp/attrs.c
View File

@ -96,7 +96,7 @@ void bgp_set_attr_u32(ea_list **to, uint code, uint flags, u32 val)
ea_set_attr(to, EA_LITERAL_EMBEDDED( ea_set_attr(to, EA_LITERAL_EMBEDDED(
&desc->class, &desc->class,
flags & ~BAF_EXT_LEN, desc->flags | (flags & BAF_PARTIAL),
val val
)); ));
} }
@ -107,7 +107,7 @@ void bgp_set_attr_ptr(ea_list **to, uint code, uint flags, const struct adata *a
ea_set_attr(to, EA_LITERAL_DIRECT_ADATA( ea_set_attr(to, EA_LITERAL_DIRECT_ADATA(
&desc->class, &desc->class,
flags & ~BAF_EXT_LEN, desc->flags | (flags & BAF_PARTIAL),
ad ad
)); ));
} }
@ -119,7 +119,7 @@ bgp_set_attr_data(ea_list **to, uint code, uint flags, void *data, uint len)
ea_set_attr(to, EA_LITERAL_STORE_ADATA( ea_set_attr(to, EA_LITERAL_STORE_ADATA(
&desc->class, &desc->class,
flags & ~BAF_EXT_LEN, desc->flags | (flags & BAF_PARTIAL),
data, data,
len len
)); ));
@ -1254,7 +1254,8 @@ bgp_export_attr(struct bgp_export_state *s, eattr *a, ea_list *to)
if (!desc) if (!desc)
return; return;
/* The flags might have been zero if the attr was added locally */ /* The flags should be correct, we reset them just to be sure */
ASSERT(!((a->flags ^ desc->flags) & (BAF_OPTIONAL | BAF_TRANSITIVE)));
a->flags = (a->flags & BAF_PARTIAL) | desc->flags; a->flags = (a->flags & BAF_PARTIAL) | desc->flags;
/* Set partial bit if new opt-trans attribute is attached to non-local route */ /* Set partial bit if new opt-trans attribute is attached to non-local route */