From a6f79ca57f0b4b296f67c2d063fd85a627b611b8 Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Tue, 28 Nov 2017 17:43:20 +0100 Subject: Timers: Revert temporary names and remove old timer.h --- proto/ospf/iface.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'proto/ospf/iface.c') diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 33ec21fb..29d21a07 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -263,13 +263,13 @@ ospf_iface_down(struct ospf_iface *ifa) ospf_neigh_sm(n, INM_KILLNBR); if (ifa->hello_timer) - tm2_stop(ifa->hello_timer); + tm_stop(ifa->hello_timer); if (ifa->poll_timer) - tm2_stop(ifa->poll_timer); + tm_stop(ifa->poll_timer); if (ifa->wait_timer) - tm2_stop(ifa->wait_timer); + tm_stop(ifa->wait_timer); ospf_flush2_lsa(p, &ifa->link_lsa); ospf_flush2_lsa(p, &ifa->net_lsa); @@ -396,15 +396,15 @@ ospf_iface_sm(struct ospf_iface *ifa, int event) { ospf_iface_chstate(ifa, OSPF_IS_WAITING); if (ifa->wait_timer) - tm2_start(ifa->wait_timer, ifa->waitint S); + tm_start(ifa->wait_timer, ifa->waitint S); } } if (ifa->hello_timer) - tm2_start(ifa->hello_timer, ifa->helloint S); + tm_start(ifa->hello_timer, ifa->helloint S); if (ifa->poll_timer) - tm2_start(ifa->poll_timer, ifa->pollint S); + tm_start(ifa->poll_timer, ifa->pollint S); ospf_send_hello(ifa, OHS_HELLO, NULL); } @@ -494,13 +494,13 @@ ospf_iface_add(struct object_lock *lock) if (! ifa->stub) { - ifa->hello_timer = tm2_new_init(ifa->pool, hello_timer_hook, ifa, ifa->helloint S, 0); + ifa->hello_timer = tm_new_init(ifa->pool, hello_timer_hook, ifa, ifa->helloint S, 0); if (ifa->type == OSPF_IT_NBMA) - ifa->poll_timer = tm2_new_init(ifa->pool, poll_timer_hook, ifa, ifa->pollint S, 0); + ifa->poll_timer = tm_new_init(ifa->pool, poll_timer_hook, ifa, ifa->pollint S, 0); if ((ifa->type == OSPF_IT_BCAST) || (ifa->type == OSPF_IT_NBMA)) - ifa->wait_timer = tm2_new_init(ifa->pool, wait_timer_hook, ifa, 0, 0); + ifa->wait_timer = tm_new_init(ifa->pool, wait_timer_hook, ifa, 0, 0); ifa->flood_queue_size = ifa_flood_queue_size(ifa); ifa->flood_queue = mb_allocz(ifa->pool, ifa->flood_queue_size * sizeof(void *)); @@ -703,7 +703,7 @@ ospf_iface_new_vlink(struct ospf_proto *p, struct ospf_iface_patt *ip) add_tail(&p->iface_list, NODE ifa); - ifa->hello_timer = tm2_new_init(ifa->pool, hello_timer_hook, ifa, ifa->helloint S, 0); + ifa->hello_timer = tm_new_init(ifa->pool, hello_timer_hook, ifa, ifa->helloint S, 0); ifa->flood_queue_size = ifa_flood_queue_size(ifa); ifa->flood_queue = mb_allocz(ifa->pool, ifa->flood_queue_size * sizeof(void *)); @@ -717,8 +717,8 @@ ospf_iface_change_timer(timer *tm, uint val) tm->recurrent = val S; - if (tm2_active(tm)) - tm2_start(tm, val S); + if (tm_active(tm)) + tm_start(tm, val S); } static inline void @@ -801,8 +801,8 @@ ospf_iface_reconfigure(struct ospf_iface *ifa, struct ospf_iface_patt *new) ifname, ifa->waitint, new->waitint); ifa->waitint = new->waitint; - if (ifa->wait_timer && tm2_active(ifa->wait_timer)) - tm2_start(ifa->wait_timer, ifa->waitint S); + if (ifa->wait_timer && tm_active(ifa->wait_timer)) + tm_start(ifa->wait_timer, ifa->waitint S); } /* DEAD TIMER */ -- cgit v1.2.3