kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-04-26 16:52:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip_config_wizard: Trigger reloads from a pjsip servant thread

Browse Source 
When res_pjsip is reloaded directly, it does the sorcery reload in a pjsip
servant thread as it's supposed to.  res_pjsip_config_wizard however
was not which was leading to occasional deadlocks.  It now does the reload
in a servant thread just like res_pjsip.

Resolves: #1855
This commit is contained in:
George Joseph
2026-04-07 08:36:34 -06:00
parent 727e3f22e3
commit 82cf46fefb
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/res_pjsip_config_wizard.c
View File

@@ -1331,9 +1331,26 @@ static struct ast_cli_entry config_wizard_cli[] = {
AST_CLI_DEFINE(handle_export_primitives, "Export config wizard primitives"),
};
/*!
* \internal
* \brief Reload configuration within a PJSIP thread
*/
static int reload_configuration_task(void *obj)
{
struct ast_sorcery *sip_sorcery = ast_sip_get_sorcery();
if (sip_sorcery) {
ast_sorcery_reload(sip_sorcery);
}
return 0;
}
static int reload_module(void)
{
ast_sorcery_reload(ast_sip_get_sorcery());
if (ast_sip_push_task_wait_servant(NULL, reload_configuration_task, NULL)) {
ast_log(LOG_WARNING, "Failed to reload PJSIP\n");
return -1;
}
return 0;
}