diff options
Diffstat (limited to 'ospf6d/ospf6_intra.h')
| -rw-r--r-- | ospf6d/ospf6_intra.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/ospf6d/ospf6_intra.h b/ospf6d/ospf6_intra.h index 79b5eb0ed9..0f286f0ab1 100644 --- a/ospf6d/ospf6_intra.h +++ b/ospf6d/ospf6_intra.h @@ -139,32 +139,32 @@ struct ospf6_intra_prefix_lsa { #define OSPF6_ROUTER_LSA_SCHEDULE(oa) \ do { \ if (CHECK_FLAG((oa)->flag, OSPF6_AREA_ENABLE)) \ - thread_add_event(master, ospf6_router_lsa_originate, \ - oa, 0, &(oa)->thread_router_lsa); \ + event_add_event(master, ospf6_router_lsa_originate, \ + oa, 0, &(oa)->thread_router_lsa); \ } while (0) #define OSPF6_NETWORK_LSA_SCHEDULE(oi) \ do { \ if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE)) \ - thread_add_event(master, ospf6_network_lsa_originate, \ - oi, 0, &(oi)->thread_network_lsa); \ + event_add_event(master, ospf6_network_lsa_originate, \ + oi, 0, &(oi)->thread_network_lsa); \ } while (0) #define OSPF6_LINK_LSA_SCHEDULE(oi) \ do { \ if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE)) \ - thread_add_event(master, ospf6_link_lsa_originate, oi, \ - 0, &(oi)->thread_link_lsa); \ + event_add_event(master, ospf6_link_lsa_originate, oi, \ + 0, &(oi)->thread_link_lsa); \ } while (0) #define OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(oa) \ do { \ if (CHECK_FLAG((oa)->flag, OSPF6_AREA_ENABLE)) \ - thread_add_event( \ + event_add_event( \ master, ospf6_intra_prefix_lsa_originate_stub, \ oa, 0, &(oa)->thread_intra_prefix_lsa); \ } while (0) #define OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT(oi) \ do { \ if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE)) \ - thread_add_event( \ + event_add_event( \ master, \ ospf6_intra_prefix_lsa_originate_transit, oi, \ 0, &(oi)->thread_intra_prefix_lsa); \ @@ -173,42 +173,42 @@ struct ospf6_intra_prefix_lsa { #define OSPF6_AS_EXTERN_LSA_SCHEDULE(oi) \ do { \ if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE)) \ - thread_add_event(master, ospf6_orig_as_external_lsa, \ - oi, 0, &(oi)->thread_as_extern_lsa); \ + event_add_event(master, ospf6_orig_as_external_lsa, \ + oi, 0, &(oi)->thread_as_extern_lsa); \ } while (0) #define OSPF6_ROUTER_LSA_EXECUTE(oa) \ do { \ if (CHECK_FLAG((oa)->flag, OSPF6_AREA_ENABLE)) \ - thread_execute(master, ospf6_router_lsa_originate, oa, \ - 0); \ + event_execute(master, ospf6_router_lsa_originate, oa, \ + 0); \ } while (0) #define OSPF6_NETWORK_LSA_EXECUTE(oi) \ do { \ - THREAD_OFF((oi)->thread_network_lsa); \ - thread_execute(master, ospf6_network_lsa_originate, oi, 0); \ + EVENT_OFF((oi)->thread_network_lsa); \ + event_execute(master, ospf6_network_lsa_originate, oi, 0); \ } while (0) #define OSPF6_LINK_LSA_EXECUTE(oi) \ do { \ if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE)) \ - thread_execute(master, ospf6_link_lsa_originate, oi, \ - 0); \ + event_execute(master, ospf6_link_lsa_originate, oi, \ + 0); \ } while (0) #define OSPF6_INTRA_PREFIX_LSA_EXECUTE_TRANSIT(oi) \ do { \ - THREAD_OFF((oi)->thread_intra_prefix_lsa); \ - thread_execute(master, \ - ospf6_intra_prefix_lsa_originate_transit, oi, \ - 0); \ + EVENT_OFF((oi)->thread_intra_prefix_lsa); \ + event_execute(master, \ + ospf6_intra_prefix_lsa_originate_transit, oi, \ + 0); \ } while (0) #define OSPF6_AS_EXTERN_LSA_EXECUTE(oi) \ do { \ - THREAD_OFF((oi)->thread_as_extern_lsa); \ - thread_execute(master, ospf6_orig_as_external_lsa, oi, 0); \ + EVENT_OFF((oi)->thread_as_extern_lsa); \ + event_execute(master, ospf6_orig_as_external_lsa, oi, 0); \ } while (0) /* Function Prototypes */ @@ -220,14 +220,14 @@ extern char *ospf6_network_lsdesc_lookup(uint32_t router_id, struct ospf6_lsa *lsa); extern int ospf6_router_is_stub_router(struct ospf6_lsa *lsa); -extern void ospf6_router_lsa_originate(struct thread *thread); -extern void ospf6_network_lsa_originate(struct thread *thread); -extern void ospf6_link_lsa_originate(struct thread *thread); -extern void ospf6_intra_prefix_lsa_originate_transit(struct thread *thread); -extern void ospf6_intra_prefix_lsa_originate_stub(struct thread *thread); +extern void ospf6_router_lsa_originate(struct event *thread); +extern void ospf6_network_lsa_originate(struct event *thread); +extern void ospf6_link_lsa_originate(struct event *thread); +extern void ospf6_intra_prefix_lsa_originate_transit(struct event *thread); +extern void ospf6_intra_prefix_lsa_originate_stub(struct event *thread); extern void ospf6_intra_prefix_lsa_add(struct ospf6_lsa *lsa); extern void ospf6_intra_prefix_lsa_remove(struct ospf6_lsa *lsa); -extern void ospf6_orig_as_external_lsa(struct thread *thread); +extern void ospf6_orig_as_external_lsa(struct event *thread); extern void ospf6_intra_route_calculation(struct ospf6_area *oa); extern void ospf6_intra_brouter_calculation(struct ospf6_area *oa); extern void ospf6_intra_prefix_route_ecmp_path(struct ospf6_area *oa, |