kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 00:30:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

UDPTL: Backport some fixes from v12 that should be in v11.

Browse Source 
Backported the following as applied to udptl.c:
* -r398020 Fixup udpdl defaults if config file not present.
* -r398533 Fixup improper use of ao2_global_obj_replace().


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@399442 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-09-18 23:36:12 +00:00
parent 0ca5aec494
commit 9a0537cc98
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/udptl.c
View File

@@ -1419,14 +1419,17 @@ static int removed_options_handler(const struct aco_option *opt, struct ast_vari
static void __ast_udptl_reload(int reload) static void __ast_udptl_reload(int reload)
{ {
RAII_VAR(struct udptl_config *, udptl_cfg, udptl_snapshot_alloc(), ao2_cleanup);
if (aco_process_config(&cfg_info, reload) == ACO_PROCESS_ERROR) { if (aco_process_config(&cfg_info, reload) == ACO_PROCESS_ERROR) {
if (!reload) { if (!reload) {
if (!aco_set_defaults(&general_option, "general", udptl_cfg->general)) { RAII_VAR(struct udptl_config *, udptl_cfg, udptl_snapshot_alloc(), ao2_cleanup);
ast_log(LOG_WARNING, "Could not load udptl config; using defaults\n");
ao2_global_obj_replace(globals, udptl_cfg); if (aco_set_defaults(&general_option, "general", udptl_cfg->general)) {
ast_log(LOG_ERROR, "Failed to load udptl.conf and failed to initialize defaults.\n");
return;
} }
ast_log(LOG_NOTICE, "Could not load udptl config; using defaults\n");
ao2_global_obj_replace_unref(globals, udptl_cfg);
} }
} }
} }