Jerry/bird
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Handle route deletion without segfaults. A bit more debug dumps.

Browse source
This commit is contained in:
Martin Mares 1998-06-04 20:28:19 +00:00
parent 5331da6a4d
commit 0cdbd3975a
1 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
nest/rt-table.c
View file

@ -30,6 +30,7 @@ rt_setup(rtable *t, char *name)
{ {
bzero(t, sizeof(*t)); bzero(t, sizeof(*t));
fib_init(&t->fib, &root_pool, sizeof(rte), 0, rte_init); fib_init(&t->fib, &root_pool, sizeof(rte), 0, rte_init);
t->name = name;
} }
net * net *
@ -77,6 +78,7 @@ rte_get_temp(rta *a)
rte *e = sl_alloc(rte_slab); rte *e = sl_alloc(rte_slab);
e->attrs = a; e->attrs = a;
e->flags = 0;
e->pref = a->proto->preference; e->pref = a->proto->preference;
e->lastmod = 0; /* FIXME */ e->lastmod = 0; /* FIXME */
return e; return e;
@ -122,12 +124,11 @@ rte_free(rte *e)
} }
void void
rte_update(net *net, rte *new) rte_update(net *net, struct proto *p, rte *new)
{ {
rte *old_best = net->routes; rte *old_best = net->routes;
rte *old = NULL; rte *old = NULL;
rte **k, *r, *s; rte **k, *r, *s;
struct proto *p = new->attrs->proto;
k = &net->routes; /* Find and remove original route from the same protocol */ k = &net->routes; /* Find and remove original route from the same protocol */
while (old = *k) while (old = *k)
@ -140,7 +141,7 @@ rte_update(net *net, rte *new)
k = &old->next; k = &old->next;
} }
if (rte_better(new, old_best)) /* It's a new optimal route => announce and relink it */ if (new && rte_better(new, old_best)) /* It's a new optimal route => announce and relink it */
{ {
rte_announce(new, old_best); rte_announce(new, old_best);
new->next = net->routes; new->next = net->routes;
@ -181,18 +182,43 @@ rte_update(net *net, rte *new)
} }
void void
rte_dump(rte *r) rte_dump(net *n, rte *e)
{ {
if (n)
debug("%08x/%2d ", _I(n->n.prefix), n->n.pxlen);
debug("PF=%02x pref=%d lm=%d ", e->pflags, e->pref, e->lastmod);
rta_dump(e->attrs);
if (e->flags & REF_CHOSEN)
debug(" [*]");
debug("\n");
} }
void void
rt_dump(rtable *t) rt_dump(rtable *t)
{ {
rte *e;
net *n;
debug("Dump of routing table <%s>\n", t->name);
while (t)
{
debug("Routes for TOS %02x:\n", t->tos);
FIB_WALK(&t->fib, fn)
{
n = (net *) fn;
for(e=n->routes; e; e=e->next)
rte_dump(n, e);
}
FIB_WALK_END;
t = t->sibling;
}
debug("\n");
} }
void void
rt_dump_all(void) rt_dump_all(void)
{ {
rt_dump(&master_table);
} }
void void