diff options
Diffstat (limited to 'proto/ospf/topology.c')
| -rw-r--r-- | proto/ospf/topology.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index f25db9a7..4af5afa5 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -306,7 +306,7 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length) break; default: - log("Unknown interface type %s", ifa->iface->name); + log("Unknown interface type %s", ifa->ifname); break; } @@ -447,7 +447,7 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length) break; default: - log("Unknown interface type %s", ifa->iface->name); + log("Unknown interface type %s", ifa->ifname); break; } @@ -596,8 +596,7 @@ originate_net_lsa(struct ospf_iface *ifa) void *body; - OSPF_TRACE(D_EVENTS, "Originating network-LSA for iface %s", - ifa->iface->name); + OSPF_TRACE(D_EVENTS, "Originating network-LSA for iface %s", ifa->ifname); lsa.age = 0; lsa.type = LSA_T_NET; @@ -628,8 +627,7 @@ flush_net_lsa(struct ospf_iface *ifa) if (ifa->net_lsa == NULL) return; - OSPF_TRACE(D_EVENTS, "Flushing network-LSA for iface %s", - ifa->iface->name); + OSPF_TRACE(D_EVENTS, "Flushing network-LSA for iface %s", ifa->ifname); ifa->net_lsa->lsa.sn += 1; ifa->net_lsa->lsa.age = LSA_MAXAGE; lsasum_calculate(&ifa->net_lsa->lsa, ifa->net_lsa->lsa_body); @@ -1212,8 +1210,11 @@ originate_link_lsa(struct ospf_iface *ifa) struct proto *p = &po->proto; void *body; - /* FIXME check for vlink and skip that? */ - OSPF_TRACE(D_EVENTS, "Originating link-LSA for iface %s", ifa->iface->name); + /* Vlinks do not have link-LSAs */ + if (ifa->type == OSPF_IT_VLINK) + return; + + OSPF_TRACE(D_EVENTS, "Originating link-LSA for iface %s", ifa->ifname); lsa.age = 0; lsa.type = LSA_T_LINK; @@ -1498,8 +1499,7 @@ originate_prefix_net_lsa(struct ospf_iface *ifa) struct ospf_lsa_header lsa; void *body; - OSPF_TRACE(D_EVENTS, "Originating network prefix-LSA for iface %s", - ifa->iface->name); + OSPF_TRACE(D_EVENTS, "Originating network prefix-LSA for iface %s", ifa->ifname); lsa.age = 0; lsa.type = LSA_T_PREFIX; @@ -1525,8 +1525,7 @@ flush_prefix_net_lsa(struct ospf_iface *ifa) if (en == NULL) return; - OSPF_TRACE(D_EVENTS, "Flushing network prefix-LSA for iface %s", - ifa->iface->name); + OSPF_TRACE(D_EVENTS, "Flushing network prefix-LSA for iface %s", ifa->ifname); en->lsa.sn += 1; en->lsa.age = LSA_MAXAGE; |