Minor fixes for debug mode
This commit is contained in:
parent
3013fc57bd
commit
e87a95d97d
4 changed files with 7 additions and 12 deletions
|
@ -93,7 +93,8 @@ if_dump(struct iface *i)
|
||||||
WALK_LIST(a, i->addrs)
|
WALK_LIST(a, i->addrs)
|
||||||
{
|
{
|
||||||
ifa_dump(a);
|
ifa_dump(a);
|
||||||
ASSERT((a != i->addr) == !(a->flags & IA_PRIMARY));
|
ASSERT(!!(a->flags & IA_PRIMARY) ==
|
||||||
|
((a == i->addr4) || (a == i->addr6) || (a == i->llv6)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -568,22 +568,17 @@ found:
|
||||||
void
|
void
|
||||||
fib_check(struct fib *f)
|
fib_check(struct fib *f)
|
||||||
{
|
{
|
||||||
#if 0
|
uint i, ec, nulls;
|
||||||
uint i, ec, lo, nulls;
|
|
||||||
|
|
||||||
ec = 0;
|
ec = 0;
|
||||||
for(i=0; i<f->hash_size; i++)
|
for(i=0; i<f->hash_size; i++)
|
||||||
{
|
{
|
||||||
struct fib_node *n;
|
struct fib_node *n;
|
||||||
lo = 0;
|
|
||||||
for(n=f->hash_table[i]; n; n=n->next)
|
for(n=f->hash_table[i]; n; n=n->next)
|
||||||
{
|
{
|
||||||
struct fib_iterator *j, *j0;
|
struct fib_iterator *j, *j0;
|
||||||
uint h0 = ipa_hash(n->prefix);
|
uint h0 = fib_hash(f, n->addr);
|
||||||
if (h0 < lo)
|
if (h0 != i)
|
||||||
bug("fib_check: discord in hash chains");
|
|
||||||
lo = h0;
|
|
||||||
if ((h0 >> f->hash_shift) != i)
|
|
||||||
bug("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;
|
||||||
|
@ -604,7 +599,6 @@ fib_check(struct fib *f)
|
||||||
}
|
}
|
||||||
if (ec != f->entries)
|
if (ec != f->entries)
|
||||||
bug("fib_check: invalid entry count (%d != %d)", ec, f->entries);
|
bug("fib_check: invalid entry count (%d != %d)", ec, f->entries);
|
||||||
#endif
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -298,7 +298,7 @@ sockets_prepare(struct birdloop *loop)
|
||||||
|
|
||||||
struct pollfd *pfd = loop->poll_fd.data;
|
struct pollfd *pfd = loop->poll_fd.data;
|
||||||
sock **psk = loop->poll_sk.data;
|
sock **psk = loop->poll_sk.data;
|
||||||
int i = 0;
|
uint i = 0;
|
||||||
node *n;
|
node *n;
|
||||||
|
|
||||||
WALK_LIST(n, loop->sock_list)
|
WALK_LIST(n, loop->sock_list)
|
||||||
|
|
|
@ -1179,7 +1179,7 @@ ospf_sh_state(struct proto *P, int verbose, int reachable)
|
||||||
/* We store interesting area-scoped LSAs in array hea and
|
/* We store interesting area-scoped LSAs in array hea and
|
||||||
global-scoped (LSA_T_EXT) LSAs in array hex */
|
global-scoped (LSA_T_EXT) LSAs in array hex */
|
||||||
|
|
||||||
int num = p->gr->hash_entries;
|
uint num = p->gr->hash_entries;
|
||||||
struct top_hash_entry *hea[num];
|
struct top_hash_entry *hea[num];
|
||||||
struct top_hash_entry *hex[verbose ? num : 0];
|
struct top_hash_entry *hex[verbose ? num : 0];
|
||||||
struct top_hash_entry *he;
|
struct top_hash_entry *he;
|
||||||
|
|
Loading…
Reference in a new issue