Revision 48e5f32d proto/ospf/ospf.c

View differences:

proto/ospf/ospf.c
232 232
  struct ospf_area_config *ac;
233 233

  
234 234
  po->router_id = proto_get_router_id(p->cf);
235
  po->last_vlink_id = 0x80000000;
236 235
  po->rfc1583 = c->rfc1583;
237 236
  po->stub_router = c->stub_router;
238 237
  po->ebit = 0;
......
258 257
  WALK_LIST(ac, c->area_list)
259 258
    ospf_area_add(po, ac, 0);
260 259

  
260
  if (c->abr)
261
    ospf_open_vlink_sk(po);
262

  
261 263
  /* Add all virtual links */
262 264
  struct ospf_iface_patt *ic;
263 265
  WALK_LIST(ic, c->vlink_list)
264
    ospf_iface_new(po->backbone, NULL, ic);
266
    ospf_iface_new_vlink(po, ic);
265 267

  
266 268
  return PS_UP;
267 269
}
......
277 279

  
278 280
  WALK_LIST(ifa, po->iface_list)
279 281
  {
280
    OSPF_TRACE(D_EVENTS, "Interface: %s", (ifa->iface ? ifa->iface->name : "(null)"));
282
    OSPF_TRACE(D_EVENTS, "Interface: %s", ifa->ifname);
281 283
    OSPF_TRACE(D_EVENTS, "state: %u", ifa->state);
282 284
    OSPF_TRACE(D_EVENTS, "DR:  %R", ifa->drid);
283 285
    OSPF_TRACE(D_EVENTS, "BDR: %R", ifa->bdrid);
......
381 383
{
382 384
  struct proto *p = &ifa->oa->po->proto;
383 385

  
384
  OSPF_TRACE(D_EVENTS, "Scheduling network-LSA origination for iface %s", ifa->iface->name);
386
  OSPF_TRACE(D_EVENTS, "Scheduling network-LSA origination for iface %s", ifa->ifname);
385 387
  ifa->orignet = 1;
386 388
}
387 389

  
......
391 393
{
392 394
  struct proto *p = &ifa->oa->po->proto;
393 395

  
394
  OSPF_TRACE(D_EVENTS, "Scheduling link-LSA origination for iface %s", ifa->iface->name);
396
  OSPF_TRACE(D_EVENTS, "Scheduling link-LSA origination for iface %s", ifa->ifname);
395 397
  ifa->origlink = 1;
396 398
}
397 399
#endif
......
631 633
{
632 634
  char *type = "<bug>";
633 635

  
634
  switch(rte->attrs->source)
636
  switch (rte->attrs->source)
635 637
  {
636 638
    case RTS_OSPF:
637 639
      type = "I";
......
769 771
    if (ifa)
770 772
      ospf_iface_reconfigure(ifa, ip);
771 773
    else
772
      ospf_iface_new(po->backbone, NULL, ip);
774
      ospf_iface_new_vlink(po, ip);
773 775
  }
774 776

  
775 777
  /* Delete remaining ifaces and areas */
......
808 810
  cli_msg(-1013, "%-12s\t%3s\t%-15s\t%-5s\t%-10s %-12s", "Router ID", "Pri",
809 811
	  "     State", "DTime", "Interface", "Router IP");
810 812
  WALK_LIST(ifa, po->iface_list)
811
    if ((iff == NULL) || patmatch(iff, ifa->iface->name))
813
    if ((iff == NULL) || patmatch(iff, ifa->ifname))
812 814
      WALK_LIST(n, ifa->neigh_list)
813 815
	ospf_sh_neigh_info(n);
814 816
  cli_msg(0, "");
......
917 919

  
918 920
  cli_msg(-1015, "%s:", p->name);
919 921
  WALK_LIST(ifa, po->iface_list)
920
    if ((iff == NULL) || patmatch(iff, ifa->iface->name))
922
    if ((iff == NULL) || patmatch(iff, ifa->ifname))
921 923
      ospf_iface_info(ifa);
922 924
  cli_msg(0, "");
923 925
}

Also available in: Unified diff