summaryrefslogtreecommitdiff
path: root/proto/ospf/neighbor.c
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2011-03-17 15:53:36 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2011-03-17 15:53:36 +0100
commit8e48831a970a784a979446813191628790d477f1 (patch)
treee3c2e1c2a13ab2249d42b87ce26a1dc02d3faaaf /proto/ospf/neighbor.c
parent93e868c730dc0b1825b2a685e0b066c051b1cb07 (diff)
Vastly improved OSPF reconfiguration.
Now it can handle a change in iface pattern structure. It can add, remove and reconfigure interfaces, vlinks and areas.
Diffstat (limited to 'proto/ospf/neighbor.c')
-rw-r--r--proto/ospf/neighbor.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index 98c9de50..642365b3 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -349,7 +349,7 @@ ospf_neigh_sm(struct ospf_neighbor *n, int event)
case NEIGHBOR_DOWN:
neigh_chstate(n, NEIGHBOR_INIT);
default:
- tm_start(n->inactim, n->ifa->dead); /* Restart inactivity timer */
+ tm_start(n->inactim, n->ifa->deadint); /* Restart inactivity timer */
break;
}
break;
@@ -548,16 +548,6 @@ find_neigh_by_ip(struct ospf_iface *ifa, ip_addr ip)
return NULL;
}
-struct ospf_area *
-ospf_find_area(struct proto_ospf *po, u32 aid)
-{
- struct ospf_area *oa;
- WALK_LIST(oa, po->area_list)
- if (((struct ospf_area *) oa)->areaid == aid)
- return oa;
- return NULL;
-}
-
/* Neighbor is inactive for a long time. Remove it. */
static void
neighbor_timer_hook(timer * timer)