Revision e87a95d9

View differences:

nest/iface.c
93 93
  WALK_LIST(a, i->addrs)
94 94
    {
95 95
      ifa_dump(a);
96
      ASSERT((a != i->addr) == !(a->flags & IA_PRIMARY));
96
      ASSERT(!!(a->flags & IA_PRIMARY) ==
97
	     ((a == i->addr4) || (a == i->addr6) || (a == i->llv6)));
97 98
    }
98 99
}
99 100

  
nest/rt-fib.c
568 568
void
569 569
fib_check(struct fib *f)
570 570
{
571
#if 0
572
  uint i, ec, lo, nulls;
571
  uint i, ec, nulls;
573 572

  
574 573
  ec = 0;
575 574
  for(i=0; i<f->hash_size; i++)
576 575
    {
577 576
      struct fib_node *n;
578
      lo = 0;
579 577
      for(n=f->hash_table[i]; n; n=n->next)
580 578
	{
581 579
	  struct fib_iterator *j, *j0;
582
	  uint h0 = ipa_hash(n->prefix);
583
	  if (h0 < lo)
584
	    bug("fib_check: discord in hash chains");
585
	  lo = h0;
586
	  if ((h0 >> f->hash_shift) != i)
580
	  uint h0 = fib_hash(f, n->addr);
581
	  if (h0 != i)
587 582
	    bug("fib_check: mishashed %x->%x (order %d)", h0, i, f->hash_order);
588 583
	  j0 = (struct fib_iterator *) n;
589 584
	  nulls = 0;
......
604 599
    }
605 600
  if (ec != f->entries)
606 601
    bug("fib_check: invalid entry count (%d != %d)", ec, f->entries);
607
#endif
608 602
  return;
609 603
}
610 604

  
proto/bfd/io.c
298 298

  
299 299
  struct pollfd *pfd = loop->poll_fd.data;
300 300
  sock **psk = loop->poll_sk.data;
301
  int i = 0;
301
  uint i = 0;
302 302
  node *n;
303 303

  
304 304
  WALK_LIST(n, loop->sock_list)
proto/ospf/ospf.c
1179 1179
  /* We store interesting area-scoped LSAs in array hea and
1180 1180
     global-scoped (LSA_T_EXT) LSAs in array hex */
1181 1181

  
1182
  int num = p->gr->hash_entries;
1182
  uint num = p->gr->hash_entries;
1183 1183
  struct top_hash_entry *hea[num];
1184 1184
  struct top_hash_entry *hex[verbose ? num : 0];
1185 1185
  struct top_hash_entry *he;

Also available in: Unified diff