summaryrefslogtreecommitdiffstats
path: root/nest
diff options
context:
space:
mode:
Diffstat (limited to 'nest')
-rw-r--r--nest/iface.c2
-rw-r--r--nest/rt-fib.c16
-rw-r--r--nest/rt-table.c2
3 files changed, 10 insertions, 10 deletions
diff --git a/nest/iface.c b/nest/iface.c
index 831b3e2..ce638d2 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -341,7 +341,7 @@ auto_router_id(void) /* FIXME: What if we run IPv6??? */
(!j || ipa_to_u32(i->ip) < ipa_to_u32(j->ip)))
j = i;
if (!j) /* FIXME: allow configuration or running without RID */
- die("Cannot determine router ID, please configure manually");
+ bug("Cannot determine router ID, please configure manually");
router_id = ipa_to_u32(j->ip);
debug("Router ID set to %08x (%s)\n", router_id, j->name);
}
diff --git a/nest/rt-fib.c b/nest/rt-fib.c
index 15db74c..f436525 100644
--- a/nest/rt-fib.c
+++ b/nest/rt-fib.c
@@ -132,7 +132,7 @@ fib_get(struct fib *f, ip_addr *a, int len)
return e;
#ifdef DEBUGGING
if (len < 0 || len > BITS_PER_IP_ADDRESS || !ip_is_prefix(*a,len))
- die("fib_get() called for invalid address");
+ bug("fib_get() called for invalid address");
#endif
e = sl_alloc(f->fib_slab);
e->prefix = *a;
@@ -215,7 +215,7 @@ fib_delete(struct fib *f, void *E)
}
ee = &((*ee)->next);
}
- die("fib_delete() called for invalid node");
+ bug("fib_delete() called for invalid node");
}
void
@@ -305,29 +305,29 @@ fib_check(struct fib *f)
struct fib_iterator *j, *j0;
unsigned int h0 = ipa_hash(n->prefix);
if (h0 < lo)
- die("fib_check: discord in hash chains");
+ bug("fib_check: discord in hash chains");
lo = h0;
if ((h0 >> f->hash_shift) != i)
- die("fib_check: mishashed %x->%x (order %d)", h0, i, f->hash_order);
+ bug("fib_check: mishashed %x->%x (order %d)", h0, i, f->hash_order);
j0 = (struct fib_iterator *) n;
nulls = 0;
for(j=n->readers; j; j=j->next)
{
if (j->prev != j0)
- die("fib_check: iterator->prev mismatch");
+ bug("fib_check: iterator->prev mismatch");
j0 = j;
if (!j->node)
nulls++;
else if (nulls)
- die("fib_check: iterator nullified");
+ bug("fib_check: iterator nullified");
else if (j->node != n)
- die("fib_check: iterator->node mismatch");
+ bug("fib_check: iterator->node mismatch");
}
ec++;
}
}
if (ec != f->entries)
- die("fib_check: invalid entry count (%d != %d)", ec, f->entries);
+ bug("fib_check: invalid entry count (%d != %d)", ec, f->entries);
}
#endif
diff --git a/nest/rt-table.c b/nest/rt-table.c
index b35297b..0ccb8da 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -97,7 +97,7 @@ rte_better(rte *new, rte *old)
if (new->attrs->proto != old->attrs->proto)
{
/* FIXME!!! */
- die("Different protocols, but identical preferences => oops");
+ bug("Different protocols, but identical preferences => oops");
}
if (better = new->attrs->proto->rte_better)
return better(new, old);