PJSIP: Stagger outbound qualifies
This change staggers initiation of outbound qualify (OPTIONS) attempts to reduce instantaneous server load and prevent network congestion. Review: https://reviewboard.asterisk.org/r/4246/ ASTERISK-24342 #close Reported by: Richard Mudgett ........ Merged revisions 429127 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 429128 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429129 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
fe6cbf455a
commit
b6e18cae5c
|
@ -418,14 +418,14 @@ static int qualify_contact_sched(const void *obj)
|
||||||
* up the data object ref between self deletion and an external
|
* up the data object ref between self deletion and an external
|
||||||
* deletion.
|
* deletion.
|
||||||
*/
|
*/
|
||||||
return 1;
|
return data->contact->qualify_frequency * 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \internal
|
* \internal
|
||||||
* \brief Set up a scheduled qualify contact check.
|
* \brief Set up a scheduled qualify contact check.
|
||||||
*/
|
*/
|
||||||
static void schedule_qualify(struct ast_sip_contact *contact)
|
static void schedule_qualify(struct ast_sip_contact *contact, int initial_interval)
|
||||||
{
|
{
|
||||||
struct sched_data *data;
|
struct sched_data *data;
|
||||||
|
|
||||||
|
@ -437,8 +437,8 @@ static void schedule_qualify(struct ast_sip_contact *contact)
|
||||||
ast_assert(contact->qualify_frequency != 0);
|
ast_assert(contact->qualify_frequency != 0);
|
||||||
|
|
||||||
ao2_t_ref(data, +1, "Ref for qualify_contact_sched() scheduler entry");
|
ao2_t_ref(data, +1, "Ref for qualify_contact_sched() scheduler entry");
|
||||||
data->id = ast_sched_add_variable(sched, contact->qualify_frequency * 1000,
|
data->id = ast_sched_add_variable(sched, initial_interval,
|
||||||
qualify_contact_sched, data, 0);
|
qualify_contact_sched, data, 1);
|
||||||
if (data->id < 0) {
|
if (data->id < 0) {
|
||||||
ao2_t_ref(data, -1, "Cleanup failed scheduler add");
|
ao2_t_ref(data, -1, "Cleanup failed scheduler add");
|
||||||
ast_log(LOG_ERROR, "Unable to schedule qualify for contact %s\n",
|
ast_log(LOG_ERROR, "Unable to schedule qualify for contact %s\n",
|
||||||
|
@ -482,7 +482,7 @@ static void qualify_and_schedule(struct ast_sip_contact *contact)
|
||||||
ao2_ref(contact, -1);
|
ao2_ref(contact, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
schedule_qualify(contact);
|
schedule_qualify(contact, contact->qualify_frequency * 1000);
|
||||||
} else {
|
} else {
|
||||||
delete_contact_status(contact);
|
delete_contact_status(contact);
|
||||||
}
|
}
|
||||||
|
@ -951,11 +951,16 @@ static int qualify_and_schedule_cb(void *obj, void *arg, int flags)
|
||||||
{
|
{
|
||||||
struct ast_sip_contact *contact = obj;
|
struct ast_sip_contact *contact = obj;
|
||||||
struct ast_sip_aor *aor = arg;
|
struct ast_sip_aor *aor = arg;
|
||||||
|
int initial_interval;
|
||||||
|
|
||||||
contact->qualify_frequency = aor->qualify_frequency;
|
contact->qualify_frequency = aor->qualify_frequency;
|
||||||
contact->authenticate_qualify = aor->authenticate_qualify;
|
contact->authenticate_qualify = aor->authenticate_qualify;
|
||||||
|
|
||||||
qualify_and_schedule(contact);
|
/* Delay initial qualification by a random fraction of the specified interval */
|
||||||
|
initial_interval = contact->qualify_frequency * 1000;
|
||||||
|
initial_interval = (int)(initial_interval * ast_random_double());
|
||||||
|
|
||||||
|
schedule_qualify(contact, initial_interval);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue