kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "pjsip_options.c: Allow immediate qualifies for new contacts." into 16

Browse Source
This commit is contained in:
Joshua Colp
2019-05-13 14:14:45 -05:00
committed by Gerrit Code Review
parent 9a0fa51443 941dead08d
commit cf2f8db1b7
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
res/res_pjsip/pjsip_options.c
View File

@@ -2100,30 +2100,31 @@ static int sip_options_contact_add_task(void *obj)
ao2_cleanup(contact_status);
if (task_data->aor_options->qualify_frequency) {
/* If this is the first contact we need to schedule up qualification */
if (ao2_container_count(task_data->aor_options->contacts) == 1) {
ast_debug(3, "Starting scheduled callback on AOR '%s' for qualifying as there is now a contact on it\n",
/* There will always be a contact here, and we need to immediately schedule
* a qualify so that contacts are not waiting for the qualify_frequency
* timer duration before qualifying.
*/
ast_debug(3, "Starting scheduled callback on AOR '%s' for qualifying as there is now a contact on it\n",
task_data->aor_options->name);
/*
* We immediately schedule the initial qualify so that we get
* reachable/unreachable as soon as possible. Realistically
* since they pretty much just registered they should be
* reachable.
*/
if (task_data->aor_options->sched_task) {
ast_sip_sched_task_cancel(task_data->aor_options->sched_task);
ao2_ref(task_data->aor_options->sched_task, -1);
task_data->aor_options->sched_task = NULL;
}
task_data->aor_options->sched_task = ast_sip_schedule_task(
task_data->aor_options->serializer, 1, sip_options_qualify_aor,
ast_taskprocessor_name(task_data->aor_options->serializer),
task_data->aor_options,
AST_SIP_SCHED_TASK_VARIABLE | AST_SIP_SCHED_TASK_DATA_AO2);
if (!task_data->aor_options->sched_task) {
ast_log(LOG_ERROR, "Unable to schedule qualify for contacts of AOR '%s'\n",
task_data->aor_options->name);
/*
* We immediately schedule the initial qualify so that we get
* reachable/unreachable as soon as possible. Realistically
* since they pretty much just registered they should be
* reachable.
*/
if (task_data->aor_options->sched_task) {
ast_sip_sched_task_cancel(task_data->aor_options->sched_task);
ao2_ref(task_data->aor_options->sched_task, -1);
task_data->aor_options->sched_task = NULL;
}
task_data->aor_options->sched_task = ast_sip_schedule_task(
task_data->aor_options->serializer, 1, sip_options_qualify_aor,
ast_taskprocessor_name(task_data->aor_options->serializer),
task_data->aor_options,
AST_SIP_SCHED_TASK_VARIABLE | AST_SIP_SCHED_TASK_DATA_AO2);
if (!task_data->aor_options->sched_task) {
ast_log(LOG_ERROR, "Unable to schedule qualify for contacts of AOR '%s'\n",
task_data->aor_options->name);
}
}
} else {
/*