diff options
| author | Mark Michelson <mmichelson@digium.com> | 2017-02-08 11:50:11 -0600 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2017-02-08 11:54:39 -0600 |
| commit | 46147a8f3013ba7fcf326e1b2d6e1b6c4ad68202 (patch) | |
| tree | 23d733aa23cb2994ee55dbb1cc5da8dd58e601e9 /res/res_pjsip/location.c | |
| parent | c72b4c98e8e7ef2d833178dea12d34298ffa194f (diff) | |
Revert "Update qualifies when AOR configuration changes."
This reverts commit 6492e91392b8fd394193e411c6eb64b45486093f.
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
Diffstat (limited to 'res/res_pjsip/location.c')
| -rw-r--r-- | res/res_pjsip/location.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/res/res_pjsip/location.c b/res/res_pjsip/location.c index cfe65b18e..5abfcabad 100644 --- a/res/res_pjsip/location.c +++ b/res/res_pjsip/location.c @@ -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; } |