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

ensure that features are not duplicated during reload (issue #3764, take two)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-08-23 14:40:03 +00:00
parent 460e8fc8b7
commit 3442368b28
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/res_features.c
View File

@@ -882,6 +882,15 @@ void ast_unregister_feature(struct ast_call_feature *feature)
free(feature); free(feature);
} }
static void ast_unregister_features(void)
{
struct ast_call_feature *feature;
AST_LIST_LOCK(&feature_list);
while ((feature = AST_LIST_REMOVE_HEAD(&feature_list,feature_entry)))
free(feature);
AST_LIST_UNLOCK(&feature_list);
}
/* find a feature by name */ /* find a feature by name */
static struct ast_call_feature *find_feature(char *name) static struct ast_call_feature *find_feature(char *name)
@@ -1766,11 +1775,16 @@ static int handle_showfeatures(int fd, int argc, char *argv[])
ast_cli(fd, "\n"); ast_cli(fd, "\n");
ast_cli(fd, format, "Dynamic Feature", "Default", "Current"); ast_cli(fd, format, "Dynamic Feature", "Default", "Current");
ast_cli(fd, format, "---------------", "-------", "-------"); ast_cli(fd, format, "---------------", "-------", "-------");
if (AST_LIST_EMPTY(&feature_list)) {
ast_cli(fd, "(none)\n");
}
else {
AST_LIST_LOCK(&feature_list); AST_LIST_LOCK(&feature_list);
AST_LIST_TRAVERSE(&feature_list, feature, feature_entry) { AST_LIST_TRAVERSE(&feature_list, feature, feature_entry) {
ast_cli(fd, format, feature->sname, "no def", feature->exten); ast_cli(fd, format, feature->sname, "no def", feature->exten);
} }
AST_LIST_UNLOCK(&feature_list); AST_LIST_UNLOCK(&feature_list);
}
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
@@ -1968,6 +1982,7 @@ static int load_config(void)
} }
/* Map a key combination to an application*/ /* Map a key combination to an application*/
ast_unregister_features();
var = ast_variable_browse(cfg, "applicationmap"); var = ast_variable_browse(cfg, "applicationmap");
while(var) { while(var) {
char *tmp_val=strdup(var->value); char *tmp_val=strdup(var->value);
@@ -1986,7 +2001,7 @@ static int load_config(void)
if (app) app_args=strsep(&tmp_val,","); if (app) app_args=strsep(&tmp_val,",");
if (!(app && strlen(app)) || !(exten && strlen(exten)) || !(party && strlen(party)) || !(var->name && strlen(var->name))) { if (!(app && strlen(app)) || !(exten && strlen(exten)) || !(party && strlen(party)) || !(var->name && strlen(var->name))) {
ast_log(LOG_NOTICE, "Please check the feature Mapping Syntax, either extension, name or app aren't provided %s %s %s %s\n",app,exten,party,var->name); ast_log(LOG_NOTICE, "Please check the feature Mapping Syntax, either extension, name, or app aren't provided %s %s %s %s\n",app,exten,party,var->name);
free(tmp_val); free(tmp_val);
var = var->next; var = var->next;
continue; continue;