summaryrefslogtreecommitdiff
path: root/ospfd/ospf_zebra.c
diff options
context:
space:
mode:
authorpaul <paul>2005-11-20 14:50:45 +0000
committerpaul <paul>2005-11-20 14:50:45 +0000
commitb29800a676b7c3cf00d8a4086b7783ccb7e2f29f (patch)
tree98afc20c5aae1909e34b1b86f1d6d18f36391c89 /ospfd/ospf_zebra.c
parent77b1cffe3b71c886152534b8507f00c7fcbd12c9 (diff)
2005-11-20 Paul Jakma <paul.jakma@sun.com>
* ospfd.h: remove the OSPF_ROUTER_ID_UPDATE_DELAY define (struct ospf) remove the router_id timer thread. remove export of ospf_router_id_update_timer. * ospfd.c: (ospf_router_id_update) call ospf_if_update to poke interfaces into action after ID has been configured. (ospf_router_id_update_timer) removed. (ospf_finish_final) t_router_id_update timer is gone. (ospf_network_run) router-id update timer gone. call ospf_router_id_update directly if ID not configured. In the per-iface loop, don't ospf_if_up interfaces if ID is still not configured. The update function will call ospf_if_update anyway. (ospf_if_update) ID update timer is gone. Just return if no ID is set. * ospf_vty.c: (ospf_router_id) call ospf_router_id_update, no timer needed. * ospf_zebra.c: (ospf_router_id_update_zebra) call ospf_router_id_update directly, not via timer.
Diffstat (limited to 'ospfd/ospf_zebra.c')
-rw-r--r--ospfd/ospf_zebra.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 0d98008d..af82e979 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -68,12 +68,10 @@ ospf_router_id_update_zebra (int command, struct zclient *zclient,
router_id_zebra = router_id.u.prefix4;
ospf = ospf_lookup ();
+
if (ospf != NULL)
- {
- if (ospf->t_router_id_update == NULL)
- OSPF_TIMER_ON (ospf->t_router_id_update, ospf_router_id_update_timer,
- OSPF_ROUTER_ID_UPDATE_DELAY);
- }
+ ospf_router_id_update (ospf);
+
return 0;
}