Revision 48e5f32d proto/ospf/neighbor.c

View differences:

proto/ospf/neighbor.c
69 69
  add_tail(&ifa->neigh_list, NODE n);
70 70
  n->adj = 0;
71 71
  n->csn = 0;
72
  n->ldbdes = mb_allocz(pool, ifa->iface->mtu);
73 72
  n->state = NEIGHBOR_DOWN;
74 73

  
75 74
  init_lists(n);
......
286 285
    {
287 286
    case OSPF_IS_DOWN:
288 287
    case OSPF_IS_LOOP:
289
      bug("%s: Iface %s in down state?", p->name, ifa->iface->name);
288
      bug("%s: Iface %s in down state?", p->name, ifa->ifname);
290 289
      break;
291 290
    case OSPF_IS_WAITING:
292
      DBG("%s: Neighbor? on iface %s\n", p->name, ifa->iface->name);
291
      DBG("%s: Neighbor? on iface %s\n", p->name, ifa->ifname);
293 292
      break;
294 293
    case OSPF_IS_DROTHER:
295 294
      if (((n->rid == ifa->drid) || (n->rid == ifa->bdrid))
......
303 302
	i = 1;
304 303
      break;
305 304
    default:
306
      bug("%s: Iface %s in unknown state?", p->name, ifa->iface->name);
305
      bug("%s: Iface %s in unknown state?", p->name, ifa->ifname);
307 306
      break;
308 307
    }
309 308
    break;
310 309
  default:
311
    bug("%s: Iface %s is unknown type?", p->name, ifa->iface->name);
310
    bug("%s: Iface %s is unknown type?", p->name, ifa->ifname);
312 311
    break;
313 312
  }
314
  DBG("%s: Iface %s can_do_adj=%d\n", p->name, ifa->iface->name, i);
313
  DBG("%s: Iface %s can_do_adj=%d\n", p->name, ifa->ifname, i);
315 314
  return i;
316 315
}
317 316

  
......
556 555
  struct ospf_iface *ifa = n->ifa;
557 556
  struct proto *p = &ifa->oa->po->proto;
558 557

  
559
  OSPF_TRACE(D_EVENTS,
560
	     "Inactivity timer fired on interface %s for neighbor %I.",
561
	     ifa->iface->name, n->ip);
558
  OSPF_TRACE(D_EVENTS, "Inactivity timer fired on interface %s for neighbor %I.",
559
	     ifa->ifname, n->ip);
562 560
  ospf_neigh_remove(n);
563 561
}
564 562

  
......
591 589
  if (req->down)
592 590
  {
593 591
    OSPF_TRACE(D_EVENTS, "BFD session down for %I on %s",
594
	       n->ip, n->ifa->iface->name);
592
	       n->ip, n->ifa->ifname);
595 593

  
596 594
    ospf_neigh_remove(n);
597 595
  }
......
641 639
    pos = "ptp  ";
642 640

  
643 641
  cli_msg(-1013, "%-1R\t%3u\t%s/%s\t%-5s\t%-10s %-1I", n->rid, n->priority,
644
	  ospf_ns[n->state], pos, etime,
645
          (ifa->type == OSPF_IT_VLINK ? "vlink" : ifa->iface->name), n->ip);
642
	  ospf_ns[n->state], pos, etime, ifa->ifname, n->ip);
646 643
}
647 644

  
648 645
static void
......
653 650
  struct top_hash_entry *en;
654 651

  
655 652
  DBG("%s: RXMT timer fired on interface %s for neigh: %I.\n",
656
      p->name, n->ifa->iface->name, n->ip);
653
      p->name, n->ifa->ifname, n->ip);
657 654

  
658 655
  if(n->state < NEIGHBOR_EXSTART) return;
659 656

  

Also available in: Unified diff