res_cdrel_custom: do not free config when no new config was loaded

When the res_cdrel_custom modules is reloaded and the config has not been changed asterisk should not free the old config. Otherwise the connection to the database will be closed and no new connection will be opened.

Resolves: #1852

diff --git a/res/cdrel_custom/config.c b/res/cdrel_custom/config.c
index 49543df3d289e12731b10fcb7715ac17f5c54b13..1017e1de5ebcafd997665290f43fd8d183872cb3 100644 (file)
--- a/res/cdrel_custom/config.c
+++ b/res/cdrel_custom/config.c
@@ -1053,7 +1053,7 @@ static int load_database_config_file(enum cdrel_record_type record_type, struct
                return -1;
        } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
                ast_debug(1, "%s: Config file unchanged, not reloading\n", config_filename);
-               return 0;
+               return 1;
        }
 
        while ((category = ast_category_browse_filtered(cfg, NULL, category, NULL))) {
@@ -1322,7 +1322,7 @@ static int load_text_file_config_file(enum cdrel_record_type record_type,
                return -1;
        } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
                ast_debug(1, "%s: Config file unchanged, not reloading\n", config_filename);
-               return 0;
+               return 1;
        }
 
        while ((category = ast_category_browse_filtered(cfg, NULL, category, NULL))) {
@@ -1409,23 +1409,22 @@ int cdrel_reload_module(enum cdrel_backend_type output_type, enum cdrel_record_t
        }
 
        res = load_config_file(output_type, record_type, new_configs, filename, 1);
-       if (res != 0) {
+       if (res < 0) {
                AST_VECTOR_RESET(new_configs, config_free);
                AST_VECTOR_PTR_FREE(new_configs);
                return AST_MODULE_LOAD_DECLINE;
        }
 
-       /* Now swap the new ones in. */
-       *configs = new_configs;
+       if (res == 0) {
+               /* Now swap the new ones in. */
+               *configs = new_configs;
 
-       /* Free the old ones. */
-       AST_VECTOR_RESET(old_configs, config_free);
-       AST_VECTOR_PTR_FREE(old_configs);
+               /* Free the old ones. */
+               AST_VECTOR_RESET(old_configs, config_free);
+               AST_VECTOR_PTR_FREE(old_configs);
+       }
 
        return AST_MODULE_LOAD_SUCCESS;
-
-
-       return -1;
 }
 
 struct cdrel_configs *cdrel_load_module(enum cdrel_backend_type backend_type,