Refactor: merge update_prefix() and withdraw_prefix() into one function

diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c
index 2e416254accf4d471c22b90c57c96474bb089cab..da2fc76308e63d8c03f4e510738976420c19622a 100644 (file)
--- a/proto/aggregator/aggregator.c
+++ b/proto/aggregator/aggregator.c
@@ -710,10 +710,7 @@ aggregator_rt_notify(struct proto *P, struct channel *src_ch, net *net, rte *new
   {
     if (p->root)
     {
-      if (old && !new)
-        aggregator_withdraw_prefix(p, old_route);
-      else
-        aggregator_update_prefix(p, old_route, new_route);
+      aggregator_recalculate(p, old_route, new_route);
 
       /* Process all route withdrawals which were caused by the update */
       aggregator_withdraw_rte(p);

diff --git a/proto/aggregator/aggregator.h b/proto/aggregator/aggregator.h
index 314b32cbf1514e00f9bcae37cf6482e49b2dfd8a..1f2d3533a46d8c9ac39b72590ec47d95ceb8ae96 100644 (file)
--- a/proto/aggregator/aggregator.h
+++ b/proto/aggregator/aggregator.h
@@ -149,8 +149,7 @@ struct trie_node {
 };
 
 void aggregator_aggregate(struct aggregator_proto *p);
-void aggregator_update_prefix(struct aggregator_proto *p, struct aggregator_route *old, struct aggregator_route *new);
-void aggregator_withdraw_prefix(struct aggregator_proto *p, struct aggregator_route *old);
+void aggregator_recalculate(struct aggregator_proto *p, struct aggregator_route *old, struct aggregator_route *new);
 void aggregator_bucket_update(struct aggregator_proto *p, struct aggregator_bucket *bucket, struct network *net);
 
 struct trie_node *aggregator_create_new_node(linpool *trie_pool);

diff --git a/proto/aggregator/trie.c b/proto/aggregator/trie.c
index 9189398b0785f3cf6d3f379aa593375e6867f973..f1cef7fde8536f787320ad7800c5d42736437b1e 100644 (file)
--- a/proto/aggregator/trie.c
+++ b/proto/aggregator/trie.c
@@ -902,93 +902,6 @@ aggregator_merge_buckets_above(struct trie_node *node)
   return node;
 }
 
-/*
- * Incorporate announcement of new prefix into the trie
- */
-void
-aggregator_update_prefix(struct aggregator_proto *p, struct aggregator_route *old UNUSED, struct aggregator_route *new)
-{
-  ASSERT_DIE(p != NULL);
-  ASSERT_DIE(new != NULL);
-
-  const struct net_addr *addr = new->rte.net->n.addr;
-
-  const ip_addr prefix = net_prefix(addr);
-  const u32 pxlen = net_pxlen(addr);
-
-  struct trie_node * const updated_node = aggregator_trie_insert_prefix(p, prefix, pxlen, new->bucket);
-  ASSERT_DIE(updated_node != NULL);
-  ASSERT_DIE(updated_node->original_bucket != NULL);
-  ASSERT_DIE(updated_node->status == NON_FIB);
-  ASSERT_DIE(updated_node->px_origin == ORIGINAL);
-
-  struct trie_node *node = updated_node;
-
-  /*
-   * Find the closest IN_FIB ancestor of the updated node and deaggregate
-   * the whole subtree rooted at this node. Since updated node has IN_FIB
-   * status, we need to find node which is different from this node.
-   * Then aggregate it once again, this time with incorporated update.
-   */
-  while (1)
-  {
-    if (node->status == IN_FIB && node != updated_node)
-      break;
-
-    node = node->parent;
-  }
-
-  aggregator_deaggregate(node);
-  aggregator_second_pass(node);
-  struct trie_node *highest_node = aggregator_merge_buckets_above(node);
-  ASSERT_DIE(highest_node != NULL);
-  aggregator_third_pass(p, highest_node);
-
-  check_trie_after_aggregation(p->root);
-}
-
-/*
- * Incorporate prefix withdrawal to the trie
- */
-void
-aggregator_withdraw_prefix(struct aggregator_proto *p, struct aggregator_route *old)
-{
-  ASSERT_DIE(p != NULL);
-  ASSERT_DIE(old != NULL);
-
-  const struct net_addr *addr = old->rte.net->n.addr;
-
-  const ip_addr prefix = net_prefix(addr);
-  const u32 pxlen = net_pxlen(addr);
-
-  struct trie_node * const updated_node = aggregator_trie_remove_prefix(p, prefix, pxlen);
-  ASSERT_DIE(updated_node != NULL);
-
-  struct trie_node *node = updated_node;
-
-  /*
-   * Find the closest IN_FIB ancestor of the updated node and deaggregate
-   * the whole subtree rooted at this node. Since updated node does not have
-   * IN_FIB status, the next node with this status will be its ancestor we are
-   * seeking. Then aggregate it again, this time with incorporated update.
-   */
-  while (1)
-  {
-    if (node->status == IN_FIB && node != updated_node)
-      break;
-
-    node = node->parent;
-  }
-
-  aggregator_deaggregate(node);
-  aggregator_second_pass(node);
-  struct trie_node *highest_node = aggregator_merge_buckets_above(node);
-  ASSERT_DIE(highest_node != NULL);
-  aggregator_third_pass(p, highest_node);
-
-  check_trie_after_aggregation(p->root);
-}
-
 static void
 aggregator_construct_trie(struct aggregator_proto *p)
 {
@@ -1029,3 +942,76 @@ aggregator_aggregate(struct aggregator_proto *p)
   aggregator_construct_trie(p);
   aggregator_calculate_trie(p);
 }
+
+/*
+ * Incorporate prefix change into the trie and reaggregate
+ */
+void
+aggregator_recalculate(struct aggregator_proto *p, struct aggregator_route *old, struct aggregator_route *new)
+{
+  struct trie_node *updated_node = NULL;
+
+  /* Withdraw */
+  if (old && !new)
+  {
+    const struct net_addr *addr = old->rte.net->n.addr;
+
+    const ip_addr prefix = net_prefix(addr);
+    const u32 pxlen = net_pxlen(addr);
+
+    updated_node = aggregator_trie_remove_prefix(p, prefix, pxlen);
+
+    ASSERT_DIE(updated_node != NULL);
+    ASSERT_DIE(updated_node->px_origin == FILLER);
+    ASSERT_DIE(updated_node->original_bucket == NULL);
+  }
+  else /* Announce or update */
+  {
+    const struct net_addr *addr = new->rte.net->n.addr;
+
+    const ip_addr prefix = net_prefix(addr);
+    const u32 pxlen = net_pxlen(addr);
+
+    updated_node = aggregator_trie_insert_prefix(p, prefix, pxlen, new->bucket);
+
+    ASSERT_DIE(updated_node != NULL);
+    ASSERT_DIE(updated_node->px_origin == ORIGINAL);
+    ASSERT_DIE(updated_node->original_bucket != NULL);
+  }
+
+  struct trie_node *ancestor = updated_node;
+
+  /* Find the closest IN_FIB ancestor of the updated node */
+  // TODO: use node ancestor pointer instead of traversing
+  while (1)
+  {
+    if ((ancestor->status == IN_FIB && ancestor != updated_node) || !ancestor->parent)
+      break;
+
+    ancestor = ancestor->parent;
+  }
+
+  /*
+  while (ancestor = ancestor->parent)
+  {
+    ASSERT_DIE(ancestor != updated_node);
+
+    if (ancestor->status == IN_FIB || !ancestor->parent)
+      break;
+  }
+  */
+
+  ASSERT_DIE(ancestor != NULL);
+  ASSERT_DIE(ancestor != updated_node);
+  ASSERT_DIE(ancestor->status == IN_FIB);
+
+  /* Deaggregate and then aggregate again, this time with incorporated update */
+  aggregator_deaggregate(ancestor);
+  aggregator_second_pass(ancestor);
+
+  struct trie_node *highest_node = aggregator_merge_buckets_above(ancestor);
+  ASSERT_DIE(highest_node != NULL);
+
+  aggregator_third_pass(p, highest_node);
+  check_trie_after_aggregation(p->root);
+}