diff options
| author | Ondrej Filip <feela@majklik.network.cz> | 2010-04-27 11:28:44 +0200 |
|---|---|---|
| committer | Ondrej Filip <feela@majklik.network.cz> | 2010-04-27 11:28:44 +0200 |
| commit | 96599c957baa9c82bde91d610ce4f519aead05e9 (patch) | |
| tree | 28fc5b3e90afb11e288a6c428d1203dd7992bd35 /proto/ospf/iface.c | |
| parent | ba130172549ef2313f713e048083432f74e7d03d (diff) | |
| parent | 9d1ee1388771a3caa6c23163571a80457adfab2c (diff) | |
| download | bird-96599c957baa9c82bde91d610ce4f519aead05e9.tar bird-96599c957baa9c82bde91d610ce4f519aead05e9.zip | |
Merge branch 'master' of ssh://git.nic.cz/projects/bird/GIT/bird
Diffstat (limited to 'proto/ospf/iface.c')
| -rw-r--r-- | proto/ospf/iface.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 6931619..b5a509a 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -260,6 +260,7 @@ ospf_iface_down(struct ospf_iface *ifa) ifa->iface = NULL; ifa->addr = NULL; ifa->sk = NULL; + ifa->cost = 0; ifa->vip = IPA_NONE; return; } @@ -445,27 +446,6 @@ ospf_iface_new(struct proto_ospf *po, struct iface *iface, struct ifa *addr, #ifdef OSPFv3 ifa->instance_id = ip->instance_id; - - /* - addr = NULL; - if (ifa->type != OSPF_IT_VLINK) - { - struct ifa *a; - WALK_LIST(a, iface->addrs) - if (a->scope == SCOPE_LINK) - { - addr = a; - break; - } - - if (!addr) - { - log(L_ERR "%s: Missing link-local address on interface %s, declaring as stub", p->name, iface->name); - ifa->ioprob = OSPF_I_LL; - ifa->stub = 1; - } - } - */ #endif if (ip->type == OSPF_IT_UNDEF) @@ -824,5 +804,4 @@ ospf_iface_shutdown(struct ospf_iface *ifa) { init_list(&ifa->neigh_list); hello_timer_hook(ifa->hello_timer); - ospf_sk_close(ifa); } |