diff options
| author | Mark Stapp <mjs@labn.net> | 2023-07-11 16:03:38 -0400 |
|---|---|---|
| committer | Mark Stapp <mjs@labn.net> | 2023-07-25 10:17:48 -0400 |
| commit | adca5c22c573f17b09b96a0994953c8f643fd301 (patch) | |
| tree | 84894373c496a0279b3fc5eb944803c53bcb6c34 /ospf6d/ospf6_intra.h | |
| parent | 9e32b73634a8bbe893f2425ee89ee27651d93408 (diff) | |
* : include event ptr in event_execute api
Include an event ptr-to-ptr in the event_execute() api
call, like the various schedule api calls. This allows the
execute() api to cancel an existing scheduled task if that
task is being executed inline.
Signed-off-by: Mark Stapp <mjs@labn.net>
Diffstat (limited to 'ospf6d/ospf6_intra.h')
| -rw-r--r-- | ospf6d/ospf6_intra.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ospf6d/ospf6_intra.h b/ospf6d/ospf6_intra.h index 0f286f0ab1..7d154cb4c6 100644 --- a/ospf6d/ospf6_intra.h +++ b/ospf6d/ospf6_intra.h @@ -181,20 +181,21 @@ struct ospf6_intra_prefix_lsa { do { \ if (CHECK_FLAG((oa)->flag, OSPF6_AREA_ENABLE)) \ event_execute(master, ospf6_router_lsa_originate, oa, \ - 0); \ + 0, NULL); \ } while (0) #define OSPF6_NETWORK_LSA_EXECUTE(oi) \ do { \ EVENT_OFF((oi)->thread_network_lsa); \ - event_execute(master, ospf6_network_lsa_originate, oi, 0); \ + event_execute(master, ospf6_network_lsa_originate, oi, 0, \ + NULL); \ } while (0) #define OSPF6_LINK_LSA_EXECUTE(oi) \ do { \ if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE)) \ event_execute(master, ospf6_link_lsa_originate, oi, \ - 0); \ + 0, NULL); \ } while (0) #define OSPF6_INTRA_PREFIX_LSA_EXECUTE_TRANSIT(oi) \ @@ -202,13 +203,13 @@ struct ospf6_intra_prefix_lsa { EVENT_OFF((oi)->thread_intra_prefix_lsa); \ event_execute(master, \ ospf6_intra_prefix_lsa_originate_transit, oi, \ - 0); \ + 0, NULL); \ } while (0) #define OSPF6_AS_EXTERN_LSA_EXECUTE(oi) \ do { \ EVENT_OFF((oi)->thread_as_extern_lsa); \ - event_execute(master, ospf6_orig_as_external_lsa, oi, 0); \ + event_execute(master, ospf6_orig_as_external_lsa, oi, 0, NULL);\ } while (0) /* Function Prototypes */ |