Merge commit 'e2f08c38'

diff --cc proto/bgp/attrs.c
index 4346cd5d484ca7574afb873792db28e8e297c06e,457a8b152a0df8c1d5270f1c174f9ec6f17723fc..b7a9fe346abff198c8ab6b56298408b872fc196f
--- 1/proto/bgp/attrs.c
--- 2/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@@ -1152,20 -1151,6 +1152,12 @@@ bgp_attr_known(uint code
    return (code < ARRAY_SIZE(bgp_attr_table)) && bgp_attr_table[code].name;
  }
  
- void bgp_fix_attr_flags(ea_list *attrs)
- {
-   for (u8 i = 0; i < attrs->count; i++)
-   {
-     attrs->attrs[i].flags = bgp_attr_table[EA_ID(attrs->attrs[i].id)].flags;
-   }
- }
- 
 +const char *
 +bgp_attr_name(uint code)
 +{
 +  return (code < ARRAY_SIZE(bgp_attr_table)) ? bgp_attr_table[code].name : NULL;
 +}
 +
  /*
   *    Attribute export
   */

diff --cc proto/bgp/bgp.c
Simple merge

diff --cc proto/bgp/bgp.h
Simple merge

diff --cc proto/bgp/packets.c
index b7df5a7adf0fc1fb4b0481d9419fe3c5886d636e,ff51e309f72d5cb3ad927d00d0795681c35afb45..1dd49ae1065930bec82dd1c757dc787fea4671c2
--- 1/proto/bgp/packets.c
--- 2/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@@ -2495,10 -2471,9 +2474,9 @@@ bgp_bmp_encode_rte(struct bgp_channel *
    if (attrs)
      memcpy(b->eattrs, attrs, ea_size);
  
-   /* Sham prefix */
-   struct bgp_prefix *px = alloca(prefix_size);
-   *px = (struct bgp_prefix) { };
+   /* Temporary prefix */
+   struct bgp_prefix *px = tmp_allocz(prefix_size);
 -  px->path_id = src->private_id;
 +  px->path_id = (u32) src->private_id;
    net_copy(px->net, n);
    add_tail(&b->prefixes, &px->buck_node);