diff options
| author | Jafar Al-Gharaibeh <jafar@atcorp.com> | 2023-03-24 13:48:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-24 13:48:53 -0500 |
| commit | 06f54ff416e63149f5b2bd770204472f1ea31ee5 (patch) | |
| tree | 661878796771e1b37f5388d8c0057b7e4c1e7c33 /pathd/pathd.c | |
| parent | d54d0ead76ade4c8abaf223d1775d8eff3564f1e (diff) | |
| parent | 02e701e49e90e7b0f2d9332b54210507f965669f (diff) | |
Merge pull request #12953 from donaldsharp/struct_event
Struct event
Diffstat (limited to 'pathd/pathd.c')
| -rw-r--r-- | pathd/pathd.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pathd/pathd.c b/pathd/pathd.c index 86501f7ad8..6c13503c7d 100644 --- a/pathd/pathd.c +++ b/pathd/pathd.c @@ -45,9 +45,9 @@ struct debug path_policy_debug; static void trigger_pathd_candidate_created(struct srte_candidate *candidate); -static void trigger_pathd_candidate_created_timer(struct thread *thread); +static void trigger_pathd_candidate_created_timer(struct event *thread); static void trigger_pathd_candidate_updated(struct srte_candidate *candidate); -static void trigger_pathd_candidate_updated_timer(struct thread *thread); +static void trigger_pathd_candidate_updated_timer(struct event *thread); static void trigger_pathd_candidate_removed(struct srte_candidate *candidate); static const char * srte_candidate_metric_name(enum srte_candidate_metric_type type); @@ -1293,13 +1293,13 @@ void trigger_pathd_candidate_created(struct srte_candidate *candidate) from changing the candidate by hand with the console */ if (candidate->hook_timer != NULL) return; - thread_add_timer(master, trigger_pathd_candidate_created_timer, - (void *)candidate, HOOK_DELAY, &candidate->hook_timer); + event_add_timer(master, trigger_pathd_candidate_created_timer, + (void *)candidate, HOOK_DELAY, &candidate->hook_timer); } -void trigger_pathd_candidate_created_timer(struct thread *thread) +void trigger_pathd_candidate_created_timer(struct event *thread) { - struct srte_candidate *candidate = THREAD_ARG(thread); + struct srte_candidate *candidate = EVENT_ARG(thread); candidate->hook_timer = NULL; hook_call(pathd_candidate_created, candidate); } @@ -1313,13 +1313,13 @@ void trigger_pathd_candidate_updated(struct srte_candidate *candidate) from changing the candidate by hand with the console */ if (candidate->hook_timer != NULL) return; - thread_add_timer(master, trigger_pathd_candidate_updated_timer, - (void *)candidate, HOOK_DELAY, &candidate->hook_timer); + event_add_timer(master, trigger_pathd_candidate_updated_timer, + (void *)candidate, HOOK_DELAY, &candidate->hook_timer); } -void trigger_pathd_candidate_updated_timer(struct thread *thread) +void trigger_pathd_candidate_updated_timer(struct event *thread) { - struct srte_candidate *candidate = THREAD_ARG(thread); + struct srte_candidate *candidate = EVENT_ARG(thread); candidate->hook_timer = NULL; hook_call(pathd_candidate_updated, candidate); } @@ -1329,7 +1329,7 @@ void trigger_pathd_candidate_removed(struct srte_candidate *candidate) /* The hook needs to be call synchronously, otherwise the candidate path will be already deleted when the handler is called */ if (candidate->hook_timer != NULL) { - thread_cancel(&candidate->hook_timer); + event_cancel(&candidate->hook_timer); candidate->hook_timer = NULL; } hook_call(pathd_candidate_removed, candidate); |