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 2a3df5aa22
commit cbc23c31cf
5 changed files with 10 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_pjsip/location.c
View File

@@ -1144,12 +1144,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)
{
@@ -1166,7 +1160,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;
}