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

die() -> bug() where appropriate.

Browse source
This commit is contained in:
Martin Mares 1998-12-20 14:27:37 +00:00
parent ee969ea7f4
commit 08c69a7720
8 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nest/iface.c
View file

@ -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 || ipa_to_u32(i->ip) < ipa_to_u32(j->ip)))
j = i; j = i;
if (!j) /* FIXME: allow configuration or running without RID */ 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); router_id = ipa_to_u32(j->ip);
debug("Router ID set to %08x (%s)\n", router_id, j->name); debug("Router ID set to %08x (%s)\n", router_id, j->name);
} }

16
nest/rt-fib.c
View file

@ -132,7 +132,7 @@ fib_get(struct fib *f, ip_addr *a, int len)
return e; return e;
#ifdef DEBUGGING #ifdef DEBUGGING
if (len < 0 || len > BITS_PER_IP_ADDRESS || !ip_is_prefix(*a,len)) 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 #endif
e = sl_alloc(f->fib_slab); e = sl_alloc(f->fib_slab);
e->prefix = *a; e->prefix = *a;
@ -215,7 +215,7 @@ fib_delete(struct fib *f, void *E)
} }
ee = &((*ee)->next); ee = &((*ee)->next);
} }
die("fib_delete() called for invalid node"); bug("fib_delete() called for invalid node");
} }
void void
@ -305,29 +305,29 @@ fib_check(struct fib *f)
struct fib_iterator *j, *j0; struct fib_iterator *j, *j0;
unsigned int h0 = ipa_hash(n->prefix); unsigned int h0 = ipa_hash(n->prefix);
if (h0 < lo) if (h0 < lo)
die("fib_check: discord in hash chains"); bug("fib_check: discord in hash chains");
lo = h0; lo = h0;
if ((h0 >> f->hash_shift) != i) 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; j0 = (struct fib_iterator *) n;
nulls = 0; nulls = 0;
for(j=n->readers; j; j=j->next) for(j=n->readers; j; j=j->next)
{ {
if (j->prev != j0) if (j->prev != j0)
die("fib_check: iterator->prev mismatch"); bug("fib_check: iterator->prev mismatch");
j0 = j; j0 = j;
if (!j->node) if (!j->node)
nulls++; nulls++;
else if (nulls) else if (nulls)
die("fib_check: iterator nullified"); bug("fib_check: iterator nullified");
else if (j->node != n) else if (j->node != n)
die("fib_check: iterator->node mismatch"); bug("fib_check: iterator->node mismatch");
} }
ec++; ec++;
} }
} }
if (ec != f->entries) 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 #endif

2
nest/rt-table.c
View file

@ -97,7 +97,7 @@ rte_better(rte *new, rte *old)
if (new->attrs->proto != old->attrs->proto) if (new->attrs->proto != old->attrs->proto)
{ {
/* FIXME!!! */ /* FIXME!!! */
die("Different protocols, but identical preferences => oops"); bug("Different protocols, but identical preferences => oops");
} }
if (better = new->attrs->proto->rte_better) if (better = new->attrs->proto->rte_better)
return better(new, old); return better(new, old);

2
proto/static/static.c
View file

@ -82,7 +82,7 @@ static_start(struct proto *P)
break; break;
} }
case RTD_DEVICE: case RTD_DEVICE:
die("Static device routes are not supported"); bug("Static device routes are not supported");
/* FIXME: Static device routes */ /* FIXME: Static device routes */
default: default:
static_install(p, r, NULL); static_install(p, r, NULL);

2
sysdep/linux/krt-scan.c
View file

@ -291,7 +291,7 @@ krt_prune(struct krt_proto *p)
rte_update(n, &p->p, new); rte_update(n, &p->p, new);
break; break;
default: default:
die("krt_prune: invalid route status"); bug("krt_prune: invalid route status");
} }
if (old) if (old)

6
sysdep/unix/io.c
View file

@ -293,7 +293,7 @@ void
get_sockaddr(struct sockaddr_in *sa, ip_addr *a, unsigned *port) get_sockaddr(struct sockaddr_in *sa, ip_addr *a, unsigned *port)
{ {
if (sa->sin_family != AF_INET) if (sa->sin_family != AF_INET)
die("get_sockaddr called for wrong address family"); bug("get_sockaddr called for wrong address family");
if (port) if (port)
*port = ntohs(sa->sin_port); *port = ntohs(sa->sin_port);
memcpy(a, &sa->sin_addr.s_addr, sizeof(*a)); memcpy(a, &sa->sin_addr.s_addr, sizeof(*a));
@ -379,7 +379,7 @@ sk_open(sock *s)
fd = socket(PF_INET, SOCK_RAW, s->dport); fd = socket(PF_INET, SOCK_RAW, s->dport);
break; break;
default: default:
die("sk_open() called for invalid sock type %d", s->type); bug("sk_open() called for invalid sock type %d", s->type);
} }
if (fd < 0) if (fd < 0)
die("sk_open: socket: %m"); die("sk_open: socket: %m");
@ -530,7 +530,7 @@ sk_maybe_write(sock *s)
return 1; return 1;
} }
default: default:
die("sk_maybe_write: unknown socket type %d", s->type); bug("sk_maybe_write: unknown socket type %d", s->type);
} }
} }

4
sysdep/unix/krt-set.c
View file

@ -77,7 +77,7 @@ krt_ioctl(int ioc, rte *e, char *name)
break; break;
#endif #endif
default: default:
die("krt set: unknown flags, but not filtered"); bug("krt set: unknown flags, but not filtered");
} }
if (ioctl(if_scan_sock, ioc, &re) < 0) if (ioctl(if_scan_sock, ioc, &re) < 0)
@ -127,6 +127,6 @@ void
krt_set_preconfig(struct krt_proto *x) krt_set_preconfig(struct krt_proto *x)
{ {
if (if_scan_sock < 0) if (if_scan_sock < 0)
die("krt set: missing socket"); bug("krt set: missing socket");
x->p.rt_notify = krt_set_notify; x->p.rt_notify = krt_set_notify;
} }

2
sysdep/unix/main.c
View file

@ -121,5 +121,5 @@ main(void)
debug("Entering I/O loop.\n"); debug("Entering I/O loop.\n");
io_loop(); io_loop();
die("I/O loop died"); bug("I/O loop died");
} }