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

Move where the sorcery observer is added for qualify to guarantee the sched_qualifies container exists.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2013-06-25 19:10:14 +00:00
parent a1e219ef51
commit ea948c69d3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/res_sip/sip_options.c
View File

@@ -688,11 +688,6 @@ int ast_sip_initialize_sorcery_qualify(struct ast_sorcery *sorcery)
ast_sorcery_object_field_register(sorcery, CONTACT_STATUS, "rtt", "0", OPT_UINT_T, ast_sorcery_object_field_register(sorcery, CONTACT_STATUS, "rtt", "0", OPT_UINT_T,
1, FLDSET(struct ast_sip_contact_status, rtt)); 1, FLDSET(struct ast_sip_contact_status, rtt));
if (ast_sorcery_observer_add(sorcery, "contact", &contact_observer)) {
ast_log(LOG_WARNING, "Unable to add contact observer\n");
return -1;
}
return 0; return 0;
} }
@@ -777,6 +772,11 @@ int ast_res_sip_init_options_handling(int reload)
return -1; return -1;
} }
if (ast_sorcery_observer_add(ast_sip_get_sorcery(), "contact", &contact_observer)) {
ast_log(LOG_WARNING, "Unable to add contact observer\n");
return -1;
}
qualify_and_schedule_permanent(); qualify_and_schedule_permanent();
ast_cli_register_multiple(cli_options, ARRAY_LEN(cli_options)); ast_cli_register_multiple(cli_options, ARRAY_LEN(cli_options));