Revision 48e5f32d proto/ospf/topology.c

View differences:

proto/ospf/topology.c
306 306
        break;
307 307

  
308 308
      default:
309
        log("Unknown interface type %s", ifa->iface->name);
309
        log("Unknown interface type %s", ifa->ifname);
310 310
        break;
311 311
      }
312 312

  
......
447 447
        break;
448 448

  
449 449
      default:
450
        log("Unknown interface type %s", ifa->iface->name);
450
        log("Unknown interface type %s", ifa->ifname);
451 451
        break;
452 452
      }
453 453

  
......
596 596
  
597 597
  void *body;
598 598

  
599
  OSPF_TRACE(D_EVENTS, "Originating network-LSA for iface %s",
600
	     ifa->iface->name);
599
  OSPF_TRACE(D_EVENTS, "Originating network-LSA for iface %s", ifa->ifname);
601 600

  
602 601
  lsa.age = 0;
603 602
  lsa.type = LSA_T_NET;
......
628 627
  if (ifa->net_lsa == NULL)
629 628
    return;
630 629

  
631
  OSPF_TRACE(D_EVENTS, "Flushing network-LSA for iface %s",
632
	     ifa->iface->name);
630
  OSPF_TRACE(D_EVENTS, "Flushing network-LSA for iface %s", ifa->ifname);
633 631
  ifa->net_lsa->lsa.sn += 1;
634 632
  ifa->net_lsa->lsa.age = LSA_MAXAGE;
635 633
  lsasum_calculate(&ifa->net_lsa->lsa, ifa->net_lsa->lsa_body);
......
1212 1210
  struct proto *p = &po->proto;
1213 1211
  void *body;
1214 1212

  
1215
  /* FIXME check for vlink and skip that? */
1216
  OSPF_TRACE(D_EVENTS, "Originating link-LSA for iface %s", ifa->iface->name);
1213
  /* Vlinks do not have link-LSAs */
1214
  if (ifa->type == OSPF_IT_VLINK)
1215
    return;
1216

  
1217
  OSPF_TRACE(D_EVENTS, "Originating link-LSA for iface %s", ifa->ifname);
1217 1218

  
1218 1219
  lsa.age = 0;
1219 1220
  lsa.type = LSA_T_LINK;
......
1498 1499
  struct ospf_lsa_header lsa;
1499 1500
  void *body;
1500 1501

  
1501
  OSPF_TRACE(D_EVENTS, "Originating network prefix-LSA for iface %s",
1502
	     ifa->iface->name);
1502
  OSPF_TRACE(D_EVENTS, "Originating network prefix-LSA for iface %s", ifa->ifname);
1503 1503

  
1504 1504
  lsa.age = 0;
1505 1505
  lsa.type = LSA_T_PREFIX;
......
1525 1525
  if (en == NULL)
1526 1526
    return;
1527 1527

  
1528
  OSPF_TRACE(D_EVENTS, "Flushing network prefix-LSA for iface %s",
1529
	     ifa->iface->name);
1528
  OSPF_TRACE(D_EVENTS, "Flushing network prefix-LSA for iface %s", ifa->ifname);
1530 1529

  
1531 1530
  en->lsa.sn += 1;
1532 1531
  en->lsa.age = LSA_MAXAGE;

Also available in: Unified diff