*: Convert event.h to frrevent.h

[mirror_frr.git] / ospfd / ospf_gr_helper.c

diff --git a/ospfd/ospf_gr_helper.c b/ospfd/ospf_gr_helper.c
index 0263df48c5c7394e40a64c585a7a8a6533ba8dc3..b97b6802b2feb7b459e17e477bc99965b054e2cf 100644 (file)
--- a/ospfd/ospf_gr_helper.c
+++ b/ospfd/ospf_gr_helper.c
@@ -8,7 +8,7 @@
 
 #include <zebra.h>
 
-#include "thread.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "linklist.h"
 #include "prefix.h"
@@ -99,9 +99,7 @@ static void ospf_enable_rtr_hash_destroy(struct ospf *ospf)
        if (ospf->enable_rtr_list == NULL)
                return;
 
-       hash_clean(ospf->enable_rtr_list, ospf_disable_rtr_hash_free);
-       hash_free(ospf->enable_rtr_list);
-       ospf->enable_rtr_list = NULL;
+       hash_clean_and_free(&ospf->enable_rtr_list, ospf_disable_rtr_hash_free);
 }
 
 /*
@@ -331,9 +329,9 @@ static int ospf_extract_grace_lsa_fields(struct ospf_lsa *lsa,
  * Returns:
  *    Nothing
  */
-static void ospf_handle_grace_timer_expiry(struct thread *thread)
+static void ospf_handle_grace_timer_expiry(struct event *thread)
 {
-       struct ospf_neighbor *nbr = THREAD_ARG(thread);
+       struct ospf_neighbor *nbr = EVENT_ARG(thread);
 
        nbr->gr_helper_info.t_grace_timer = NULL;
 
@@ -502,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)
-                       THREAD_OFF(restarter->gr_helper_info.t_grace_timer);
+                       EVENT_OFF(restarter->gr_helper_info.t_grace_timer);
 
                if (ospf->active_restarter_cnt > 0)
                        ospf->active_restarter_cnt--;
@@ -535,9 +533,9 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
                           actual_grace_interval);
 
        /* Start the grace timer */
-       thread_add_timer(master, ospf_handle_grace_timer_expiry, restarter,
-                        actual_grace_interval,
-                        &restarter->gr_helper_info.t_grace_timer);
+       event_add_timer(master, ospf_handle_grace_timer_expiry, restarter,
+                       actual_grace_interval,
+                       &restarter->gr_helper_info.t_grace_timer);
 
        return OSPF_GR_ACTIVE_HELPER;
 }
@@ -701,7 +699,7 @@ void ospf_gr_helper_exit(struct ospf_neighbor *nbr,
         * expiry, stop the grace timer.
         */
        if (reason != OSPF_GR_HELPER_GRACE_TIMEOUT)
-               THREAD_OFF(nbr->gr_helper_info.t_grace_timer);
+               EVENT_OFF(nbr->gr_helper_info.t_grace_timer);
 
        /* check exit triggered due to successful completion
         * of graceful restart.