After contemplating about RIP route timeouts for a long time, I've implemented

protocol callbacks for route insertion and deletion from the central table.
RIP should maintain its own per-protocol queue of existing routes, scan it
periodically and call rte_discard() for routes that have timed out.

1 files changed, 13 insertions, 1 deletions

diff --git a/nest/rt-table.c b/nest/rt-table.c
index e04d5990..0b8b7934 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -198,8 +198,20 @@ rte_update(net *net, struct proto *p, rte *new)
 	}
     }
   if (old)
-    rte_free(old);
+    {
+      if (p->rte_remove)
+	p->rte_remove(net, old);
+      rte_free(old);
+    }
   new->lastmod = now;
+  if (p->rte_insert)
+    p->rte_insert(net, new);
+}
+
+void
+rte_discard(net *net, rte *old)		/* Non-filtered route deletion, used during garbage collection */
+{
+  rte_update(net, old->attrs->proto, NULL);
 }
 
 void