From: Mark Stapp Date: Tue, 29 Apr 2025 18:03:41 +0000 (-0400) Subject: rip*,ospf*,pimd: Remove use of the EVENT_OFF macro X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f11dec0ecf7a6280eddeb2e3a604ca542d7f407c;p=mirror%2Ffrr.git rip*,ospf*,pimd: Remove use of the EVENT_OFF macro Replace use of the macro with the cancel function. Signed-off-by: Mark Stapp --- diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index f512e60ef2..bbe9de60fc 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -435,8 +435,8 @@ void ospf6_area_disable(struct ospf6_area *oa) ospf6_spf_table_finish(oa->spf_table); ospf6_route_remove_all(oa->route_table); - EVENT_OFF(oa->thread_router_lsa); - EVENT_OFF(oa->thread_intra_prefix_lsa); + event_cancel(&oa->thread_router_lsa); + event_cancel(&oa->thread_intra_prefix_lsa); } diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index df2758b081..6e46782646 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -3117,7 +3117,7 @@ static void ospf6_aggr_handle_external_info(void *data) if (IS_OSPF6_DEBUG_AGGR) zlog_debug("%s: LSA found, refresh it", __func__); - EVENT_OFF(lsa->refresh); + event_cancel(&lsa->refresh); event_add_event(master, ospf6_lsa_refresh, lsa, 0, &lsa->refresh); return; @@ -3319,7 +3319,7 @@ static void ospf6_handle_exnl_rt_after_aggr_del(struct ospf6 *ospf6, lsa = ospf6_find_external_lsa(ospf6, &rt->prefix); if (lsa) { - EVENT_OFF(lsa->refresh); + event_cancel(&lsa->refresh); event_add_event(master, ospf6_lsa_refresh, lsa, 0, &lsa->refresh); } else { @@ -3468,7 +3468,7 @@ ospf6_start_asbr_summary_delay_timer(struct ospf6 *ospf6, if (IS_OSPF6_DEBUG_AGGR) zlog_debug("%s, Restarting Aggregator delay timer.", __func__); - EVENT_OFF(ospf6->t_external_aggr); + event_cancel(&ospf6->t_external_aggr); } } diff --git a/ospf6d/ospf6_bfd.c b/ospf6d/ospf6_bfd.c index 0b00558572..bc726c75f6 100644 --- a/ospf6d/ospf6_bfd.c +++ b/ospf6d/ospf6_bfd.c @@ -103,7 +103,7 @@ static void ospf6_bfd_callback(struct bfd_session_params *bsp, if (bss->state == BFD_STATUS_DOWN && bss->previous_state == BFD_STATUS_UP) { - EVENT_OFF(on->inactivity_timer); + event_cancel(&on->inactivity_timer); event_add_event(master, inactivity_timer, on, 0, NULL); } } diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c index 261eed30ea..738c5a414a 100644 --- a/ospf6d/ospf6_flood.c +++ b/ospf6d/ospf6_flood.c @@ -104,7 +104,7 @@ void ospf6_lsa_originate(struct ospf6 *ospf6, struct ospf6_lsa *lsa) lsdb_self = ospf6_get_scoped_lsdb_self(lsa); ospf6_lsdb_add(ospf6_lsa_copy(lsa), lsdb_self); - EVENT_OFF(lsa->refresh); + event_cancel(&lsa->refresh); event_add_timer(master, ospf6_lsa_refresh, lsa, OSPF_LS_REFRESH_TIME, &lsa->refresh); @@ -169,8 +169,8 @@ void ospf6_lsa_purge(struct ospf6_lsa *lsa) self = ospf6_lsdb_lookup(lsa->header->type, lsa->header->id, lsa->header->adv_router, lsdb_self); if (self) { - EVENT_OFF(self->expire); - EVENT_OFF(self->refresh); + event_cancel(&self->expire); + event_cancel(&self->refresh); ospf6_lsdb_remove(self, lsdb_self); } @@ -251,8 +251,8 @@ void ospf6_install_lsa(struct ospf6_lsa *lsa) lsa->name); lsa->external_lsa_id = old->external_lsa_id; } - EVENT_OFF(old->expire); - EVENT_OFF(old->refresh); + event_cancel(&old->expire); + event_cancel(&old->refresh); ospf6_flood_clear(old); } @@ -524,7 +524,7 @@ void ospf6_flood_interface(struct ospf6_neighbor *from, struct ospf6_lsa *lsa, } else { /* reschedule retransmissions to all neighbors */ for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) { - EVENT_OFF(on->thread_send_lsupdate); + event_cancel(&on->thread_send_lsupdate); event_add_event(master, ospf6_lsupdate_send_neighbor, on, 0, &on->thread_send_lsupdate); } diff --git a/ospf6d/ospf6_gr.c b/ospf6d/ospf6_gr.c index 27b8df0828..a20b059908 100644 --- a/ospf6d/ospf6_gr.c +++ b/ospf6d/ospf6_gr.c @@ -172,7 +172,7 @@ static void ospf6_gr_restart_exit(struct ospf6 *ospf6, const char *reason) ospf6->gr_info.finishing_restart = true; XFREE(MTYPE_TMP, ospf6->gr_info.exit_reason); ospf6->gr_info.exit_reason = XSTRDUP(MTYPE_TMP, reason); - EVENT_OFF(ospf6->gr_info.t_grace_period); + event_cancel(&ospf6->gr_info.t_grace_period); for (ALL_LIST_ELEMENTS_RO(ospf6->area_list, onode, area)) { struct ospf6_interface *oi; @@ -194,7 +194,7 @@ static void ospf6_gr_restart_exit(struct ospf6 *ospf6, const char *reason) /* Disable hello delay. */ if (oi->gr.hello_delay.t_grace_send) { oi->gr.hello_delay.elapsed_seconds = 0; - EVENT_OFF(oi->gr.hello_delay.t_grace_send); + event_cancel(&oi->gr.hello_delay.t_grace_send); event_add_event(master, ospf6_hello_send, oi, 0, &oi->thread_send_hello); } diff --git a/ospf6d/ospf6_gr_helper.c b/ospf6d/ospf6_gr_helper.c index da8b829cf1..a08c598df0 100644 --- a/ospf6d/ospf6_gr_helper.c +++ b/ospf6d/ospf6_gr_helper.c @@ -383,7 +383,7 @@ int ospf6_process_grace_lsa(struct ospf6 *ospf6, struct ospf6_lsa *lsa, } if (OSPF6_GR_IS_ACTIVE_HELPER(restarter)) { - EVENT_OFF(restarter->gr_helper_info.t_grace_timer); + event_cancel(&restarter->gr_helper_info.t_grace_timer); if (ospf6->ospf6_helper_cfg.active_restarter_cnt > 0) ospf6->ospf6_helper_cfg.active_restarter_cnt--; @@ -471,7 +471,7 @@ void ospf6_gr_helper_exit(struct ospf6_neighbor *nbr, * expiry, stop the grace timer. */ if (reason != OSPF6_GR_HELPER_GRACE_TIMEOUT) - EVENT_OFF(nbr->gr_helper_info.t_grace_timer); + event_cancel(&nbr->gr_helper_info.t_grace_timer); if (ospf6->ospf6_helper_cfg.active_restarter_cnt <= 0) { zlog_err( diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 1022101eb3..e79bc34983 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -272,11 +272,11 @@ void ospf6_interface_delete(struct ospf6_interface *oi) list_delete(&oi->neighbor_list); - EVENT_OFF(oi->thread_send_hello); - EVENT_OFF(oi->thread_send_lsupdate); - EVENT_OFF(oi->thread_send_lsack); - EVENT_OFF(oi->thread_sso); - EVENT_OFF(oi->thread_wait_timer); + event_cancel(&oi->thread_send_hello); + event_cancel(&oi->thread_send_lsupdate); + event_cancel(&oi->thread_send_lsack); + event_cancel(&oi->thread_sso); + event_cancel(&oi->thread_wait_timer); ospf6_lsdb_remove_all(oi->lsdb); ospf6_lsdb_remove_all(oi->lsupdate_list); @@ -326,19 +326,19 @@ void ospf6_interface_disable(struct ospf6_interface *oi) ospf6_lsdb_remove_all(oi->lsupdate_list); ospf6_lsdb_remove_all(oi->lsack_list); - EVENT_OFF(oi->thread_send_hello); - EVENT_OFF(oi->thread_send_lsupdate); - EVENT_OFF(oi->thread_send_lsack); - EVENT_OFF(oi->thread_sso); + event_cancel(&oi->thread_send_hello); + event_cancel(&oi->thread_send_lsupdate); + event_cancel(&oi->thread_send_lsack); + event_cancel(&oi->thread_sso); - EVENT_OFF(oi->thread_network_lsa); - EVENT_OFF(oi->thread_link_lsa); - EVENT_OFF(oi->thread_intra_prefix_lsa); - EVENT_OFF(oi->thread_as_extern_lsa); - EVENT_OFF(oi->thread_wait_timer); + event_cancel(&oi->thread_network_lsa); + event_cancel(&oi->thread_link_lsa); + event_cancel(&oi->thread_intra_prefix_lsa); + event_cancel(&oi->thread_as_extern_lsa); + event_cancel(&oi->thread_wait_timer); oi->gr.hello_delay.elapsed_seconds = 0; - EVENT_OFF(oi->gr.hello_delay.t_grace_send); + event_cancel(&oi->gr.hello_delay.t_grace_send); } static struct in6_addr * @@ -944,10 +944,10 @@ void interface_down(struct event *thread) oi->interface->name); /* Stop Hellos */ - EVENT_OFF(oi->thread_send_hello); + event_cancel(&oi->thread_send_hello); /* Stop trying to set socket options. */ - EVENT_OFF(oi->thread_sso); + event_cancel(&oi->thread_sso); /* Cease the HELPER role for all the neighbours * of this interface. @@ -1948,7 +1948,7 @@ DEFUN (ipv6_ospf6_ifmtu, /* re-establish adjacencies */ for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) { - EVENT_OFF(on->inactivity_timer); + event_cancel(&on->inactivity_timer); event_add_event(master, inactivity_timer, on, 0, NULL); } @@ -1994,7 +1994,7 @@ DEFUN (no_ipv6_ospf6_ifmtu, /* re-establish adjacencies */ for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) { - EVENT_OFF(on->inactivity_timer); + event_cancel(&on->inactivity_timer); event_add_event(master, inactivity_timer, on, 0, NULL); } @@ -2178,7 +2178,7 @@ DEFUN (ipv6_ospf6_hellointerval, * If the thread is scheduled, send the new hello now. */ if (event_is_scheduled(oi->thread_send_hello)) { - EVENT_OFF(oi->thread_send_hello); + event_cancel(&oi->thread_send_hello); event_add_timer(master, ospf6_hello_send, oi, 0, &oi->thread_send_hello); @@ -2270,7 +2270,7 @@ DEFPY(no_ipv6_ospf6_gr_hdelay, oi->gr.hello_delay.interval = OSPF_HELLO_DELAY_DEFAULT; oi->gr.hello_delay.elapsed_seconds = 0; - EVENT_OFF(oi->gr.hello_delay.t_grace_send); + event_cancel(&oi->gr.hello_delay.t_grace_send); return CMD_SUCCESS; } @@ -2439,11 +2439,11 @@ DEFUN (ipv6_ospf6_passive, assert(oi); SET_FLAG(oi->flag, OSPF6_INTERFACE_PASSIVE); - EVENT_OFF(oi->thread_send_hello); - EVENT_OFF(oi->thread_sso); + event_cancel(&oi->thread_send_hello); + event_cancel(&oi->thread_sso); for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) { - EVENT_OFF(on->inactivity_timer); + event_cancel(&on->inactivity_timer); event_add_event(master, inactivity_timer, on, 0, NULL); } @@ -2469,8 +2469,8 @@ DEFUN (no_ipv6_ospf6_passive, assert(oi); UNSET_FLAG(oi->flag, OSPF6_INTERFACE_PASSIVE); - EVENT_OFF(oi->thread_send_hello); - EVENT_OFF(oi->thread_sso); + event_cancel(&oi->thread_send_hello); + event_cancel(&oi->thread_sso); /* don't send hellos over loopback interface */ if (!if_is_loopback(oi->interface)) diff --git a/ospf6d/ospf6_intra.h b/ospf6d/ospf6_intra.h index fafa6d1282..17074e22c1 100644 --- a/ospf6d/ospf6_intra.h +++ b/ospf6d/ospf6_intra.h @@ -142,7 +142,7 @@ enum stub_router_mode { #define OSPF6_NETWORK_LSA_EXECUTE(oi) \ do { \ - EVENT_OFF((oi)->thread_network_lsa); \ + event_cancel(&(oi)->thread_network_lsa); \ event_execute(master, ospf6_network_lsa_originate, oi, 0, \ NULL); \ } while (0) @@ -156,7 +156,7 @@ enum stub_router_mode { #define OSPF6_INTRA_PREFIX_LSA_EXECUTE_TRANSIT(oi) \ do { \ - EVENT_OFF((oi)->thread_intra_prefix_lsa); \ + event_cancel(&(oi)->thread_intra_prefix_lsa); \ event_execute(master, \ ospf6_intra_prefix_lsa_originate_transit, oi, \ 0, NULL); \ @@ -164,7 +164,7 @@ enum stub_router_mode { #define OSPF6_AS_EXTERN_LSA_EXECUTE(oi) \ do { \ - EVENT_OFF((oi)->thread_as_extern_lsa); \ + event_cancel(&(oi)->thread_as_extern_lsa); \ event_execute(master, ospf6_orig_as_external_lsa, oi, 0, NULL);\ } while (0) diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c index 622e5f9e0f..95ea51fd89 100644 --- a/ospf6d/ospf6_lsa.c +++ b/ospf6d/ospf6_lsa.c @@ -379,8 +379,8 @@ void ospf6_lsa_premature_aging(struct ospf6_lsa *lsa) if (IS_OSPF6_DEBUG_LSA_TYPE(lsa->header->type)) zlog_debug("LSA: Premature aging: %s", lsa->name); - EVENT_OFF(lsa->expire); - EVENT_OFF(lsa->refresh); + event_cancel(&lsa->expire); + event_cancel(&lsa->refresh); /* * We clear the LSA from the neighbor retx lists now because it @@ -837,8 +837,8 @@ void ospf6_lsa_delete(struct ospf6_lsa *lsa) assert(lsa->lock == 0); /* cancel threads */ - EVENT_OFF(lsa->expire); - EVENT_OFF(lsa->refresh); + event_cancel(&lsa->expire); + event_cancel(&lsa->refresh); /* do free */ XFREE(MTYPE_OSPF6_LSA_HEADER, lsa->header); diff --git a/ospf6d/ospf6_lsdb.c b/ospf6d/ospf6_lsdb.c index 3215d51a7a..59d1989e4b 100644 --- a/ospf6d/ospf6_lsdb.c +++ b/ospf6d/ospf6_lsdb.c @@ -396,7 +396,7 @@ int ospf6_lsdb_maxage_remover(struct ospf6_lsdb *lsdb) htonl(OSPF_MAX_SEQUENCE_NUMBER + 1); ospf6_lsa_checksum(lsa->header); - EVENT_OFF(lsa->refresh); + event_cancel(&lsa->refresh); event_execute(master, ospf6_lsa_refresh, lsa, 0, NULL); } else { if (IS_OSPF6_DEBUG_LSA_TYPE(lsa->header->type)) diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index ae61e8b35f..0696dfab24 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -214,7 +214,7 @@ static void ospf6_config_start(void) { if (IS_OSPF6_DEBUG_EVENT) zlog_debug("ospf6d config start received"); - EVENT_OFF(t_ospf6_cfg); + event_cancel(&t_ospf6_cfg); event_add_timer(master, ospf6_config_finish, NULL, OSPF6_PRE_CONFIG_MAX_WAIT_SECONDS, &t_ospf6_cfg); } @@ -224,7 +224,7 @@ static void ospf6_config_end(void) if (IS_OSPF6_DEBUG_EVENT) zlog_debug("ospf6d config end received"); - EVENT_OFF(t_ospf6_cfg); + event_cancel(&t_ospf6_cfg); } /* Main routine of ospf6d. Treatment of argument and starting ospf finite diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c index 33d15e7243..f92053aebd 100644 --- a/ospf6d/ospf6_message.c +++ b/ospf6d/ospf6_message.c @@ -822,7 +822,7 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh, event_add_event(master, ospf6_lsreq_send, on, 0, &on->thread_send_lsreq); - EVENT_OFF(on->thread_send_dbdesc); + event_cancel(&on->thread_send_dbdesc); /* More bit check */ if (!CHECK_FLAG(dbdesc->bits, OSPF6_DBDESC_MBIT) @@ -907,7 +907,7 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, if (IS_OSPF6_DEBUG_MESSAGE(oh->type, RECV_HDR)) zlog_debug( "Duplicated dbdesc causes retransmit"); - EVENT_OFF(on->thread_send_dbdesc); + event_cancel(&on->thread_send_dbdesc); event_add_event(master, ospf6_dbdesc_send, on, 0, &on->thread_send_dbdesc); return; @@ -960,7 +960,7 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, if (IS_OSPF6_DEBUG_MESSAGE(oh->type, RECV_HDR)) zlog_debug( "Duplicated dbdesc causes retransmit"); - EVENT_OFF(on->thread_send_dbdesc); + event_cancel(&on->thread_send_dbdesc); event_add_event(master, ospf6_dbdesc_send, on, 0, &on->thread_send_dbdesc); return; @@ -1034,7 +1034,7 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh, event_add_event(master, ospf6_lsreq_send, on, 0, &on->thread_send_lsreq); - EVENT_OFF(on->thread_send_dbdesc); + event_cancel(&on->thread_send_dbdesc); event_add_event(master, ospf6_dbdesc_send_newone, on, 0, &on->thread_send_dbdesc); @@ -1168,7 +1168,7 @@ static void ospf6_lsreq_recv(struct in6_addr *src, struct in6_addr *dst, assert(p == OSPF6_MESSAGE_END(oh)); /* schedule send lsupdate */ - EVENT_OFF(on->thread_send_lsupdate); + event_cancel(&on->thread_send_lsupdate); event_add_event(master, ospf6_lsupdate_send_neighbor, on, 0, &on->thread_send_lsupdate); } @@ -3000,7 +3000,7 @@ static uint16_t ospf6_make_lsack_interface(struct ospf6_interface *oi, > ospf6_packet_max(oi)) { /* if we run out of packet size/space here, better to try again soon. */ - EVENT_OFF(oi->thread_send_lsack); + event_cancel(&oi->thread_send_lsack); event_add_event(master, ospf6_lsack_send_interface, oi, 0, &oi->thread_send_lsack); diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c index acf15da4c3..af5bf34c84 100644 --- a/ospf6d/ospf6_neighbor.c +++ b/ospf6d/ospf6_neighbor.c @@ -178,19 +178,19 @@ void ospf6_neighbor_delete(struct ospf6_neighbor *on) ospf6_lsdb_delete(on->lsupdate_list); ospf6_lsdb_delete(on->lsack_list); - EVENT_OFF(on->inactivity_timer); + event_cancel(&on->inactivity_timer); - EVENT_OFF(on->last_dbdesc_release_timer); + event_cancel(&on->last_dbdesc_release_timer); - EVENT_OFF(on->thread_send_dbdesc); - EVENT_OFF(on->thread_send_lsreq); - EVENT_OFF(on->thread_send_lsupdate); - EVENT_OFF(on->thread_send_lsack); - EVENT_OFF(on->thread_exchange_done); - EVENT_OFF(on->thread_adj_ok); - EVENT_OFF(on->event_loading_done); + event_cancel(&on->thread_send_dbdesc); + event_cancel(&on->thread_send_lsreq); + event_cancel(&on->thread_send_lsupdate); + event_cancel(&on->thread_send_lsack); + event_cancel(&on->thread_exchange_done); + event_cancel(&on->thread_adj_ok); + event_cancel(&on->event_loading_done); - EVENT_OFF(on->gr_helper_info.t_grace_timer); + event_cancel(&on->gr_helper_info.t_grace_timer); bfd_sess_free(&on->bfd_session); XFREE(MTYPE_OSPF6_NEIGHBOR, on); @@ -312,7 +312,7 @@ void hello_received(struct event *thread) zlog_debug("Neighbor Event %s: *HelloReceived*", on->name); /* reset Inactivity Timer */ - EVENT_OFF(on->inactivity_timer); + event_cancel(&on->inactivity_timer); event_add_timer(master, inactivity_timer, on, on->ospf6_if->dead_interval, &on->inactivity_timer); @@ -348,7 +348,7 @@ void twoway_received(struct event *thread) SET_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MBIT); SET_FLAG(on->dbdesc_bits, OSPF6_DBDESC_IBIT); - EVENT_OFF(on->thread_send_dbdesc); + event_cancel(&on->thread_send_dbdesc); event_add_event(master, ospf6_dbdesc_send, on, 0, &on->thread_send_dbdesc); } @@ -423,12 +423,12 @@ void exchange_done(struct event *thread) if (IS_OSPF6_DEBUG_NEIGHBOR(EVENT)) zlog_debug("Neighbor Event %s: *ExchangeDone*", on->name); - EVENT_OFF(on->thread_send_dbdesc); + event_cancel(&on->thread_send_dbdesc); ospf6_lsdb_remove_all(on->dbdesc_list); /* RFC 2328 (10.8): Release the last dbdesc after dead_interval */ if (!CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MSBIT)) { - EVENT_OFF(on->last_dbdesc_release_timer); + event_cancel(&on->last_dbdesc_release_timer); event_add_timer(master, ospf6_neighbor_last_dbdesc_release, on, on->ospf6_if->dead_interval, &on->last_dbdesc_release_timer); @@ -459,7 +459,7 @@ void ospf6_check_nbr_loading(struct ospf6_neighbor *on) event_add_event(master, loading_done, on, 0, &on->event_loading_done); else if (on->last_ls_req == NULL) { - EVENT_OFF(on->thread_send_lsreq); + event_cancel(&on->thread_send_lsreq); event_add_event(master, ospf6_lsreq_send, on, 0, &on->thread_send_lsreq); } @@ -502,7 +502,7 @@ void adj_ok(struct event *thread) SET_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MBIT); SET_FLAG(on->dbdesc_bits, OSPF6_DBDESC_IBIT); - EVENT_OFF(on->thread_send_dbdesc); + event_cancel(&on->thread_send_dbdesc); event_add_event(master, ospf6_dbdesc_send, on, 0, &on->thread_send_dbdesc); @@ -534,7 +534,7 @@ void seqnumber_mismatch(struct event *thread) ospf6_neighbor_clear_ls_lists(on); - EVENT_OFF(on->thread_send_dbdesc); + event_cancel(&on->thread_send_dbdesc); on->dbdesc_seqnum++; /* Incr seqnum as per RFC2328, sec 10.3 */ event_add_event(master, ospf6_dbdesc_send, on, 0, @@ -562,7 +562,7 @@ void bad_lsreq(struct event *thread) ospf6_neighbor_clear_ls_lists(on); - EVENT_OFF(on->thread_send_dbdesc); + event_cancel(&on->thread_send_dbdesc); on->dbdesc_seqnum++; /* Incr seqnum as per RFC2328, sec 10.3 */ event_add_event(master, ospf6_dbdesc_send, on, 0, @@ -588,12 +588,12 @@ void oneway_received(struct event *thread) ospf6_neighbor_clear_ls_lists(on); - EVENT_OFF(on->thread_send_dbdesc); - EVENT_OFF(on->thread_send_lsreq); - EVENT_OFF(on->thread_send_lsupdate); - EVENT_OFF(on->thread_send_lsack); - EVENT_OFF(on->thread_exchange_done); - EVENT_OFF(on->thread_adj_ok); + event_cancel(&on->thread_send_dbdesc); + event_cancel(&on->thread_send_lsreq); + event_cancel(&on->thread_send_lsupdate); + event_cancel(&on->thread_send_lsack); + event_cancel(&on->thread_exchange_done); + event_cancel(&on->thread_adj_ok); } void inactivity_timer(struct event *thread) @@ -681,7 +681,7 @@ ospf6_if_p2xp_get(struct ospf6_interface *oi, const struct in6_addr *addr) static void ospf6_if_p2xp_destroy(struct ospf6_if_p2xp_neighcfg *p2xp_cfg) { - EVENT_OFF(p2xp_cfg->t_unicast_hello); + event_cancel(&p2xp_cfg->t_unicast_hello); ospf6_if_p2xp_neighcfgs_del(&p2xp_cfg->ospf6_if->p2xp_neighs, p2xp_cfg); XFREE(MTYPE_OSPF6_NEIGHBOR_P2XP_CFG, p2xp_cfg); @@ -798,7 +798,7 @@ static void p2xp_unicast_hello_sched(struct ospf6_if_p2xp_neighcfg *p2xp_cfg) (p2xp_cfg->ospf6_if->state != OSPF6_INTERFACE_POINTTOMULTIPOINT && p2xp_cfg->ospf6_if->state != OSPF6_INTERFACE_POINTTOPOINT)) /* state check covers DOWN state too */ - EVENT_OFF(p2xp_cfg->t_unicast_hello); + event_cancel(&p2xp_cfg->t_unicast_hello); else event_add_timer(master, p2xp_unicast_hello_send, p2xp_cfg, p2xp_cfg->poll_interval, diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c index 8a5de468c9..96908b6644 100644 --- a/ospf6d/ospf6_nssa.c +++ b/ospf6d/ospf6_nssa.c @@ -1079,7 +1079,7 @@ static void ospf6_ase_lsa_refresh(struct ospf6 *o) route->path.origin.id, o->router_id, o->lsdb); if (old) { - EVENT_OFF(old->refresh); + event_cancel(&old->refresh); event_add_event(master, ospf6_lsa_refresh, old, 0, &old->refresh); } else { @@ -1154,7 +1154,7 @@ void ospf6_area_nssa_update(struct ospf6_area *area) lsa)) { if (IS_OSPF6_DEBUG_NSSA) ospf6_lsa_header_print(lsa); - EVENT_OFF(lsa->refresh); + event_cancel(&lsa->refresh); event_add_event(master, ospf6_lsa_refresh, lsa, 0, &lsa->refresh); } diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 5f2c5a6c47..08d72c0c60 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -722,7 +722,7 @@ void ospf6_spf_schedule(struct ospf6 *ospf6, unsigned int reason) if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF(TIME)) zlog_debug("SPF: Rescheduling in %ld msec", delay); - EVENT_OFF(ospf6->t_spf_calc); + event_cancel(&ospf6->t_spf_calc); event_add_timer_msec(master, ospf6_spf_calculation_thread, ospf6, delay, &ospf6->t_spf_calc); } diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 9755cc44cc..8cd2512d1a 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -554,15 +554,15 @@ static void ospf6_disable(struct ospf6 *o) ospf6_route_remove_all(o->route_table); ospf6_route_remove_all(o->brouter_table); - EVENT_OFF(o->maxage_remover); - EVENT_OFF(o->t_spf_calc); - EVENT_OFF(o->t_ase_calc); - EVENT_OFF(o->t_distribute_update); - EVENT_OFF(o->t_ospf6_receive); - EVENT_OFF(o->t_external_aggr); - EVENT_OFF(o->gr_info.t_grace_period); - EVENT_OFF(o->t_write); - EVENT_OFF(o->t_abr_task); + event_cancel(&o->maxage_remover); + event_cancel(&o->t_spf_calc); + event_cancel(&o->t_ase_calc); + event_cancel(&o->t_distribute_update); + event_cancel(&o->t_ospf6_receive); + event_cancel(&o->t_external_aggr); + event_cancel(&o->gr_info.t_grace_period); + event_cancel(&o->t_write); + event_cancel(&o->t_abr_task); } } diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c index eed1bfcb30..cecdb1deaf 100644 --- a/ospfd/ospf_abr.c +++ b/ospfd/ospf_abr.c @@ -1739,7 +1739,7 @@ static void ospf_abr_announce_non_dna_routers(struct event *thread) struct listnode *node; struct ospf *ospf = EVENT_ARG(thread); - EVENT_OFF(ospf->t_abr_fr); + event_cancel(&ospf->t_abr_fr); if (!IS_OSPF_ABR(ospf)) return; diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c index 6582db5390..0434b67bfc 100644 --- a/ospfd/ospf_apiserver.c +++ b/ospfd/ospf_apiserver.c @@ -310,12 +310,12 @@ void ospf_apiserver_free(struct ospf_apiserver *apiserv) struct listnode *node; /* Cancel read and write threads. */ - EVENT_OFF(apiserv->t_sync_read); + event_cancel(&apiserv->t_sync_read); #ifdef USE_ASYNC_READ - EVENT_OFF(apiserv->t_async_read); + event_cancel(&apiserv->t_async_read); #endif /* USE_ASYNC_READ */ - EVENT_OFF(apiserv->t_sync_write); - EVENT_OFF(apiserv->t_async_write); + event_cancel(&apiserv->t_sync_write); + event_cancel(&apiserv->t_async_write); /* Unregister all opaque types that application registered and flush opaque LSAs if still in LSDB. */ diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c index 978a6fcc13..c21c62cfca 100644 --- a/ospfd/ospf_asbr.c +++ b/ospfd/ospf_asbr.c @@ -1157,7 +1157,7 @@ static void ospf_external_aggr_timer(struct ospf *ospf, zlog_debug( "%s, Restarting Aggregator delay timer.", __func__); - EVENT_OFF(ospf->t_external_aggr); + event_cancel(&ospf->t_external_aggr); } } diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c index 6184d1352c..6cb3d5ff4a 100644 --- a/ospfd/ospf_flood.c +++ b/ospfd/ospf_flood.c @@ -1237,7 +1237,7 @@ void ospf_ls_retransmit_set_timer(struct ospf_neighbor *nbr) struct ospf_lsa_list_entry *ls_rxmt_list_entry; if (nbr->t_ls_rxmt) - EVENT_OFF(nbr->t_ls_rxmt); + event_cancel(&nbr->t_ls_rxmt); ls_rxmt_list_entry = ospf_lsa_list_first(&nbr->ls_rxmt_list); if (ls_rxmt_list_entry) { diff --git a/ospfd/ospf_gr.c b/ospfd/ospf_gr.c index 0a4d579fc9..6ad3e708e9 100644 --- a/ospfd/ospf_gr.c +++ b/ospfd/ospf_gr.c @@ -225,7 +225,7 @@ static void ospf_gr_restart_exit(struct ospf *ospf, const char *reason) zlog_debug("GR: exiting graceful restart: %s", reason); ospf->gr_info.restart_in_progress = false; - EVENT_OFF(ospf->gr_info.t_grace_period); + event_cancel(&ospf->gr_info.t_grace_period); for (ALL_LIST_ELEMENTS_RO(ospf->areas, onode, area)) { struct ospf_interface *oi; @@ -241,7 +241,7 @@ static void ospf_gr_restart_exit(struct ospf *ospf, const char *reason) /* Disable hello delay. */ if (oi->gr.hello_delay.t_grace_send) { oi->gr.hello_delay.elapsed_seconds = 0; - EVENT_OFF(oi->gr.hello_delay.t_grace_send); + event_cancel(&oi->gr.hello_delay.t_grace_send); OSPF_ISM_TIMER_MSEC_ON(oi->t_hello, ospf_hello_timer, 1); } diff --git a/ospfd/ospf_gr_helper.c b/ospfd/ospf_gr_helper.c index b97b6802b2..f66398db05 100644 --- a/ospfd/ospf_gr_helper.c +++ b/ospfd/ospf_gr_helper.c @@ -500,7 +500,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa, if (OSPF_GR_IS_ACTIVE_HELPER(restarter)) { if (restarter->gr_helper_info.t_grace_timer) - EVENT_OFF(restarter->gr_helper_info.t_grace_timer); + event_cancel(&restarter->gr_helper_info.t_grace_timer); if (ospf->active_restarter_cnt > 0) ospf->active_restarter_cnt--; @@ -699,7 +699,7 @@ void ospf_gr_helper_exit(struct ospf_neighbor *nbr, * expiry, stop the grace timer. */ if (reason != OSPF_GR_HELPER_GRACE_TIMEOUT) - EVENT_OFF(nbr->gr_helper_info.t_grace_timer); + event_cancel(&nbr->gr_helper_info.t_grace_timer); /* check exit triggered due to successful completion * of graceful restart. diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index c4210eb70c..2bbd650819 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -336,7 +336,7 @@ void ospf_if_cleanup(struct ospf_interface *oi) /* oi->nbrs and oi->nbr_nbma should be deleted on InterfaceDown event */ /* delete all static neighbors attached to this interface */ for (ALL_LIST_ELEMENTS(oi->nbr_nbma, node, nnode, nbr_nbma)) { - EVENT_OFF(nbr_nbma->t_poll); + event_cancel(&nbr_nbma->t_poll); if (nbr_nbma->nbr) { nbr_nbma->nbr->nbr_nbma = NULL; @@ -526,7 +526,7 @@ void ospf_interface_fifo_flush(struct ospf_interface *oi) if (oi->on_write_q) { listnode_delete(ospf->oi_write_q, oi); if (list_isempty(ospf->oi_write_q)) - EVENT_OFF(ospf->t_write); + event_cancel(&ospf->t_write); oi->on_write_q = 0; } } @@ -1576,7 +1576,7 @@ void ospf_reset_hello_timer(struct interface *ifp, struct in_addr addr, ospf_hello_send(oi); /* Restart hello timer for this interface */ - EVENT_OFF(oi->t_hello); + event_cancel(&oi->t_hello); OSPF_HELLO_TIMER_ON(oi); } @@ -1600,7 +1600,7 @@ void ospf_reset_hello_timer(struct interface *ifp, struct in_addr addr, ospf_hello_send(oi); /* Restart the hello timer. */ - EVENT_OFF(oi->t_hello); + event_cancel(&oi->t_hello); OSPF_HELLO_TIMER_ON(oi); } } diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c index 377e7a6bcc..f1e8fe311d 100644 --- a/ospfd/ospf_ism.c +++ b/ospfd/ospf_ism.c @@ -283,18 +283,18 @@ static void ism_timer_set(struct ospf_interface *oi) interface parameters must be set to initial values, and timers are reset also. */ - EVENT_OFF(oi->t_hello); - EVENT_OFF(oi->t_wait); - EVENT_OFF(oi->t_ls_ack_delayed); - EVENT_OFF(oi->gr.hello_delay.t_grace_send); + event_cancel(&oi->t_hello); + event_cancel(&oi->t_wait); + event_cancel(&oi->t_ls_ack_delayed); + event_cancel(&oi->gr.hello_delay.t_grace_send); break; case ISM_Loopback: /* In this state, the interface may be looped back and will be unavailable for regular data traffic. */ - EVENT_OFF(oi->t_hello); - EVENT_OFF(oi->t_wait); - EVENT_OFF(oi->t_ls_ack_delayed); - EVENT_OFF(oi->gr.hello_delay.t_grace_send); + event_cancel(&oi->t_hello); + event_cancel(&oi->t_wait); + event_cancel(&oi->t_ls_ack_delayed); + event_cancel(&oi->gr.hello_delay.t_grace_send); break; case ISM_Waiting: /* The router is trying to determine the identity of DRouter and @@ -304,7 +304,7 @@ static void ism_timer_set(struct ospf_interface *oi) OSPF_ISM_TIMER_MSEC_ON(oi->t_hello, ospf_hello_timer, 1); OSPF_ISM_TIMER_ON(oi->t_wait, ospf_wait_timer, OSPF_IF_PARAM(oi, v_wait)); - EVENT_OFF(oi->t_ls_ack_delayed); + event_cancel(&oi->t_ls_ack_delayed); break; case ISM_PointToPoint: /* The interface connects to a physical Point-to-point network @@ -313,7 +313,7 @@ static void ism_timer_set(struct ospf_interface *oi) neighboring router. Hello packets are also sent. */ /* send first hello immediately */ OSPF_ISM_TIMER_MSEC_ON(oi->t_hello, ospf_hello_timer, 1); - EVENT_OFF(oi->t_wait); + event_cancel(&oi->t_wait); break; case ISM_DROther: /* The network type of the interface is broadcast or NBMA @@ -321,21 +321,21 @@ static void ism_timer_set(struct ospf_interface *oi) and the router itself is neither Designated Router nor Backup Designated Router. */ OSPF_HELLO_TIMER_ON(oi); - EVENT_OFF(oi->t_wait); + event_cancel(&oi->t_wait); break; case ISM_Backup: /* The network type of the interface is broadcast os NBMA network, and the router is Backup Designated Router. */ OSPF_HELLO_TIMER_ON(oi); - EVENT_OFF(oi->t_wait); + event_cancel(&oi->t_wait); break; case ISM_DR: /* The network type of the interface is broadcast or NBMA network, and the router is Designated Router. */ OSPF_HELLO_TIMER_ON(oi); - EVENT_OFF(oi->t_wait); + event_cancel(&oi->t_wait); break; } } diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c index 99f81f5663..8a5f3f0094 100644 --- a/ospfd/ospf_ldp_sync.c +++ b/ospfd/ospf_ldp_sync.c @@ -188,7 +188,7 @@ void ospf_ldp_sync_if_complete(struct interface *ifp) if (ldp_sync_info && ldp_sync_info->enabled == LDP_IGP_SYNC_ENABLED) { if (ldp_sync_info->state == LDP_IGP_SYNC_STATE_REQUIRED_NOT_UP) ldp_sync_info->state = LDP_IGP_SYNC_STATE_REQUIRED_UP; - EVENT_OFF(ldp_sync_info->t_holddown); + event_cancel(&ldp_sync_info->t_holddown); ospf_if_recalculate_output_cost(ifp); } } @@ -239,7 +239,7 @@ void ospf_ldp_sync_ldp_fail(struct interface *ifp) if (ldp_sync_info && ldp_sync_info->enabled == LDP_IGP_SYNC_ENABLED && ldp_sync_info->state != LDP_IGP_SYNC_STATE_NOT_REQUIRED) { - EVENT_OFF(ldp_sync_info->t_holddown); + event_cancel(&ldp_sync_info->t_holddown); ldp_sync_info->state = LDP_IGP_SYNC_STATE_REQUIRED_NOT_UP; ospf_if_recalculate_output_cost(ifp); } @@ -303,7 +303,7 @@ void ospf_ldp_sync_if_remove(struct interface *ifp, bool remove) */ ols_debug("%s: Removed from if %s", __func__, ifp->name); - EVENT_OFF(ldp_sync_info->t_holddown); + event_cancel(&ldp_sync_info->t_holddown); ldp_sync_info->state = LDP_IGP_SYNC_STATE_NOT_REQUIRED; ospf_if_recalculate_output_cost(ifp); @@ -902,7 +902,7 @@ DEFPY (no_mpls_ldp_sync, UNSET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_IF_CONFIG); ldp_sync_info->enabled = LDP_IGP_SYNC_DEFAULT; ldp_sync_info->state = LDP_IGP_SYNC_STATE_NOT_REQUIRED; - EVENT_OFF(ldp_sync_info->t_holddown); + event_cancel(&ldp_sync_info->t_holddown); ospf_if_recalculate_output_cost(ifp); return CMD_SUCCESS; diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index 15068ec820..94d4139a21 100644 --- a/ospfd/ospf_lsa.c +++ b/ospfd/ospf_lsa.c @@ -3791,7 +3791,7 @@ void ospf_flush_self_originated_lsas_now(struct ospf *ospf) * without conflicting to other threads. */ if (ospf->t_maxage != NULL) { - EVENT_OFF(ospf->t_maxage); + event_cancel(&ospf->t_maxage); event_execute(master, ospf_maxage_lsa_remover, ospf, 0, NULL); } diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index 1c48d37785..083937dc8d 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -182,7 +182,7 @@ static void ospf_config_finish(struct event *t) static void ospf_config_start(void) { - EVENT_OFF(t_ospf_cfg); + event_cancel(&t_ospf_cfg); if (IS_DEBUG_OSPF_EVENT) zlog_debug("ospfd config start callback received."); event_add_timer(master, ospf_config_finish, NULL, @@ -194,7 +194,7 @@ static void ospf_config_end(void) if (IS_DEBUG_OSPF_EVENT) zlog_debug("ospfd config end callback received."); - EVENT_OFF(t_ospf_cfg); + event_cancel(&t_ospf_cfg); } /* OSPFd main routine. */ diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c index 2514fc0ab3..f2be00f72f 100644 --- a/ospfd/ospf_neighbor.c +++ b/ospfd/ospf_neighbor.c @@ -127,17 +127,17 @@ void ospf_nbr_free(struct ospf_neighbor *nbr) } /* Cancel all timers. */ - EVENT_OFF(nbr->t_inactivity); - EVENT_OFF(nbr->t_db_desc); - EVENT_OFF(nbr->t_ls_req); - EVENT_OFF(nbr->t_ls_rxmt); + event_cancel(&nbr->t_inactivity); + event_cancel(&nbr->t_db_desc); + event_cancel(&nbr->t_ls_req); + event_cancel(&nbr->t_ls_rxmt); /* Cancel all events. */ /* Thread lookup cost would be negligible. */ event_cancel_event(master, nbr); bfd_sess_free(&nbr->bfd_session); - EVENT_OFF(nbr->gr_helper_info.t_grace_timer); + event_cancel(&nbr->gr_helper_info.t_grace_timer); nbr->oi = NULL; XFREE(MTYPE_OSPF_NEIGHBOR, nbr); @@ -443,7 +443,7 @@ static struct ospf_neighbor *ospf_nbr_add(struct ospf_interface *oi, nbr->nbr_nbma = nbr_nbma; if (nbr_nbma->t_poll) - EVENT_OFF(nbr_nbma->t_poll); + event_cancel(&nbr_nbma->t_poll); nbr->state_change = nbr_nbma->state_change + 1; } diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c index 079a1fa55e..7888e25c6d 100644 --- a/ospfd/ospf_nsm.c +++ b/ospfd/ospf_nsm.c @@ -105,30 +105,30 @@ static void nsm_timer_set(struct ospf_neighbor *nbr) switch (nbr->state) { case NSM_Deleted: case NSM_Down: - EVENT_OFF(nbr->t_inactivity); - EVENT_OFF(nbr->t_hello_reply); + event_cancel(&nbr->t_inactivity); + event_cancel(&nbr->t_hello_reply); fallthrough; case NSM_Attempt: case NSM_Init: case NSM_TwoWay: - EVENT_OFF(nbr->t_db_desc); - EVENT_OFF(nbr->t_ls_rxmt); - EVENT_OFF(nbr->t_ls_req); + event_cancel(&nbr->t_db_desc); + event_cancel(&nbr->t_ls_rxmt); + event_cancel(&nbr->t_ls_req); break; case NSM_ExStart: OSPF_NSM_TIMER_ON(nbr->t_db_desc, ospf_db_desc_timer, nbr->v_db_desc); - EVENT_OFF(nbr->t_ls_rxmt); - EVENT_OFF(nbr->t_ls_req); + event_cancel(&nbr->t_ls_rxmt); + event_cancel(&nbr->t_ls_req); break; case NSM_Exchange: if (!IS_SET_DD_MS(nbr->dd_flags)) - EVENT_OFF(nbr->t_db_desc); + event_cancel(&nbr->t_db_desc); break; case NSM_Loading: case NSM_Full: default: - EVENT_OFF(nbr->t_db_desc); + event_cancel(&nbr->t_db_desc); break; } } @@ -159,13 +159,13 @@ int nsm_should_adj(struct ospf_neighbor *nbr) static int nsm_hello_received(struct ospf_neighbor *nbr) { /* Start or Restart Inactivity Timer. */ - EVENT_OFF(nbr->t_inactivity); + event_cancel(&nbr->t_inactivity); OSPF_NSM_TIMER_ON(nbr->t_inactivity, ospf_inactivity_timer, nbr->v_inactivity); if (OSPF_IF_NON_BROADCAST(nbr->oi) && nbr->nbr_nbma != NULL) - EVENT_OFF(nbr->nbr_nbma->t_poll); + event_cancel(&nbr->nbr_nbma->t_poll); /* Send proactive ARP requests */ if (nbr->state < NSM_Exchange) @@ -177,9 +177,9 @@ static int nsm_hello_received(struct ospf_neighbor *nbr) static int nsm_start(struct ospf_neighbor *nbr) { if (nbr->nbr_nbma) - EVENT_OFF(nbr->nbr_nbma->t_poll); + event_cancel(&nbr->nbr_nbma->t_poll); - EVENT_OFF(nbr->t_inactivity); + event_cancel(&nbr->t_inactivity); OSPF_NSM_TIMER_ON(nbr->t_inactivity, ospf_inactivity_timer, nbr->v_inactivity); diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c index 0634178ca7..ea85081500 100644 --- a/ospfd/ospf_opaque.c +++ b/ospfd/ospf_opaque.c @@ -142,7 +142,7 @@ int ospf_opaque_type9_lsa_init(struct ospf_interface *oi) void ospf_opaque_type9_lsa_term(struct ospf_interface *oi) { - EVENT_OFF(oi->t_opaque_lsa_self); + event_cancel(&oi->t_opaque_lsa_self); if (oi->opaque_lsa_self != NULL) list_delete(&oi->opaque_lsa_self); oi->opaque_lsa_self = NULL; @@ -171,7 +171,7 @@ void ospf_opaque_type10_lsa_term(struct ospf_area *area) hook_unregister(ospf_lsa_delete, ospf_opaque_lsa_delete_hook); ospf_opaque_lsa_hooks_registered = false; - EVENT_OFF(area->t_opaque_lsa_self); + event_cancel(&area->t_opaque_lsa_self); if (area->opaque_lsa_self != NULL) list_delete(&area->opaque_lsa_self); return; @@ -191,7 +191,7 @@ int ospf_opaque_type11_lsa_init(struct ospf *top) void ospf_opaque_type11_lsa_term(struct ospf *top) { - EVENT_OFF(top->t_opaque_lsa_self); + event_cancel(&top->t_opaque_lsa_self); if (top->opaque_lsa_self != NULL) list_delete(&top->opaque_lsa_self); return; @@ -631,7 +631,7 @@ static void free_opaque_info_per_type(struct opaque_info_per_type *oipt, ospf_opaque_lsa_flush_schedule(lsa); } - EVENT_OFF(oipt->t_opaque_lsa_self); + event_cancel(&oipt->t_opaque_lsa_self); list_delete(&oipt->id_list); if (cleanup_owner) { /* Remove from its owner's self-originated LSA list. */ @@ -747,7 +747,7 @@ static void free_opaque_info_per_id(void *val) { struct opaque_info_per_id *oipi = (struct opaque_info_per_id *)val; - EVENT_OFF(oipi->t_opaque_lsa_self); + event_cancel(&oipi->t_opaque_lsa_self); if (oipi->lsa != NULL) ospf_lsa_unlock(&oipi->lsa); XFREE(MTYPE_OPAQUE_INFO_PER_ID, oipi); diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 13bf947994..355808e091 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -288,7 +288,7 @@ static void ospf_ls_req_timer(struct event *thread) void ospf_ls_req_event(struct ospf_neighbor *nbr) { - EVENT_OFF(nbr->t_ls_req); + event_cancel(&nbr->t_ls_req); event_add_event(master, ospf_ls_req_timer, nbr, 0, &nbr->t_ls_req); } @@ -3863,7 +3863,7 @@ void ospf_ls_upd_queue_send(struct ospf_interface *oi, struct list *update, * is actually turned off. */ if (list_isempty(oi->ospf->oi_write_q)) - EVENT_OFF(oi->ospf->t_write); + event_cancel(&oi->ospf->t_write); } else { /* Hook thread to write packet. */ OSPF_ISM_WRITE_ON(oi->ospf); diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c index 89db97922f..078971e963 100644 --- a/ospfd/ospf_sr.c +++ b/ospfd/ospf_sr.c @@ -565,7 +565,7 @@ static void ospf_sr_stop(void) osr_debug("SR (%s): Stop Segment Routing", __func__); /* Disable any re-attempt to connect to Label Manager */ - EVENT_OFF(OspfSR.t_start_lm); + event_cancel(&OspfSR.t_start_lm); /* Release SRGB if active */ sr_global_block_delete(); diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 3263d0a5f8..c1eaf94a41 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -8838,7 +8838,7 @@ DEFPY (no_ip_ospf_gr_hdelay, continue; oi->gr.hello_delay.elapsed_seconds = 0; - EVENT_OFF(oi->gr.hello_delay.t_grace_send); + event_cancel(&oi->gr.hello_delay.t_grace_send); } return CMD_SUCCESS; @@ -10032,7 +10032,7 @@ DEFUN (no_ospf_max_metric_router_lsa_startup, for (ALL_LIST_ELEMENTS_RO(ospf->areas, ln, area)) { SET_FLAG(area->stub_router_state, OSPF_AREA_WAS_START_STUB_ROUTED); - EVENT_OFF(area->t_stub_router); + event_cancel(&area->t_stub_router); /* Don't trample on admin stub routed */ if (!CHECK_FLAG(area->stub_router_state, @@ -13380,7 +13380,7 @@ DEFPY_HIDDEN(ospf_maxage_delay_timer, ospf_maxage_delay_timer_cmd, else ospf->maxage_delay = value; - EVENT_OFF(ospf->t_maxage); + event_cancel(&ospf->t_maxage); OSPF_TIMER_ON(ospf->t_maxage, ospf_maxage_lsa_remover, ospf->maxage_delay); diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 1d2078469d..939a423c29 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -731,7 +731,7 @@ static void ospf_finish_final(struct ospf *ospf) /* Clear static neighbors */ for (rn = route_top(ospf->nbr_nbma); rn; rn = route_next(rn)) if ((nbr_nbma = rn->info)) { - EVENT_OFF(nbr_nbma->t_poll); + event_cancel(&nbr_nbma->t_poll); if (nbr_nbma->nbr) { nbr_nbma->nbr->nbr_nbma = NULL; @@ -854,24 +854,24 @@ static void ospf_finish_final(struct ospf *ospf) } /* Cancel all timers. */ - EVENT_OFF(ospf->t_read); - EVENT_OFF(ospf->t_write); - EVENT_OFF(ospf->t_spf_calc); - EVENT_OFF(ospf->t_ase_calc); - EVENT_OFF(ospf->t_maxage); - EVENT_OFF(ospf->t_maxage_walker); - EVENT_OFF(ospf->t_deferred_shutdown); - EVENT_OFF(ospf->t_abr_task); - EVENT_OFF(ospf->t_abr_fr); - EVENT_OFF(ospf->t_asbr_check); - EVENT_OFF(ospf->t_asbr_redist_update); - EVENT_OFF(ospf->t_distribute_update); - EVENT_OFF(ospf->t_lsa_refresher); - EVENT_OFF(ospf->t_opaque_lsa_self); - EVENT_OFF(ospf->t_sr_update); - EVENT_OFF(ospf->t_default_routemap_timer); - EVENT_OFF(ospf->t_external_aggr); - EVENT_OFF(ospf->gr_info.t_grace_period); + event_cancel(&ospf->t_read); + event_cancel(&ospf->t_write); + event_cancel(&ospf->t_spf_calc); + event_cancel(&ospf->t_ase_calc); + event_cancel(&ospf->t_maxage); + event_cancel(&ospf->t_maxage_walker); + event_cancel(&ospf->t_deferred_shutdown); + event_cancel(&ospf->t_abr_task); + event_cancel(&ospf->t_abr_fr); + event_cancel(&ospf->t_asbr_check); + event_cancel(&ospf->t_asbr_redist_update); + event_cancel(&ospf->t_distribute_update); + event_cancel(&ospf->t_lsa_refresher); + event_cancel(&ospf->t_opaque_lsa_self); + event_cancel(&ospf->t_sr_update); + event_cancel(&ospf->t_default_routemap_timer); + event_cancel(&ospf->t_external_aggr); + event_cancel(&ospf->gr_info.t_grace_period); route_table_finish(ospf->rt_aggr_tbl); @@ -996,8 +996,8 @@ static void ospf_area_free(struct ospf_area *area) free(IMPORT_NAME(area)); /* Cancel timer. */ - EVENT_OFF(area->t_stub_router); - EVENT_OFF(area->t_opaque_lsa_self); + event_cancel(&area->t_stub_router); + event_cancel(&area->t_opaque_lsa_self); if (OSPF_IS_AREA_BACKBONE(area)) area->ospf->backbone = NULL; @@ -1459,7 +1459,7 @@ void ospf_ls_upd_queue_empty(struct ospf_interface *oi) } /* remove update event */ - EVENT_OFF(oi->t_ls_upd_event); + event_cancel(&oi->t_ls_upd_event); } void ospf_if_update(struct ospf *ospf, struct interface *ifp) @@ -1904,7 +1904,7 @@ int ospf_timers_refresh_set(struct ospf *ospf, int interval) - (monotime(NULL) - ospf->lsa_refresher_started); if (time_left > interval) { - EVENT_OFF(ospf->t_lsa_refresher); + event_cancel(&ospf->t_lsa_refresher); event_add_timer(master, ospf_lsa_refresh_walker, ospf, interval, &ospf->t_lsa_refresher); } @@ -1921,7 +1921,7 @@ int ospf_timers_refresh_unset(struct ospf *ospf) - (monotime(NULL) - ospf->lsa_refresher_started); if (time_left > OSPF_LSA_REFRESH_INTERVAL_DEFAULT) { - EVENT_OFF(ospf->t_lsa_refresher); + event_cancel(&ospf->t_lsa_refresher); ospf->t_lsa_refresher = NULL; event_add_timer(master, ospf_lsa_refresh_walker, ospf, OSPF_LSA_REFRESH_INTERVAL_DEFAULT, @@ -1973,7 +1973,7 @@ static void ospf_nbr_nbma_delete(struct ospf *ospf, static void ospf_nbr_nbma_down(struct ospf_nbr_nbma *nbr_nbma) { - EVENT_OFF(nbr_nbma->t_poll); + event_cancel(&nbr_nbma->t_poll); if (nbr_nbma->nbr) { nbr_nbma->nbr->nbr_nbma = NULL; @@ -2162,7 +2162,7 @@ int ospf_nbr_nbma_poll_interval_set(struct ospf *ospf, struct in_addr nbr_addr, if (nbr_nbma->v_poll != interval) { nbr_nbma->v_poll = interval; if (nbr_nbma->oi && ospf_if_is_up(nbr_nbma->oi)) { - EVENT_OFF(nbr_nbma->t_poll); + event_cancel(&nbr_nbma->t_poll); OSPF_POLL_TIMER_ON(nbr_nbma->t_poll, ospf_poll_timer, nbr_nbma->v_poll); } @@ -2357,7 +2357,7 @@ static int ospf_vrf_disable(struct vrf *vrf) if (IS_DEBUG_OSPF_EVENT) zlog_debug("%s: ospf old_vrf_id %d unlinked", __func__, old_vrf_id); - EVENT_OFF(ospf->t_read); + event_cancel(&ospf->t_read); close(ospf->fd); ospf->fd = -1; } diff --git a/pimd/pim6_mld.c b/pimd/pim6_mld.c index fed75a0a0c..1bad97a5da 100644 --- a/pimd/pim6_mld.c +++ b/pimd/pim6_mld.c @@ -379,7 +379,7 @@ static void gm_sg_free(struct gm_sg *sg) pim_embedded_rp_delete(sg->iface->pim, &sg->sgaddr.grp); /* t_sg_expiry is handled before this is reached */ - EVENT_OFF(sg->t_sg_query); + event_cancel(&sg->t_sg_query); gm_packet_sg_subs_fini(sg->subs_negative); gm_packet_sg_subs_fini(sg->subs_positive); XFREE(MTYPE_GM_SG, sg); @@ -460,7 +460,7 @@ static void gm_sg_update(struct gm_sg *sg, bool has_expired) gm_sg_timer_start(gm_ifp, sg, timers.expire_wait); - EVENT_OFF(sg->t_sg_query); + event_cancel(&sg->t_sg_query); sg->query_sbit = false; /* Trigger the specific queries only for querier. */ if (!pim_ifp->gmp_immediate_leave && @@ -517,7 +517,7 @@ static void gm_sg_update(struct gm_sg *sg, bool has_expired) * another path. */ if (has_expired) - EVENT_OFF(sg->t_sg_expire); + event_cancel(&sg->t_sg_expire); assertf((!sg->t_sg_expire && !gm_packet_sg_subs_count(sg->subs_positive) && @@ -663,7 +663,7 @@ static void gm_sg_expiry_cancel(struct gm_sg *sg) { if (sg->t_sg_expire && PIM_DEBUG_GM_TRACE) zlog_debug(log_sg(sg, "alive, cancelling expiry timer")); - EVENT_OFF(sg->t_sg_expire); + event_cancel(&sg->t_sg_expire); sg->query_sbit = true; } @@ -1221,7 +1221,7 @@ static void gm_handle_q_general(struct gm_if *gm_ifp, gm_ifp->n_pending--; if (!gm_ifp->n_pending) - EVENT_OFF(gm_ifp->t_expire); + event_cancel(&gm_ifp->t_expire); } /* people might be messing with their configs or something */ @@ -1330,7 +1330,7 @@ static void gm_sg_timer_start(struct gm_if *gm_ifp, struct gm_sg *sg, if (timercmp(&remain, &expire_wait, <=)) return; - EVENT_OFF(sg->t_sg_expire); + event_cancel(&sg->t_sg_expire); } event_add_timer_tv(router->master, gm_t_sg_expire, sg, &expire_wait, @@ -1391,7 +1391,7 @@ static void gm_t_grp_expire(struct event *t) * parallel. But if we received nothing for the *,G query, * the S,G query is kinda irrelevant. */ - EVENT_OFF(sg->t_sg_expire); + event_cancel(&sg->t_sg_expire); frr_each_safe (gm_packet_sg_subs, sg->subs_positive, item) /* this will also drop the EXCLUDE S,G lists */ @@ -1443,7 +1443,7 @@ static void gm_handle_q_group(struct gm_if *gm_ifp, if (timercmp(&remain, &timers->expire_wait, <=)) return; - EVENT_OFF(pend->t_expire); + event_cancel(&pend->t_expire); } else { pend = XCALLOC(MTYPE_GM_GRP_PENDING, sizeof(*pend)); pend->grp = grp; @@ -1464,7 +1464,7 @@ static void gm_bump_querier(struct gm_if *gm_ifp) { struct pim_interface *pim_ifp = gm_ifp->ifp->info; - EVENT_OFF(gm_ifp->t_query); + event_cancel(&gm_ifp->t_query); if (pim_addr_is_any(pim_ifp->ll_lowest)) return; @@ -1589,8 +1589,8 @@ static void gm_handle_query(struct gm_if *gm_ifp, if (IPV6_ADDR_CMP(&pkt_src->sin6_addr, &pim_ifp->ll_lowest) < 0) { unsigned int other_ms; - EVENT_OFF(gm_ifp->t_query); - EVENT_OFF(gm_ifp->t_other_querier); + event_cancel(&gm_ifp->t_query); + event_cancel(&gm_ifp->t_other_querier); other_ms = timers.qrv * timers.qqic_ms + timers.max_resp_ms / 2; event_add_timer_msec(router->master, gm_t_other_querier, gm_ifp, @@ -2093,7 +2093,7 @@ static void gm_trigger_specific(struct gm_sg *sg) pend_gsq->n_src++; if (pend_gsq->n_src == array_size(pend_gsq->srcs)) { - EVENT_OFF(pend_gsq->t_send); + event_cancel(&pend_gsq->t_send); gm_send_specific(pend_gsq); pend_gsq = NULL; } @@ -2199,7 +2199,7 @@ static void gm_vrf_socket_decref(struct pim_instance *pim) if (--pim->gm_socket_if_count) return; - EVENT_OFF(pim->t_gm_recv); + event_cancel(&pim->t_gm_recv); close(pim->gm_socket); pim->gm_socket = -1; } @@ -2272,17 +2272,17 @@ void gm_group_delete(struct gm_if *gm_ifp) gm_packet_drop(pkt, false); while ((pend_grp = gm_grp_pends_pop(gm_ifp->grp_pends))) { - EVENT_OFF(pend_grp->t_expire); + event_cancel(&pend_grp->t_expire); XFREE(MTYPE_GM_GRP_PENDING, pend_grp); } while ((pend_gsq = gm_gsq_pends_pop(gm_ifp->gsq_pends))) { - EVENT_OFF(pend_gsq->t_send); + event_cancel(&pend_gsq->t_send); XFREE(MTYPE_GM_GSQ_PENDING, pend_gsq); } while ((sg = gm_sgs_pop(gm_ifp->sgs))) { - EVENT_OFF(sg->t_sg_expire); + event_cancel(&sg->t_sg_expire); assertf(!gm_packet_sg_subs_count(sg->subs_negative), "%pSG", &sg->sgaddr); assertf(!gm_packet_sg_subs_count(sg->subs_positive), "%pSG", @@ -2310,9 +2310,9 @@ void gm_ifp_teardown(struct interface *ifp) if (PIM_DEBUG_GM_EVENTS) zlog_debug(log_ifp("MLD stop")); - EVENT_OFF(gm_ifp->t_query); - EVENT_OFF(gm_ifp->t_other_querier); - EVENT_OFF(gm_ifp->t_expire); + event_cancel(&gm_ifp->t_query); + event_cancel(&gm_ifp->t_other_querier); + event_cancel(&gm_ifp->t_expire); frr_with_privs (&pimd_privs) { struct ipv6_mreq mreq; @@ -2355,7 +2355,7 @@ static void gm_update_ll(struct interface *ifp) gm_ifp->cur_ll_lowest = pim_ifp->ll_lowest; if (was_querier) gm_ifp->querier = pim_ifp->ll_lowest; - EVENT_OFF(gm_ifp->t_query); + event_cancel(&gm_ifp->t_query); if (pim_addr_is_any(gm_ifp->cur_ll_lowest)) { if (was_querier) diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c index 86d9a745ea..729f4a3c37 100644 --- a/pimd/pim_assert.c +++ b/pimd/pim_assert.c @@ -535,7 +535,7 @@ static void assert_timer_off(struct pim_ifchannel *ch) __func__, ch->sg_str, ch->interface->name); } } - EVENT_OFF(ch->t_ifassert_timer); + event_cancel(&ch->t_ifassert_timer); } static void pim_assert_timer_set(struct pim_ifchannel *ch, int interval) diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c index 845467755a..a5882e083f 100644 --- a/pimd/pim_bsm.c +++ b/pimd/pim_bsm.c @@ -79,7 +79,7 @@ void pim_bsm_write_config(struct vty *vty, struct interface *ifp) static void pim_bsm_rpinfo_free(struct bsm_rpinfo *bsrp_info) { - EVENT_OFF(bsrp_info->g2rp_timer); + event_cancel(&bsrp_info->g2rp_timer); XFREE(MTYPE_PIM_BSRP_INFO, bsrp_info); } @@ -173,7 +173,7 @@ static void pim_on_bs_timer(struct event *t) struct bsm_scope *scope; scope = EVENT_ARG(t); - EVENT_OFF(scope->bs_timer); + event_cancel(&scope->bs_timer); if (PIM_DEBUG_BSM) zlog_debug("%s: Bootstrap Timer expired for scope: %d", @@ -191,7 +191,7 @@ static void pim_bsm_accept_any(struct bsm_scope *scope) struct bsgrp_node *bsgrp_node; struct bsm_rpinfo *bsrp; - EVENT_OFF(scope->t_ebsr_regen_bsm); + event_cancel(&scope->t_ebsr_regen_bsm); /* Reset scope zone data */ scope->state = ACCEPT_ANY; @@ -231,7 +231,7 @@ static void pim_bs_timer_stop(struct bsm_scope *scope) if (PIM_DEBUG_BSM) zlog_debug("%s : BS timer being stopped of sz: %d", __func__, scope->sz_id); - EVENT_OFF(scope->bs_timer); + event_cancel(&scope->bs_timer); } static void pim_bs_timer_start(struct bsm_scope *scope, int bs_timeout) @@ -241,7 +241,7 @@ static void pim_bs_timer_start(struct bsm_scope *scope, int bs_timeout) zlog_debug("%s : Invalid scope(NULL).", __func__); return; } - EVENT_OFF(scope->bs_timer); + event_cancel(&scope->bs_timer); if (PIM_DEBUG_BSM) zlog_debug( "%s : starting bs timer for scope %d with timeout %d secs", @@ -307,7 +307,7 @@ void pim_bsm_proc_free(struct pim_instance *pim) struct bsgrp_node *bsgrp; struct cand_rp_group *crpgrp; - EVENT_OFF(scope->unicast_read); + event_cancel(&scope->unicast_read); close(scope->unicast_sock); pim_bs_timer_stop(scope); @@ -352,7 +352,7 @@ static void pim_on_g2rp_timer(struct event *t) pim_addr bsrp_addr; bsrp = EVENT_ARG(t); - EVENT_OFF(bsrp->g2rp_timer); + event_cancel(&bsrp->g2rp_timer); bsgrp_node = bsrp->bsgrp_node; pim = bsgrp_node->scope->pim; bsrp_addr = bsrp->rp_address; @@ -419,7 +419,7 @@ static void pim_g2rp_timer_start(struct bsm_rpinfo *bsrp, int hold_time) zlog_debug("%s : Invalid brsp(NULL).", __func__); return; } - EVENT_OFF(bsrp->g2rp_timer); + event_cancel(&bsrp->g2rp_timer); if (PIM_DEBUG_BSM) zlog_debug( "%s : starting g2rp timer for grp: %pFX - rp: %pPAs with timeout %d secs(Actual Hold time : %d secs)", @@ -446,7 +446,7 @@ static void pim_g2rp_timer_stop(struct bsm_rpinfo *bsrp) __func__, &bsrp->bsgrp_node->group, &bsrp->rp_address); - EVENT_OFF(bsrp->g2rp_timer); + event_cancel(&bsrp->g2rp_timer); } static bool is_hold_time_zero(void *data) @@ -652,7 +652,7 @@ static void pim_bsm_update(struct pim_instance *pim, pim_addr bsr, break; } - EVENT_OFF(pim->global_scope.t_ebsr_regen_bsm); + event_cancel(&pim->global_scope.t_ebsr_regen_bsm); if (pim->global_scope.state == BSR_ELECTED) pim_crp_db_clear(&pim->global_scope); @@ -679,7 +679,7 @@ void pim_bsm_clear(struct pim_instance *pim) struct rp_info *rp_info; bool upstream_updated = false; - EVENT_OFF(pim->global_scope.t_ebsr_regen_bsm); + event_cancel(&pim->global_scope.t_ebsr_regen_bsm); if (pim->global_scope.state == BSR_ELECTED) pim_crp_db_clear(&pim->global_scope); @@ -1638,7 +1638,7 @@ void pim_bsm_changed(struct bsm_scope *scope) { struct event t; - EVENT_OFF(scope->bs_timer); + event_cancel(&scope->bs_timer); scope->changed_bsm_trigger = 2; t.arg = scope; @@ -1705,8 +1705,8 @@ static void pim_cand_bsr_pending(struct bsm_scope *scope) pim_addr best_addr; float prio_delay, addr_delay; - EVENT_OFF(scope->bs_timer); - EVENT_OFF(scope->t_ebsr_regen_bsm); + event_cancel(&scope->bs_timer); + event_cancel(&scope->t_ebsr_regen_bsm); scope->state = BSR_PENDING; best_prio = MAX(scope->cand_bsr_prio, scope->current_bsr_prio); @@ -1850,8 +1850,8 @@ static void pim_cand_bsr_stop(struct bsm_scope *scope, bool verbose) if (PIM_DEBUG_BSM) zlog_debug("Candidate BSR ceasing operation"); - EVENT_OFF(scope->t_ebsr_regen_bsm); - EVENT_OFF(scope->bs_timer); + event_cancel(&scope->t_ebsr_regen_bsm); + event_cancel(&scope->bs_timer); pim_crp_db_clear(scope); pim_bsm_accept_any(scope); } @@ -2055,7 +2055,7 @@ void pim_cand_rp_trigger(struct bsm_scope *scope) return; } - EVENT_OFF(scope->cand_rp_adv_timer); + event_cancel(&scope->cand_rp_adv_timer); if (!scope->cand_rp_addrsel.run) return; @@ -2078,7 +2078,7 @@ void pim_cand_rp_apply(struct bsm_scope *scope) zlog_debug("Candidate RP ceasing operation"); cand_addrsel_clear(&scope->cand_rp_addrsel); - EVENT_OFF(scope->cand_rp_adv_timer); + event_cancel(&scope->cand_rp_adv_timer); pim_cand_rp_adv_stop_maybe(scope); scope->cand_rp_adv_trigger = 0; return; @@ -2143,7 +2143,7 @@ static void pim_cand_addrs_reapply(struct event *t) void pim_cand_addrs_changed(void) { - EVENT_OFF(t_cand_addrs_reapply); + event_cancel(&t_cand_addrs_reapply); event_add_timer_msec(router->master, pim_cand_addrs_reapply, NULL, 1, &t_cand_addrs_reapply); } diff --git a/pimd/pim_bsr_rpdb.c b/pimd/pim_bsr_rpdb.c index 03ceabd733..44bf836b81 100644 --- a/pimd/pim_bsr_rpdb.c +++ b/pimd/pim_bsr_rpdb.c @@ -428,7 +428,7 @@ void pim_crp_nht_update(struct pim_instance *pim, struct pim_nexthop_cache *pnc) static void pim_crp_free(struct pim_instance *pim, struct bsr_crp_rp *rp) { - EVENT_OFF(rp->t_hold); + event_cancel(&rp->t_hold); pim_nht_candrp_del(pim, rp->addr); bsr_crp_rp_groups_fini(rp->groups); @@ -553,7 +553,7 @@ int pim_crp_process(struct interface *ifp, pim_sgaddr *src_dst, uint8_t *buf, rp->seen_last = monotime(NULL); rp->holdtime = ntohs(crp_hdr->rp_holdtime); - EVENT_OFF(rp->t_hold); + event_cancel(&rp->t_hold); event_add_timer(router->master, pim_crp_expire, rp, ntohs(crp_hdr->rp_holdtime), &rp->t_hold); diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index d55d2a958a..6853466e5f 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -193,9 +193,9 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch) ch->upstream = NULL; - EVENT_OFF(ch->t_ifjoin_expiry_timer); - EVENT_OFF(ch->t_ifjoin_prune_pending_timer); - EVENT_OFF(ch->t_ifassert_timer); + event_cancel(&ch->t_ifjoin_expiry_timer); + event_cancel(&ch->t_ifjoin_prune_pending_timer); + event_cancel(&ch->t_ifassert_timer); if (ch->parent) { listnode_delete(ch->parent->sources, ch); @@ -430,7 +430,7 @@ const char *pim_ifchannel_ifassert_name(enum pim_ifassert_state ifassert_state) */ void reset_ifassert_state(struct pim_ifchannel *ch) { - EVENT_OFF(ch->t_ifassert_timer); + event_cancel(&ch->t_ifassert_timer); pim_ifassert_winner_set(ch, PIM_IFASSERT_NOINFO, PIMADDR_ANY, router->infinite_assert_metric); @@ -938,13 +938,13 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, return; } } - EVENT_OFF(ch->t_ifjoin_expiry_timer); + event_cancel(&ch->t_ifjoin_expiry_timer); break; case PIM_IFJOIN_PRUNE: if (source_flags & PIM_ENCODE_RPT_BIT) { pim_ifchannel_ifjoin_switch(__func__, ch, PIM_IFJOIN_NOINFO); - EVENT_OFF(ch->t_ifjoin_expiry_timer); + event_cancel(&ch->t_ifjoin_expiry_timer); delete_on_noinfo(ch); return; } else @@ -961,7 +961,7 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, * maximum of its current value and the HoldTime from the * triggering Join/Prune message. */ - EVENT_OFF(ch->t_ifjoin_prune_pending_timer); + event_cancel(&ch->t_ifjoin_prune_pending_timer); /* Check if SGRpt join Received */ if ((source_flags & PIM_ENCODE_RPT_BIT) && @@ -973,7 +973,7 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, * I transitions to the NoInfo state.The ET and PPT are * cancelled. */ - EVENT_OFF(ch->t_ifjoin_expiry_timer); + event_cancel(&ch->t_ifjoin_expiry_timer); pim_ifchannel_ifjoin_switch(__func__, ch, PIM_IFJOIN_NOINFO); return; @@ -988,7 +988,7 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, if (remain > holdtime) return; } - EVENT_OFF(ch->t_ifjoin_expiry_timer); + event_cancel(&ch->t_ifjoin_expiry_timer); break; case PIM_IFJOIN_PRUNE_TMP: @@ -1048,8 +1048,8 @@ void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream, be taken not to use "ch" afterwards since it would be deleted. */ - EVENT_OFF(ch->t_ifjoin_prune_pending_timer); - EVENT_OFF(ch->t_ifjoin_expiry_timer); + event_cancel(&ch->t_ifjoin_prune_pending_timer); + event_cancel(&ch->t_ifjoin_expiry_timer); event_add_timer_msec(router->master, on_ifjoin_prune_pending_timer, ch, jp_override_interval_msec, @@ -1086,7 +1086,7 @@ void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream, /* If we called ifjoin_prune() directly instead, care should be taken not to use "ch" afterwards since it would be deleted. */ - EVENT_OFF(ch->t_ifjoin_prune_pending_timer); + event_cancel(&ch->t_ifjoin_prune_pending_timer); event_add_timer_msec(router->master, on_ifjoin_prune_pending_timer, ch, jp_override_interval_msec, @@ -1094,7 +1094,7 @@ void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream, break; case PIM_IFJOIN_PRUNE: if (source_flags & PIM_ENCODE_RPT_BIT) { - EVENT_OFF(ch->t_ifjoin_prune_pending_timer); + event_cancel(&ch->t_ifjoin_prune_pending_timer); /* * While in Prune State, Receive SGRpt Prune. * RFC 7761 Sec 4.5.3: @@ -1110,7 +1110,7 @@ void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream, if (rem > holdtime) return; - EVENT_OFF(ch->t_ifjoin_expiry_timer); + event_cancel(&ch->t_ifjoin_expiry_timer); } event_add_timer(router->master, on_ifjoin_expiry_timer, @@ -1121,7 +1121,7 @@ void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream, case PIM_IFJOIN_PRUNE_TMP: if (source_flags & PIM_ENCODE_RPT_BIT) { ch->ifjoin_state = PIM_IFJOIN_PRUNE; - EVENT_OFF(ch->t_ifjoin_expiry_timer); + event_cancel(&ch->t_ifjoin_expiry_timer); event_add_timer(router->master, on_ifjoin_expiry_timer, ch, holdtime, &ch->t_ifjoin_expiry_timer); @@ -1130,7 +1130,7 @@ void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream, case PIM_IFJOIN_PRUNE_PENDING_TMP: if (source_flags & PIM_ENCODE_RPT_BIT) { ch->ifjoin_state = PIM_IFJOIN_PRUNE_PENDING; - EVENT_OFF(ch->t_ifjoin_expiry_timer); + event_cancel(&ch->t_ifjoin_expiry_timer); event_add_timer(router->master, on_ifjoin_expiry_timer, ch, holdtime, &ch->t_ifjoin_expiry_timer); @@ -1484,8 +1484,8 @@ void pim_ifchannel_set_star_g_join_state(struct pim_ifchannel *ch, int eom, break; if (child->ifjoin_state == PIM_IFJOIN_PRUNE_PENDING_TMP) - EVENT_OFF(child->t_ifjoin_prune_pending_timer); - EVENT_OFF(child->t_ifjoin_expiry_timer); + event_cancel(&child->t_ifjoin_prune_pending_timer); + event_cancel(&child->t_ifjoin_expiry_timer); PIM_IF_FLAG_UNSET_S_G_RPT(child->flags); child->ifjoin_state = PIM_IFJOIN_NOINFO; diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c index b1b4566499..6eafc5bacf 100644 --- a/pimd/pim_igmp.c +++ b/pimd/pim_igmp.c @@ -379,7 +379,7 @@ void pim_igmp_other_querier_timer_on(struct gm_sock *igmp) "Querier %s resetting TIMER event for Other-Querier-Present", ifaddr_str); } - EVENT_OFF(igmp->t_other_querier_timer); + event_cancel(&igmp->t_other_querier_timer); } else { /* We are the current querier, then stop sending general queries: @@ -441,7 +441,7 @@ void pim_igmp_other_querier_timer_off(struct gm_sock *igmp) ifaddr_str, igmp->fd, igmp->interface->name); } } - EVENT_OFF(igmp->t_other_querier_timer); + event_cancel(&igmp->t_other_querier_timer); } int igmp_validate_checksum(char *igmp_msg, int igmp_msg_len) @@ -885,7 +885,7 @@ void pim_igmp_general_query_off(struct gm_sock *igmp) ifaddr_str, igmp->fd, igmp->interface->name); } } - EVENT_OFF(igmp->t_igmp_query_timer); + event_cancel(&igmp->t_igmp_query_timer); } /* Issue IGMP general query */ @@ -955,7 +955,7 @@ static void sock_close(struct gm_sock *igmp) igmp->interface->name); } } - EVENT_OFF(igmp->t_igmp_read); + event_cancel(&igmp->t_igmp_read); if (close(igmp->fd)) { flog_err( @@ -1047,7 +1047,7 @@ void igmp_group_delete(struct gm_group *group) igmp_source_delete(src); } - EVENT_OFF(group->t_group_query_retransmit_timer); + event_cancel(&group->t_group_query_retransmit_timer); group_timer_off(group); igmp_group_count_decr(pim_ifp); @@ -1350,7 +1350,7 @@ static void group_timer_off(struct gm_group *group) zlog_debug("Cancelling TIMER event for group %s on %s", group_str, group->interface->name); } - EVENT_OFF(group->t_group_timer); + event_cancel(&group->t_group_timer); } void igmp_group_timer_on(struct gm_group *group, long interval_msec, diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c index 3cbab499db..5292705572 100644 --- a/pimd/pim_igmpv3.c +++ b/pimd/pim_igmpv3.c @@ -189,7 +189,7 @@ static void source_timer_off(struct gm_group *group, struct gm_source *source) group_str, source_str, group->interface->name); } - EVENT_OFF(source->t_source_timer); + event_cancel(&source->t_source_timer); } static void igmp_source_timer_on(struct gm_group *group, diff --git a/pimd/pim_join.c b/pimd/pim_join.c index 7796e8b951..fb5e45bac7 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -331,9 +331,9 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh, if (PIM_IF_FLAG_TEST_S_G_RPT(child->flags)) { if (child->ifjoin_state == PIM_IFJOIN_PRUNE_PENDING_TMP) - EVENT_OFF( + event_cancel(& child->t_ifjoin_prune_pending_timer); - EVENT_OFF(child->t_ifjoin_expiry_timer); + event_cancel(&child->t_ifjoin_expiry_timer); PIM_IF_FLAG_UNSET_S_G_RPT(child->flags); child->ifjoin_state = PIM_IFJOIN_NOINFO; delete_on_noinfo(child); diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 30daa3a929..e7b6097b8c 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -834,7 +834,7 @@ static void mroute_read_on(struct pim_instance *pim) static void mroute_read_off(struct pim_instance *pim) { - EVENT_OFF(pim->thread); + event_cancel(&pim->thread); } int pim_mroute_socket_enable(struct pim_instance *pim) diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index 2192aa9831..2e92b50977 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -80,7 +80,7 @@ static void pim_msdp_sa_adv_timer_cb(struct event *t) static void pim_msdp_sa_adv_timer_setup(struct pim_instance *pim, bool start) { - EVENT_OFF(pim->msdp.sa_adv_timer); + event_cancel(&pim->msdp.sa_adv_timer); if (start) { event_add_timer(pim->msdp.master, pim_msdp_sa_adv_timer_cb, pim, PIM_MSDP_SA_ADVERTISMENT_TIME, @@ -103,7 +103,7 @@ static void pim_msdp_sa_state_timer_cb(struct event *t) static void pim_msdp_sa_state_timer_setup(struct pim_msdp_sa *sa, bool start) { - EVENT_OFF(sa->sa_state_timer); + event_cancel(&sa->sa_state_timer); if (start) { event_add_timer(sa->pim->msdp.master, pim_msdp_sa_state_timer_cb, sa, @@ -897,7 +897,7 @@ static void pim_msdp_peer_hold_timer_cb(struct event *t) static void pim_msdp_peer_hold_timer_setup(struct pim_msdp_peer *mp, bool start) { struct pim_instance *pim = mp->pim; - EVENT_OFF(mp->hold_timer); + event_cancel(&mp->hold_timer); if (start) { event_add_timer(pim->msdp.master, pim_msdp_peer_hold_timer_cb, mp, pim->msdp.hold_time, &mp->hold_timer); @@ -921,7 +921,7 @@ static void pim_msdp_peer_ka_timer_cb(struct event *t) static void pim_msdp_peer_ka_timer_setup(struct pim_msdp_peer *mp, bool start) { - EVENT_OFF(mp->ka_timer); + event_cancel(&mp->ka_timer); if (start) { event_add_timer(mp->pim->msdp.master, pim_msdp_peer_ka_timer_cb, mp, mp->pim->msdp.keep_alive, &mp->ka_timer); @@ -983,7 +983,7 @@ static void pim_msdp_peer_cr_timer_cb(struct event *t) static void pim_msdp_peer_cr_timer_setup(struct pim_msdp_peer *mp, bool start) { - EVENT_OFF(mp->cr_timer); + event_cancel(&mp->cr_timer); if (start) { event_add_timer(mp->pim->msdp.master, pim_msdp_peer_cr_timer_cb, mp, mp->pim->msdp.connection_retry, @@ -1500,7 +1500,7 @@ static void pim_upstream_msdp_reg_timer(struct event *t) void pim_upstream_msdp_reg_timer_start(struct pim_upstream *up) { - EVENT_OFF(up->t_msdp_reg_timer); + event_cancel(&up->t_msdp_reg_timer); event_add_timer(router->master, pim_upstream_msdp_reg_timer, up, PIM_MSDP_REG_RXED_PERIOD, &up->t_msdp_reg_timer); diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c index 1cd7cce086..e1a80908f0 100644 --- a/pimd/pim_neighbor.c +++ b/pimd/pim_neighbor.c @@ -222,7 +222,7 @@ void pim_neighbor_timer_reset(struct pim_neighbor *neigh, uint16_t holdtime) { neigh->holdtime = holdtime; - EVENT_OFF(neigh->t_expire_timer); + event_cancel(&neigh->t_expire_timer); /* 0xFFFF is request for no holdtime @@ -261,7 +261,7 @@ static void on_neighbor_jp_timer(struct event *t) static void pim_neighbor_start_jp_timer(struct pim_neighbor *neigh) { - EVENT_OFF(neigh->jp_timer); + event_cancel(&neigh->jp_timer); event_add_timer(router->master, on_neighbor_jp_timer, neigh, router->t_periodic, &neigh->jp_timer); } @@ -377,7 +377,7 @@ void pim_neighbor_free(struct pim_neighbor *neigh) delete_prefix_list(neigh); list_delete(&neigh->upstream_jp_agg); - EVENT_OFF(neigh->jp_timer); + event_cancel(&neigh->jp_timer); bfd_sess_free(&neigh->bfd_session); @@ -581,7 +581,7 @@ void pim_neighbor_delete(struct interface *ifp, struct pim_neighbor *neigh, zlog_notice("PIM NEIGHBOR DOWN: neighbor %pPA on interface %s: %s", &neigh->source_addr, ifp->name, delete_message); - EVENT_OFF(neigh->t_expire_timer); + event_cancel(&neigh->t_expire_timer); pim_if_assert_on_neighbor_down(ifp, neigh->source_addr); diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c index d18406d55d..c6d9222e9f 100644 --- a/pimd/pim_oil.c +++ b/pimd/pim_oil.c @@ -167,7 +167,7 @@ void pim_clear_nocache_state(struct pim_interface *pim_ifp) if (*oil_incoming_vif(c_oil) != pim_ifp->mroute_vif_index) continue; - EVENT_OFF(c_oil->up->t_ka_timer); + event_cancel(&c_oil->up->t_ka_timer); PIM_UPSTREAM_FLAG_UNSET_SRC_NOCACHE(c_oil->up->flags); PIM_UPSTREAM_FLAG_UNSET_SRC_STREAM(c_oil->up->flags); pim_upstream_del(pim_ifp->pim, c_oil->up, __func__); diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index fb78e39022..9ffbc22fe0 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -69,7 +69,7 @@ static void sock_close(struct interface *ifp) pim_ifp->pim_sock_fd, ifp->name); } } - EVENT_OFF(pim_ifp->t_pim_sock_read); + event_cancel(&pim_ifp->t_pim_sock_read); if (PIM_DEBUG_PIM_TRACE) { if (pim_ifp->t_pim_hello_timer) { @@ -78,7 +78,7 @@ static void sock_close(struct interface *ifp) ifp->name); } } - EVENT_OFF(pim_ifp->t_pim_hello_timer); + event_cancel(&pim_ifp->t_pim_hello_timer); if (PIM_DEBUG_PIM_TRACE) { zlog_debug("Deleting PIM socket fd=%d on interface %s", @@ -881,7 +881,7 @@ static void hello_resched(struct interface *ifp) zlog_debug("Rescheduling %d sec hello on interface %s", pim_ifp->pim_hello_period, ifp->name); } - EVENT_OFF(pim_ifp->t_pim_hello_timer); + event_cancel(&pim_ifp->t_pim_hello_timer); event_add_timer(router->master, on_pim_hello_send, ifp, pim_ifp->pim_hello_period, &pim_ifp->t_pim_hello_timer); } @@ -983,7 +983,7 @@ void pim_hello_restart_triggered(struct interface *ifp) return; } - EVENT_OFF(pim_ifp->t_pim_hello_timer); + event_cancel(&pim_ifp->t_pim_hello_timer); } random_msec = triggered_hello_delay_msec; diff --git a/pimd/pim_register.c b/pimd/pim_register.c index 29e658ef16..9b1c27df41 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -756,7 +756,7 @@ void pim_reg_del_on_couldreg_fail(struct interface *ifp) && (up->reg_state != PIM_REG_NOINFO)) { pim_channel_del_oif(up->channel_oil, pim->regiface, PIM_OIF_FLAG_PROTO_PIM, __func__); - EVENT_OFF(up->t_rs_timer); + event_cancel(&up->t_rs_timer); up->reg_state = PIM_REG_NOINFO; PIM_UPSTREAM_FLAG_UNSET_FHR(up->flags); } diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c index 5c04284a35..6a37b11886 100644 --- a/pimd/pim_ssmpingd.c +++ b/pimd/pim_ssmpingd.c @@ -205,7 +205,7 @@ static void ssmpingd_delete(struct ssmpingd_sock *ss) { assert(ss); - EVENT_OFF(ss->t_sock_read); + event_cancel(&ss->t_sock_read); if (close(ss->sock_fd)) { zlog_warn( diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index aed9d2be90..7b96cf2f53 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -167,10 +167,10 @@ static void upstream_channel_oil_detach(struct pim_upstream *up) static void pim_upstream_timers_stop(struct pim_upstream *up) { - EVENT_OFF(up->t_ka_timer); - EVENT_OFF(up->t_rs_timer); - EVENT_OFF(up->t_msdp_reg_timer); - EVENT_OFF(up->t_join_timer); + event_cancel(&up->t_ka_timer); + event_cancel(&up->t_rs_timer); + event_cancel(&up->t_msdp_reg_timer); + event_cancel(&up->t_join_timer); } struct pim_upstream *pim_upstream_del(struct pim_instance *pim, @@ -332,7 +332,7 @@ static void join_timer_stop(struct pim_upstream *up) { struct pim_neighbor *nbr = NULL; - EVENT_OFF(up->t_join_timer); + event_cancel(&up->t_join_timer); if (up->rpf.source_nexthop.interface) nbr = pim_neighbor_find(up->rpf.source_nexthop.interface, @@ -362,7 +362,7 @@ void join_timer_start(struct pim_upstream *up) if (nbr) pim_jp_agg_add_group(nbr->upstream_jp_agg, up, 1, nbr); else { - EVENT_OFF(up->t_join_timer); + event_cancel(&up->t_join_timer); event_add_timer(router->master, on_join_timer, up, router->t_periodic, &up->t_join_timer); } @@ -379,7 +379,7 @@ void join_timer_start(struct pim_upstream *up) void pim_upstream_join_timer_restart(struct pim_upstream *up, struct pim_rpf *old) { - // EVENT_OFF(up->t_join_timer); + // event_cancel(&up->t_join_timer); join_timer_start(up); } @@ -391,7 +391,7 @@ static void pim_upstream_join_timer_restart_msec(struct pim_upstream *up, __func__, interval_msec, up->sg_str); } - EVENT_OFF(up->t_join_timer); + event_cancel(&up->t_join_timer); event_add_timer_msec(router->master, on_join_timer, up, interval_msec, &up->t_join_timer); } @@ -1386,7 +1386,7 @@ static void pim_upstream_fhr_kat_expiry(struct pim_instance *pim, up->sg_str); /* stop reg-stop timer */ - EVENT_OFF(up->t_rs_timer); + event_cancel(&up->t_rs_timer); /* remove regiface from the OIL if it is there*/ pim_channel_del_oif(up->channel_oil, pim->regiface, PIM_OIF_FLAG_PROTO_PIM, __func__); @@ -1509,7 +1509,7 @@ void pim_upstream_keep_alive_timer_start(struct pim_upstream *up, uint32_t time) zlog_debug("kat start on %s with no stream reference", up->sg_str); } - EVENT_OFF(up->t_ka_timer); + event_cancel(&up->t_ka_timer); event_add_timer(router->master, pim_upstream_keep_alive_timer, up, time, &up->t_ka_timer); @@ -1760,7 +1760,7 @@ static void pim_upstream_start_register_stop_timer(struct pim_upstream *up) { uint32_t time; - EVENT_OFF(up->t_rs_timer); + event_cancel(&up->t_rs_timer); time = router->register_probe_time; @@ -1790,7 +1790,7 @@ void pim_upstream_start_register_probe_timer(struct pim_upstream *up) { uint32_t time; - EVENT_OFF(up->t_rs_timer); + event_cancel(&up->t_rs_timer); uint32_t lower = (0.5 * router->register_suppress_time); uint32_t upper = (1.5 * router->register_suppress_time); diff --git a/pimd/pim_vxlan.c b/pimd/pim_vxlan.c index 7c8d71a86c..d79aff27e4 100644 --- a/pimd/pim_vxlan.c +++ b/pimd/pim_vxlan.c @@ -239,7 +239,7 @@ void pim_vxlan_update_sg_reg_state(struct pim_instance *pim, zlog_debug("Received Register stop for %s", vxlan_sg->sg_str); - EVENT_OFF(vxlan_sg->null_register); + event_cancel(&vxlan_sg->null_register); pim_vxlan_del_work(vxlan_sg); } } @@ -253,7 +253,7 @@ static void pim_vxlan_work_timer_cb(struct event *t) /* global 1second timer used for periodic processing */ static void pim_vxlan_work_timer_setup(bool start) { - EVENT_OFF(vxlan_info.work_timer); + event_cancel(&vxlan_info.work_timer); if (start) event_add_timer(router->master, pim_vxlan_work_timer_cb, NULL, PIM_VXLAN_WORK_TIME, &vxlan_info.work_timer); @@ -300,7 +300,7 @@ static void pim_vxlan_orig_mr_up_del(struct pim_vxlan_sg *vxlan_sg) * if there are no other references. */ if (PIM_UPSTREAM_FLAG_TEST_SRC_STREAM(up->flags)) { - EVENT_OFF(up->t_ka_timer); + event_cancel(&up->t_ka_timer); up = pim_upstream_keep_alive_timer_proc(up); } else { /* this is really unexpected as we force vxlan @@ -842,7 +842,7 @@ static void pim_vxlan_sg_del_item(struct pim_vxlan_sg *vxlan_sg) { vxlan_sg->flags |= PIM_VXLAN_SGF_DEL_IN_PROG; - EVENT_OFF(vxlan_sg->null_register); + event_cancel(&vxlan_sg->null_register); pim_vxlan_del_work(vxlan_sg); if (pim_vxlan_is_orig_mroute(vxlan_sg)) diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index b8f73f9183..dead5bcc37 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -114,7 +114,7 @@ static void zclient_lookup_failed(struct zclient *zlookup) void zclient_lookup_free(void) { - EVENT_OFF(zlookup_read); + event_cancel(&zlookup_read); zclient_stop(pim_zlookup); zclient_free(pim_zlookup); pim_zlookup = NULL; diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 486d7b05c2..107155c795 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -383,7 +383,7 @@ static void rip_interface_clean(struct rip_interface *ri) ri->enable_interface = 0; ri->running = 0; - EVENT_OFF(ri->t_wakeup); + event_cancel(&ri->t_wakeup); } void rip_interfaces_clean(struct rip *rip) @@ -443,7 +443,7 @@ int rip_if_down(struct interface *ifp) ri = ifp->info; - EVENT_OFF(ri->t_wakeup); + event_cancel(&ri->t_wakeup); rip = ri->rip; if (rip) { diff --git a/ripd/rip_nb_rpcs.c b/ripd/rip_nb_rpcs.c index 5d3d7145b1..d746773204 100644 --- a/ripd/rip_nb_rpcs.c +++ b/ripd/rip_nb_rpcs.c @@ -51,8 +51,8 @@ static void clear_rip_route(struct rip *rip) } if (rinfo) { - EVENT_OFF(rinfo->t_timeout); - EVENT_OFF(rinfo->t_garbage_collect); + event_cancel(&rinfo->t_timeout); + event_cancel(&rinfo->t_garbage_collect); listnode_delete(list, rinfo); rip_info_free(rinfo); } diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c index 7e848bee47..46fa3ade32 100644 --- a/ripd/rip_peer.c +++ b/ripd/rip_peer.c @@ -27,7 +27,7 @@ static struct rip_peer *rip_peer_new(void) void rip_peer_free(struct rip_peer *peer) { bfd_sess_free(&peer->bfd_session); - EVENT_OFF(peer->t_timeout); + event_cancel(&peer->t_timeout); XFREE(MTYPE_RIP_PEER, peer); } @@ -74,7 +74,7 @@ static struct rip_peer *rip_peer_get(struct rip *rip, struct rip_interface *ri, peer = rip_peer_lookup(rip, addr); if (peer) { - EVENT_OFF(peer->t_timeout); + event_cancel(&peer->t_timeout); } else { peer = rip_peer_new(); peer->rip = rip; @@ -189,8 +189,8 @@ void rip_peer_delete_routes(const struct rip_peer *peer) continue; if (listcount(list) == 1) { - EVENT_OFF(route_entry->t_timeout); - EVENT_OFF(route_entry->t_garbage_collect); + event_cancel(&route_entry->t_timeout); + event_cancel(&route_entry->t_garbage_collect); listnode_delete(list, route_entry); if (list_isempty(list)) { list_delete((struct list **)&route_node diff --git a/ripd/ripd.c b/ripd/ripd.c index c850df52ec..1ba9b589d2 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -137,7 +137,7 @@ static void rip_garbage_collect(struct event *t) rinfo = EVENT_ARG(t); /* Off timeout timer. */ - EVENT_OFF(rinfo->t_timeout); + event_cancel(&rinfo->t_timeout); /* Get route_node pointer. */ rp = rinfo->rp; @@ -249,14 +249,14 @@ struct rip_info *rip_ecmp_replace(struct rip *rip, struct rip_info *rinfo_new) if (tmp_rinfo == rinfo) continue; - EVENT_OFF(tmp_rinfo->t_timeout); - EVENT_OFF(tmp_rinfo->t_garbage_collect); + event_cancel(&tmp_rinfo->t_timeout); + event_cancel(&tmp_rinfo->t_garbage_collect); list_delete_node(list, node); rip_info_free(tmp_rinfo); } - EVENT_OFF(rinfo->t_timeout); - EVENT_OFF(rinfo->t_garbage_collect); + event_cancel(&rinfo->t_timeout); + event_cancel(&rinfo->t_garbage_collect); memcpy(rinfo, rinfo_new, sizeof(struct rip_info)); if (rip_route_rte(rinfo)) { @@ -291,12 +291,12 @@ struct rip_info *rip_ecmp_delete(struct rip *rip, struct rip_info *rinfo) rp = rinfo->rp; list = (struct list *)rp->info; - EVENT_OFF(rinfo->t_timeout); + event_cancel(&rinfo->t_timeout); if (listcount(list) > 1) { /* Some other ECMP entries still exist. Just delete this entry. */ - EVENT_OFF(rinfo->t_garbage_collect); + event_cancel(&rinfo->t_garbage_collect); listnode_delete(list, rinfo); if (rip_route_rte(rinfo) && CHECK_FLAG(rinfo->flags, RIP_RTF_FIB)) @@ -342,7 +342,7 @@ static void rip_timeout(struct event *t) static void rip_timeout_update(struct rip *rip, struct rip_info *rinfo) { if (rinfo->metric != RIP_METRIC_INFINITY) { - EVENT_OFF(rinfo->t_timeout); + event_cancel(&rinfo->t_timeout); event_add_timer(master, rip_timeout, rinfo, rip->timeout_time, &rinfo->t_timeout); } @@ -687,8 +687,8 @@ static void rip_rte_process(struct rte *rte, struct sockaddr_in *from, assert(newinfo.metric != RIP_METRIC_INFINITY); - EVENT_OFF(rinfo->t_timeout); - EVENT_OFF(rinfo->t_garbage_collect); + event_cancel(&rinfo->t_timeout); + event_cancel(&rinfo->t_garbage_collect); memcpy(rinfo, &newinfo, sizeof(struct rip_info)); rip_timeout_update(rip, rinfo); @@ -1651,7 +1651,7 @@ void rip_redistribute_delete(struct rip *rip, int type, int sub_type, RIP_TIMER_ON(rinfo->t_garbage_collect, rip_garbage_collect, rip->garbage_time); - EVENT_OFF(rinfo->t_timeout); + event_cancel(&rinfo->t_timeout); rinfo->flags |= RIP_RTF_CHANGED; if (IS_RIP_DEBUG_EVENT) @@ -2542,7 +2542,7 @@ static void rip_update(struct event *t) /* Triggered updates may be suppressed if a regular update is due by the time the triggered update would be sent. */ - EVENT_OFF(rip->t_triggered_interval); + event_cancel(&rip->t_triggered_interval); rip->trigger = 0; /* Register myself. */ @@ -2589,7 +2589,7 @@ static void rip_triggered_update(struct event *t) int interval; /* Cancel interval timer. */ - EVENT_OFF(rip->t_triggered_interval); + event_cancel(&rip->t_triggered_interval); rip->trigger = 0; /* Logging triggered update. */ @@ -2639,7 +2639,7 @@ void rip_redistribute_withdraw(struct rip *rip, int type) rinfo->metric = RIP_METRIC_INFINITY; RIP_TIMER_ON(rinfo->t_garbage_collect, rip_garbage_collect, rip->garbage_time); - EVENT_OFF(rinfo->t_timeout); + event_cancel(&rinfo->t_timeout); rinfo->flags |= RIP_RTF_CHANGED; if (IS_RIP_DEBUG_EVENT) { @@ -2850,7 +2850,7 @@ void rip_event(struct rip *rip, enum rip_event event, int sock) event_add_read(master, rip_read, rip, sock, &rip->t_read); break; case RIP_UPDATE_EVENT: - EVENT_OFF(rip->t_update); + event_cancel(&rip->t_update); jitter = rip_update_jitter(rip->update_time); event_add_timer(master, rip_update, rip, sock ? 2 : rip->update_time + jitter, @@ -2975,8 +2975,8 @@ void rip_ecmp_disable(struct rip *rip) if (tmp_rinfo == rinfo) continue; - EVENT_OFF(tmp_rinfo->t_timeout); - EVENT_OFF(tmp_rinfo->t_garbage_collect); + event_cancel(&tmp_rinfo->t_timeout); + event_cancel(&tmp_rinfo->t_garbage_collect); list_delete_node(list, node); rip_info_free(tmp_rinfo); } @@ -3530,8 +3530,8 @@ static void rip_instance_disable(struct rip *rip) rip_zebra_ipv4_delete(rip, rp); for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) { - EVENT_OFF(rinfo->t_timeout); - EVENT_OFF(rinfo->t_garbage_collect); + event_cancel(&rinfo->t_timeout); + event_cancel(&rinfo->t_garbage_collect); rip_info_free(rinfo); } list_delete(&list); @@ -3543,12 +3543,12 @@ static void rip_instance_disable(struct rip *rip) rip_redistribute_disable(rip); /* Cancel RIP related timers. */ - EVENT_OFF(rip->t_update); - EVENT_OFF(rip->t_triggered_update); - EVENT_OFF(rip->t_triggered_interval); + event_cancel(&rip->t_update); + event_cancel(&rip->t_triggered_update); + event_cancel(&rip->t_triggered_interval); /* Cancel read thread. */ - EVENT_OFF(rip->t_read); + event_cancel(&rip->t_read); /* Close RIP socket. */ close(rip->sock); diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index 2b5d745bf4..a1ecdd6d2e 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -146,7 +146,7 @@ static int ripng_if_down(struct interface *ifp) ri = ifp->info; - EVENT_OFF(ri->t_wakeup); + event_cancel(&ri->t_wakeup); ripng = ri->ripng; @@ -267,7 +267,7 @@ void ripng_interface_clean(struct ripng *ripng) ri->enable_interface = 0; ri->running = 0; - EVENT_OFF(ri->t_wakeup); + event_cancel(&ri->t_wakeup); } } diff --git a/ripngd/ripng_nb_rpcs.c b/ripngd/ripng_nb_rpcs.c index 5498bbfc8e..0eae5738b2 100644 --- a/ripngd/ripng_nb_rpcs.c +++ b/ripngd/ripng_nb_rpcs.c @@ -53,8 +53,8 @@ static void clear_ripng_route(struct ripng *ripng) } if (rinfo) { - EVENT_OFF(rinfo->t_timeout); - EVENT_OFF(rinfo->t_garbage_collect); + event_cancel(&rinfo->t_timeout); + event_cancel(&rinfo->t_garbage_collect); listnode_delete(list, rinfo); ripng_info_free(rinfo); } diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c index 247bac4697..c745e363ff 100644 --- a/ripngd/ripng_peer.c +++ b/ripngd/ripng_peer.c @@ -29,7 +29,7 @@ static struct ripng_peer *ripng_peer_new(void) static void ripng_peer_free(struct ripng_peer *peer) { - EVENT_OFF(peer->t_timeout); + event_cancel(&peer->t_timeout); XFREE(MTYPE_RIPNG_PEER, peer); } @@ -79,7 +79,7 @@ static struct ripng_peer *ripng_peer_get(struct ripng *ripng, peer = ripng_peer_lookup(ripng, addr); if (peer) { - EVENT_OFF(peer->t_timeout); + event_cancel(&peer->t_timeout); } else { peer = ripng_peer_new(); peer->ripng = ripng; diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 0aa2a9e486..9e14f11f25 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -416,7 +416,7 @@ static void ripng_garbage_collect(struct event *t) rinfo = EVENT_ARG(t); /* Off timeout timer. */ - EVENT_OFF(rinfo->t_timeout); + event_cancel(&rinfo->t_timeout); /* Get route_node pointer. */ rp = rinfo->rp; @@ -563,14 +563,14 @@ struct ripng_info *ripng_ecmp_replace(struct ripng *ripng, /* Re-use the first entry, and delete the others. */ for (ALL_LIST_ELEMENTS(list, node, nextnode, tmp_rinfo)) if (tmp_rinfo != rinfo) { - EVENT_OFF(tmp_rinfo->t_timeout); - EVENT_OFF(tmp_rinfo->t_garbage_collect); + event_cancel(&tmp_rinfo->t_timeout); + event_cancel(&tmp_rinfo->t_garbage_collect); list_delete_node(list, node); ripng_info_free(tmp_rinfo); } - EVENT_OFF(rinfo->t_timeout); - EVENT_OFF(rinfo->t_garbage_collect); + event_cancel(&rinfo->t_timeout); + event_cancel(&rinfo->t_garbage_collect); memcpy(rinfo, rinfo_new, sizeof(struct ripng_info)); if (ripng_route_rte(rinfo)) { @@ -602,7 +602,7 @@ struct ripng_info *ripng_ecmp_delete(struct ripng *ripng, struct agg_node *rp = rinfo->rp; struct list *list = (struct list *)rp->info; - EVENT_OFF(rinfo->t_timeout); + event_cancel(&rinfo->t_timeout); if (rinfo->metric != RIPNG_METRIC_INFINITY) ripng_aggregate_decrement(rp, rinfo); @@ -610,7 +610,7 @@ struct ripng_info *ripng_ecmp_delete(struct ripng *ripng, if (listcount(list) > 1) { /* Some other ECMP entries still exist. Just delete this entry. */ - EVENT_OFF(rinfo->t_garbage_collect); + event_cancel(&rinfo->t_garbage_collect); listnode_delete(list, rinfo); if (ripng_route_rte(rinfo) && CHECK_FLAG(rinfo->flags, RIPNG_RTF_FIB)) @@ -656,7 +656,7 @@ static void ripng_timeout(struct event *t) static void ripng_timeout_update(struct ripng *ripng, struct ripng_info *rinfo) { if (rinfo->metric != RIPNG_METRIC_INFINITY) { - EVENT_OFF(rinfo->t_timeout); + event_cancel(&rinfo->t_timeout); event_add_timer(master, ripng_timeout, rinfo, ripng->timeout_time, &rinfo->t_timeout); } @@ -1064,7 +1064,7 @@ void ripng_redistribute_delete(struct ripng *ripng, int type, int sub_type, RIPNG_TIMER_ON(rinfo->t_garbage_collect, ripng_garbage_collect, ripng->garbage_time); - EVENT_OFF(rinfo->t_timeout); + event_cancel(&rinfo->t_timeout); /* Aggregate count decrement. */ ripng_aggregate_decrement(rp, rinfo); @@ -1103,7 +1103,7 @@ void ripng_redistribute_withdraw(struct ripng *ripng, int type) RIPNG_TIMER_ON(rinfo->t_garbage_collect, ripng_garbage_collect, ripng->garbage_time); - EVENT_OFF(rinfo->t_timeout); + event_cancel(&rinfo->t_timeout); /* Aggregate count decrement. */ ripng_aggregate_decrement(rp, rinfo); @@ -1487,7 +1487,7 @@ static void ripng_update(struct event *t) /* Triggered updates may be suppressed if a regular update is due by the time the triggered update would be sent. */ - EVENT_OFF(ripng->t_triggered_interval); + event_cancel(&ripng->t_triggered_interval); ripng->trigger = 0; /* Reset flush event. */ @@ -1514,7 +1514,7 @@ void ripng_triggered_update(struct event *t) int interval; /* Cancel interval timer. */ - EVENT_OFF(ripng->t_triggered_interval); + event_cancel(&ripng->t_triggered_interval); ripng->trigger = 0; /* Logging triggered update. */ @@ -1958,7 +1958,7 @@ void ripng_event(struct ripng *ripng, enum ripng_event event, int sock) event_add_read(master, ripng_read, ripng, sock, &ripng->t_read); break; case RIPNG_UPDATE_EVENT: - EVENT_OFF(ripng->t_update); + event_cancel(&ripng->t_update); /* Update timer jitter. */ jitter = ripng_update_jitter(ripng->update_time); @@ -2254,8 +2254,8 @@ void ripng_ecmp_disable(struct ripng *ripng) /* Drop all other entries, except the first one. */ for (ALL_LIST_ELEMENTS(list, node, nextnode, tmp_rinfo)) if (tmp_rinfo != rinfo) { - EVENT_OFF(tmp_rinfo->t_timeout); - EVENT_OFF(tmp_rinfo->t_garbage_collect); + event_cancel(&tmp_rinfo->t_timeout); + event_cancel(&tmp_rinfo->t_garbage_collect); list_delete_node(list, node); ripng_info_free(tmp_rinfo); } @@ -2532,8 +2532,8 @@ static void ripng_instance_disable(struct ripng *ripng) ripng_zebra_ipv6_delete(ripng, rp); for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) { - EVENT_OFF(rinfo->t_timeout); - EVENT_OFF(rinfo->t_garbage_collect); + event_cancel(&rinfo->t_timeout); + event_cancel(&rinfo->t_garbage_collect); ripng_info_free(rinfo); } list_delete(&list); @@ -2552,12 +2552,12 @@ static void ripng_instance_disable(struct ripng *ripng) ripng_redistribute_disable(ripng); /* Cancel the RIPng timers */ - EVENT_OFF(ripng->t_update); - EVENT_OFF(ripng->t_triggered_update); - EVENT_OFF(ripng->t_triggered_interval); + event_cancel(&ripng->t_update); + event_cancel(&ripng->t_triggered_update); + event_cancel(&ripng->t_triggered_interval); /* Cancel the read thread */ - EVENT_OFF(ripng->t_read); + event_cancel(&ripng->t_read); /* Close the RIPng socket */ if (ripng->sock >= 0) {