summaryrefslogtreecommitdiff
path: root/proto/bgp
diff options
context:
space:
mode:
authorMaria Matejka <mq@ucw.cz>2022-05-30 16:48:17 +0200
committerMaria Matejka <mq@ucw.cz>2022-05-30 16:48:17 +0200
commitb7e2edd4419fecb09b8690f8731e172f0c24789c (patch)
tree41c80ab4b0d524ff34e207bf15e8d79191276a2c /proto/bgp
parentd7bec897ab772cdccce10b296d4efd48d9181297 (diff)
parent1d309c4ce6e95b68c64a8f007f6dd2f1830a5707 (diff)
Merge commit '1d309c4ce6e95b68c64a8f007f6dd2f1830a5707' into haugesund
Diffstat (limited to 'proto/bgp')
-rw-r--r--proto/bgp/attrs.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index e5165a96..e6f11a88 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -94,13 +94,12 @@ void bgp_set_attr_u32(ea_list **to, uint code, uint flags, u32 val)
void bgp_set_attr_ptr(ea_list **to, uint code, uint flags, const struct adata *ad)
{
ASSERT(bgp_attr_known(code));
- ASSERT_DIE(!(bgp_attr_table[code].type & EAF_EMBEDDED));
- ea_set_attr(to, EA_LITERAL_GENERIC(
+ ea_set_attr(to, EA_LITERAL_DIRECT_ADATA(
EA_CODE(PROTOCOL_BGP, code),
bgp_attr_table[code].type,
flags & ~BAF_EXT_LEN,
- .u.ad = ad
+ ad
));
}
@@ -109,7 +108,7 @@ bgp_set_attr_data(ea_list **to, uint code, uint flags, void *data, uint len)
{
ASSERT(bgp_attr_known(code));
- ea_set_attr(to, EA_LITERAL_ADATA(
+ ea_set_attr(to, EA_LITERAL_STORE_ADATA(
EA_CODE(PROTOCOL_BGP, code),
bgp_attr_table[code].type,
flags & ~BAF_EXT_LEN,