From b29800a676b7c3cf00d8a4086b7783ccb7e2f29f Mon Sep 17 00:00:00 2001 From: paul Date: Sun, 20 Nov 2005 14:50:45 +0000 Subject: 2005-11-20 Paul Jakma * 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. --- ospfd/ospfd.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'ospfd/ospfd.h') diff --git a/ospfd/ospfd.h b/ospfd/ospfd.h index ff27a327..ebacc1b2 100644 --- a/ospfd/ospfd.h +++ b/ospfd/ospfd.h @@ -126,9 +126,6 @@ #define OSPF_DD_FLAG_I 0x04 #define OSPF_DD_FLAG_ALL 0x07 -/* Timer value. */ -#define OSPF_ROUTER_ID_UPDATE_DELAY 1 - #define OSPF_LS_REFRESH_SHIFT (60 * 15) #define OSPF_LS_REFRESH_JITTER 60 @@ -249,7 +246,6 @@ struct ospf int redistribute; /* Num of redistributed protocols. */ /* Threads. */ - struct thread *t_router_id_update; /* Router ID update timer. */ struct thread *t_router_lsa_update; /* router-LSA update timer. */ struct thread *t_abr_task; /* ABR task timer. */ struct thread *t_asbr_check; /* ASBR check timer. */ @@ -555,7 +551,6 @@ extern const char *ospf_redist_string(u_int route_type); extern struct ospf *ospf_lookup (void); extern struct ospf *ospf_get (void); extern void ospf_finish (struct ospf *); -extern int ospf_router_id_update_timer (struct thread *); extern void ospf_router_id_update (struct ospf *ospf); extern int ospf_network_match_iface (struct connected *, struct prefix *); extern int ospf_network_set (struct ospf *, struct prefix_ipv4 *, -- cgit v1.2.1