diff options
| author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-23 06:56:26 +0000 |
|---|---|---|
| committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-23 06:56:26 +0000 |
| commit | a7eee02f0c95cc567bc491687a389572d4c76238 (patch) | |
| tree | 3c7028e5fff0c6d73abc21fafbb3a675dc9b3e52 /channels/chan_h323.c | |
| parent | af01b998e166ba200b112d5467dc4ec651a8fc94 (diff) | |
Merged revisions 51615 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51615 | pcadach | 2007-01-22 22:51:51 -0800 (Пнд, 22 Янв 2007) | 1 line
Do not abort Asterisk startup if h323 configuration file not found (reported by mithraen)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@51623 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_h323.c')
| -rw-r--r-- | channels/chan_h323.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 80313279b..5de07ab24 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -3201,13 +3201,17 @@ static enum ast_module_load_result load_module(void) ASTOBJ_CONTAINER_INIT(&aliasl); res = reload_config(0); if (res) { + /* No config entry */ + ast_log(LOG_NOTICE, "Unload and load chan_h323.so again in order to receive configuration changes.\n"); ast_cli_unregister(&cli_h323_reload); io_context_destroy(io); + io = NULL; sched_context_destroy(sched); + sched = NULL; ASTOBJ_CONTAINER_DESTROY(&userl); ASTOBJ_CONTAINER_DESTROY(&peerl); ASTOBJ_CONTAINER_DESTROY(&aliasl); - return /*AST_MODULE_LOAD_DECLINE*/AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } else { /* Make sure we can register our channel type */ if (ast_channel_register(&oh323_tech)) { @@ -3338,8 +3342,10 @@ static int unload_module(void) if (!gatekeeper_disable) h323_gk_urq(); h323_end_process(); - io_context_destroy(io); - sched_context_destroy(sched); + if (io) + io_context_destroy(io); + if (sched) + sched_context_destroy(sched); ASTOBJ_CONTAINER_DESTROYALL(&userl, oh323_destroy_user); ASTOBJ_CONTAINER_DESTROY(&userl); |