sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "pjsip_options: contacts sometimes not being updated on reload"

This commit is contained in:
Kevin Harwell 2017-12-13 16:50:56 -06:00 committed by Gerrit Code Review
parent 588be919cb 0e4d31eb9c
commit 30954337a0
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
res/res_pjsip/pjsip_options.c
View File

@ -1192,32 +1192,21 @@ static int qualify_and_schedule_all_cb(void *obj, void *arg, int flags)
return 0;
}
/*!
* \internal
* \brief Unschedule all existing contacts
*/
static int unschedule_all_cb(void *obj, void *arg, int flags)
{
struct sched_data *data = obj;
AST_SCHED_DEL_UNREF(sched, data->id, ao2_ref(data, -1));
return CMP_MATCH;
}
static void qualify_and_schedule_all(void)
{
struct ast_variable *var = ast_variable_new("qualify_frequency >", "0", "");
struct ao2_container *aors;
struct ao2_container *contacts;
if (!var) {
return;
}
aors = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(),
"aor", AST_RETRIEVE_FLAG_MULTIPLE, var);
/*
* It's possible that the AOR had some of it's fields updated prior to a
* reload. For instance qualifying could have been turned on or off by
* setting the qualify_frequency. Due to this we have to iterate through
* all contacts (static and dynamic), and not just ones where the frequency
* is greater than zero, updating any contact fields with the AOR's values.
*/
ao2_callback(sched_qualifies, OBJ_NODATA | OBJ_MULTIPLE | OBJ_UNLINK, unschedule_all_cb, NULL);
aors = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(),
"aor", AST_RETRIEVE_FLAG_MULTIPLE | AST_RETRIEVE_FLAG_ALL, NULL);
if (aors) {
ao2_callback(aors, OBJ_NODATA, qualify_and_schedule_all_cb, NULL);
@ -1225,14 +1214,11 @@ static void qualify_and_schedule_all(void)
}
contacts = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(),
"contact", AST_RETRIEVE_FLAG_MULTIPLE, var);
"contact", AST_RETRIEVE_FLAG_MULTIPLE | AST_RETRIEVE_FLAG_ALL, NULL);
if (contacts) {
ao2_callback(contacts, OBJ_NODATA, qualify_and_schedule_cb_without_aor, NULL);
ao2_ref(contacts, -1);
}
ast_variables_destroy(var);
}
int ast_sip_format_contact_ami(void *obj, void *arg, int flags)