From: Igor Putovny <igor.putovny@nic.cz>
Date: Tue, 8 Apr 2025 11:49:56 +0000 (+0200)
Subject: Make immediate fixes so the code compiles
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=930c5e6922ace75b8911687bb96c38c93a6a043e;p=thirdparty%2Fbird.git

Make immediate fixes so the code compiles
---

diff --git a/proto/aggregator/trie.c b/proto/aggregator/trie.c
index f00fb8a6f..04a1b576f 100644
--- a/proto/aggregator/trie.c
+++ b/proto/aggregator/trie.c
@@ -439,6 +439,9 @@ aggregator_create_route(struct aggregator_proto *p, ip_addr prefix, u32 pxlen, s
   struct net_addr addr = { 0 };
   net_fill_ipa(&addr, prefix, pxlen);
 
+  struct network *n = allocz(sizeof(*n) + sizeof(addr));
+  net_copy(n->n.addr, &addr);
+
   /* TODO: Proč sem vlastně předáváme struct network? Mělo by nám stačit net_addr. */
   aggregator_bucket_update(p, bucket, n);
 }
@@ -461,7 +464,7 @@ aggregator_prepare_rte_withdrawal(struct aggregator_proto *p, ip_addr prefix, u3
   struct net_addr addr = { 0 };
   net_fill_ipa(&addr, prefix, pxlen);
   net_copy(&item->addr, &addr);
-#endif 
+#endif
 
   item->bucket = bucket;
 
@@ -873,7 +876,7 @@ aggregator_group_prefixes_helper(struct aggregator_proto *p, struct trie_node *n
   }
 
   /* Prune the trie */
-  if (node->status == NON_FIB && node->px_origin != ORIGINAL && aggregator_is_leaf(node))
+  if (node->status == NON_FIB && node->px_origin != ORIGINAL && !node->child[0] && !node->child[1])
   {
     ASSERT_DIE(node->selected_bucket == NULL);
     aggregator_remove_node(node);