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

Unused realtime MOH classes not purged on 'moh reload'

Browse Source 
Purge Realtime MOH classes on 'moh reload' even when musiconhold.conf
hasn't changed.

ASTERISK-25974 #close

Change-Id: I42c78ea76528473a656f204595956c9eedcf3246
This commit is contained in:
Daniel Journo
2017-03-26 00:01:06 +00:00
parent a889621b14
commit 6c3ae397cb
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/res_musiconhold.c
View File

@@ -155,6 +155,7 @@ struct moh_files_state {
/* Custom astobj2 flag */
#define MOH_NOTDELETED (1 << 30) /*!< Find only records that aren't deleted? */
#define MOH_REALTIME (1 << 31) /*!< Find only records that are realtime */
static struct ast_flags global_flags[1] = {{0}}; /*!< global MOH_ flags */
@@ -1676,7 +1677,9 @@ static int moh_class_mark(void *obj, void *arg, int flags)
{
struct mohclass *class = obj;
class->delete = 1;
if ( ((flags & MOH_REALTIME) && class->realtime) || !(flags & MOH_REALTIME) ) {
class->delete = 1;
}
return 0;
}
@@ -1692,13 +1695,22 @@ static int load_moh_classes(int reload)
{
struct ast_config *cfg;
struct ast_variable *var;
struct mohclass *class;
struct mohclass *class;
char *cat;
int numclasses = 0;
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
cfg = ast_config_load("musiconhold.conf", config_flags);
if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
if (ast_check_realtime("musiconhold") && reload) {
ao2_t_callback(mohclasses, OBJ_NODATA | MOH_REALTIME, moh_class_mark, NULL, "Mark realtime classes for deletion");
ao2_t_callback(mohclasses, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, moh_classes_delete_marked, NULL, "Purge marked classes");
}
moh_rescan_files();
return 0;
}
if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEINVALID) {
if (ast_check_realtime("musiconhold") && reload) {
ao2_t_callback(mohclasses, OBJ_NODATA, moh_class_mark, NULL, "Mark deleted classes");
@@ -1706,10 +1718,6 @@ static int load_moh_classes(int reload)
}
return 0;
}
if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
moh_rescan_files();
return 0;
}
if (reload) {
ao2_t_callback(mohclasses, OBJ_NODATA, moh_class_mark, NULL, "Mark deleted classes");