kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update qualifies when AOR configuration changes."

Browse Source 
This reverts commit 6492e91392.

The change in question was intended to prevent the need to reload in
order to update qualifies on contacts when an AOR changes. However, this
ended up causing a deadlock instead.

Change-Id: I1a835c90a5bb65b6dc3a1e94cddc12a4afc3d71e
This commit is contained in:
Mark Michelson
2017-02-08 11:50:11 -06:00
parent c72b4c98e8
commit 46147a8f30
5 changed files with 10 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/res_pjsip.c
View File

@@ -4382,6 +4382,7 @@ AST_TEST_DEFINE(xml_sanitization_exceeds_buffer)
static int reload_configuration_task(void *obj)
{
ast_res_pjsip_reload_configuration();
ast_res_pjsip_init_options_handling(1);
ast_sip_initialize_dns();
return 0;
}

12
res/res_pjsip/include/res_pjsip_private.h
View File

@@ -183,18 +183,6 @@ void ast_sip_destroy_global_headers(void);
*/
int ast_res_pjsip_init_options_handling(int reload);
/*!
* \internal
* \brief Indicate OPTIONS handling for this AOR needs updating.
*
* When AOR configuration is retrieved, it is possible that the
* qualify frequency has changed. The OPTIONs code needs to update
* its qualifies to reflect these changes.
*
* \param aor The AOR that has been retrieved
*/
void ast_res_pjsip_update_options(struct ast_sip_aor *aor);
/*!
* \internal Initialize message IP updating handling.
*

8
res/res_pjsip/location.c
View File

@@ -1137,12 +1137,6 @@ static int contact_apply_handler(const struct ast_sorcery *sorcery, void *object
return status ? 0 : -1;
}
static int aor_apply_handler(const struct ast_sorcery *sorcery, void *object)
{
ast_res_pjsip_update_options(object);
return 0;
}
/*! \brief Initialize sorcery with location support */
int ast_sip_initialize_sorcery_location(void)
{
@@ -1159,7 +1153,7 @@ int ast_sip_initialize_sorcery_location(void)
ast_sorcery_apply_default(sorcery, "aor", "config", "pjsip.conf,criteria=type=aor");
if (ast_sorcery_object_register(sorcery, "contact", contact_alloc, NULL, contact_apply_handler) ||
ast_sorcery_object_register(sorcery, "aor", aor_alloc, NULL, aor_apply_handler)) {
ast_sorcery_object_register(sorcery, "aor", aor_alloc, NULL, NULL)) {
return -1;
}

45
res/res_pjsip/pjsip_options.c
View File

@@ -518,18 +518,6 @@ static int qualify_contact_task(void *obj)
static int qualify_contact_sched(const void *obj)
{
struct sched_data *data = (struct sched_data *) obj;
struct ast_sip_aor *aor;
/* This helps us to determine if an AOR has been removed
* from configuration, and if so, stop qualifying the
* contact
*/
aor = ast_sip_location_retrieve_aor(data->contact->aor);
if (!aor) {
ao2_ref(data, -1);
return 0;
}
ao2_ref(aor, -1);
ao2_ref(data->contact, +1);
if (ast_sip_push_task(NULL, qualify_contact_task, data->contact)) {
@@ -1176,10 +1164,12 @@ static int qualify_and_schedule_all_cb(void *obj, void *arg, int flags)
struct ast_sip_aor *aor = obj;
struct ao2_container *contacts;
contacts = ast_sip_location_retrieve_aor_contacts(aor);
if (contacts) {
ao2_callback(contacts, OBJ_NODATA, qualify_and_schedule_cb_with_aor, aor);
ao2_ref(contacts, -1);
if (aor->permanent_contacts) {
contacts = ast_sip_location_retrieve_aor_contacts(aor);
if (contacts) {
ao2_callback(contacts, OBJ_NODATA, qualify_and_schedule_cb_with_aor, aor);
ao2_ref(contacts, -1);
}
}
return 0;
@@ -1506,29 +1496,6 @@ int ast_res_pjsip_init_options_handling(int reload)
return 0;
}
static int unschedule_for_aor_cb(void *obj, void *arg, int flags)
{
struct sched_data *data = obj;
struct ast_sip_aor *aor = arg;
if (!strcmp(ast_sorcery_object_get_id(aor), data->contact->aor)) {
AST_SCHED_DEL_UNREF(sched, data->id, ao2_ref(data, -1));
}
return 0;
}
void ast_res_pjsip_update_options(struct ast_sip_aor *aor)
{
/* This can happen if an AOR is created and applied before OPTIONs code has been initialized */
if (!sched_qualifies) {
return;
}
ao2_callback(sched_qualifies, OBJ_NODATA | OBJ_UNLINK, unschedule_for_aor_cb, aor);
qualify_and_schedule_all_cb(aor, NULL, 0);
}
void ast_res_pjsip_cleanup_options_handling(void)
{
ast_cli_unregister_multiple(cli_options, ARRAY_LEN(cli_options));

2
res/res_pjsip_registrar.c
View File

@@ -456,6 +456,8 @@ static int register_aor_core(pjsip_rx_data *rdata,
}
contact_update->expiration_time = ast_tvadd(ast_tvnow(), ast_samp2tv(expiration, 1));
contact_update->qualify_frequency = aor->qualify_frequency;
contact_update->authenticate_qualify = aor->authenticate_qualify;
if (path_str) {
ast_string_field_set(contact_update, path, ast_str_buffer(path_str));
}