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

Merge "res_pjsip_mwi: don't create mwi subscriptions if initial unsolicited disabled" into 13

Browse Source
This commit is contained in:
Jenkins2
2017-06-14 09:34:03 -05:00
committed by Gerrit Code Review
parent bc51d4324a 59c9bbe696
commit 44d4b55697
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_pjsip_mwi.c
View File

@@ -1278,7 +1278,9 @@ static struct ast_sorcery_observer global_observer = {
static int reload(void) static int reload(void)
{ {
create_mwi_subscriptions(); if (!ast_sip_get_mwi_disable_initial_unsolicited()) {
create_mwi_subscriptions();
}
return 0; return 0;
} }
@@ -1301,13 +1303,13 @@ static int load_module(void)
ast_sip_unregister_subscription_handler(&mwi_handler); ast_sip_unregister_subscription_handler(&mwi_handler);
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
create_mwi_subscriptions();
ast_sorcery_observer_add(ast_sip_get_sorcery(), "contact", &mwi_contact_observer); ast_sorcery_observer_add(ast_sip_get_sorcery(), "contact", &mwi_contact_observer);
ast_sorcery_observer_add(ast_sip_get_sorcery(), "global", &global_observer); ast_sorcery_observer_add(ast_sip_get_sorcery(), "global", &global_observer);
ast_sorcery_reload_object(ast_sip_get_sorcery(), "global"); ast_sorcery_reload_object(ast_sip_get_sorcery(), "global");
if (!ast_sip_get_mwi_disable_initial_unsolicited()) { if (!ast_sip_get_mwi_disable_initial_unsolicited()) {
create_mwi_subscriptions();
if (ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) { if (ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
ast_sip_push_task(NULL, send_initial_notify_all, NULL); ast_sip_push_task(NULL, send_initial_notify_all, NULL);
} else { } else {