diff options
Diffstat (limited to 'ospf6d/ospf6_nssa.c')
| -rw-r--r-- | ospf6d/ospf6_nssa.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c index d62a3a6322..e7a10eba41 100644 --- a/ospf6d/ospf6_nssa.c +++ b/ospf6d/ospf6_nssa.c @@ -13,7 +13,7 @@ #include "vty.h" #include "linklist.h" #include "command.h" -#include "thread.h" +#include "frrevent.h" #include "plist.h" #include "filter.h" @@ -976,9 +976,9 @@ int ospf6_redistribute_check(struct ospf6 *ospf6, struct ospf6_route *route, } /* This function performs ABR related processing */ -static void ospf6_abr_task_timer(struct thread *thread) +static void ospf6_abr_task_timer(struct event *thread) { - struct ospf6 *ospf6 = THREAD_ARG(thread); + struct ospf6 *ospf6 = EVENT_ARG(thread); if (IS_OSPF6_DEBUG_ABR) zlog_debug("Running ABR task on timer"); @@ -992,7 +992,7 @@ static void ospf6_abr_task_timer(struct thread *thread) void ospf6_schedule_abr_task(struct ospf6 *ospf6) { - if (thread_is_scheduled(ospf6->t_abr_task)) { + if (event_is_scheduled(ospf6->t_abr_task)) { if (IS_OSPF6_DEBUG_ABR) zlog_debug("ABR task already scheduled"); return; @@ -1001,8 +1001,8 @@ void ospf6_schedule_abr_task(struct ospf6 *ospf6) if (IS_OSPF6_DEBUG_ABR) zlog_debug("Scheduling ABR task"); - thread_add_timer(master, ospf6_abr_task_timer, ospf6, - OSPF6_ABR_TASK_DELAY, &ospf6->t_abr_task); + event_add_timer(master, ospf6_abr_task_timer, ospf6, + OSPF6_ABR_TASK_DELAY, &ospf6->t_abr_task); } /* Flush the NSSA LSAs from the area */ @@ -1089,9 +1089,9 @@ static void ospf6_ase_lsa_refresh(struct ospf6 *o) route->path.origin.id, o->router_id, o->lsdb); if (old) { - THREAD_OFF(old->refresh); - thread_add_event(master, ospf6_lsa_refresh, old, 0, - &old->refresh); + EVENT_OFF(old->refresh); + event_add_event(master, ospf6_lsa_refresh, old, 0, + &old->refresh); } else { ospf6_as_external_lsa_originate(route, o); } @@ -1164,9 +1164,9 @@ void ospf6_area_nssa_update(struct ospf6_area *area) lsa)) { if (IS_OSPF6_DEBUG_NSSA) ospf6_lsa_header_print(lsa); - THREAD_OFF(lsa->refresh); - thread_add_event(master, ospf6_lsa_refresh, lsa, - 0, &lsa->refresh); + EVENT_OFF(lsa->refresh); + event_add_event(master, ospf6_lsa_refresh, lsa, + 0, &lsa->refresh); } } } @@ -1436,7 +1436,7 @@ DEFPY (no_area_nssa_range, SET_FLAG(range->flag, OSPF6_ROUTE_REMOVE); /* Redo summaries if required */ - thread_execute(master, ospf6_abr_task_timer, ospf6, 0); + event_execute(master, ospf6_abr_task_timer, ospf6, 0); } ospf6_route_remove(range, oa->nssa_range_table); |