[svn-commits] russell: trunk r63449 - in /trunk: ./ res/res_features.c

[svn-commits at lists.digium.com]

Author: russell
Date: Tue May  8 11:54:02 2007
New Revision: 63449

URL: http://svn.digium.com/view/asterisk?view=rev&rev=63449
Log:
Merged revisions 63448 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63448 | russell | 2007-05-08 11:53:09 -0500 (Tue, 08 May 2007) | 4 lines

I mixed up the use of the find_feature() function, so I renamed it
find_dynamic_feature, and changed the code to use the correct lock when
using it.

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=63449&r1=63448&r2=63449
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Tue May  8 11:54:02 2007
@@ -1058,7 +1058,7 @@
 }
 
 /*! \brief find a call feature by name */
-static struct ast_call_feature *find_feature(const char *name)
+static struct ast_call_feature *find_dynamic_feature(const char *name)
 {
 	struct ast_call_feature *tmp;
 
@@ -1172,13 +1172,16 @@
 
 static int remap_feature(const char *name, const char *value)
 {
-	int res = -1;
-	struct ast_call_feature *feature;
+	int x, res = -1;
 
 	ast_rwlock_wrlock(&features_lock);
-	if ((feature = find_feature(name))) {
-		ast_copy_string(feature->exten, value, sizeof(feature->exten));
+	for (x = 0; x < FEATURES_COUNT; x++) {
+		if (strcasecmp(builtin_features[x].sname, name))
+			continue;
+
+		ast_copy_string(builtin_features[x].exten, value, sizeof(builtin_features[x].exten));
 		res = 0;
+		break;
 	}
 	ast_rwlock_unlock(&features_lock);
 
@@ -1223,23 +1226,21 @@
 	tmp = ast_strdupa(dynamic_features);
 
 	while ((tok = strsep(&tmp, "#"))) {
-		ast_rwlock_rdlock(&features_lock);
-		if (!(feature = find_feature(tok))) {
-			ast_rwlock_unlock(&features_lock);
+		AST_LIST_LOCK(&feature_list);	
+		if (!(feature = find_dynamic_feature(tok)))
 			continue;
-		}
 			
 		/* Feature is up for consideration */
 		if (!strcmp(feature->exten, code)) {
 			if (option_verbose > 2)
 				ast_verbose(VERBOSE_PREFIX_3 " Feature Found: %s exten: %s\n",feature->sname, tok);
 			res = feature->operation(chan, peer, config, code, sense);
-			ast_rwlock_unlock(&features_lock);
+			AST_LIST_UNLOCK(&feature_list);
 			break;
 		} else if (!strncmp(feature->exten, code, strlen(code)))
 			res = FEATURE_RETURN_STOREDIGITS;
 
-		ast_rwlock_unlock(&features_lock);
+		AST_LIST_UNLOCK(&feature_list);
 	}
 	
 	return res;
@@ -1274,14 +1275,14 @@
 
 			/* while we have a feature */
 			while ((tok = strsep(&tmp, "#"))) {
-				ast_rwlock_rdlock(&features_lock);
-				if ((feature = find_feature(tok)) && ast_test_flag(feature, AST_FEATURE_FLAG_NEEDSDTMF)) {
+				AST_LIST_LOCK(&feature_list);
+				if ((feature = find_dynamic_feature(tok)) && ast_test_flag(feature, AST_FEATURE_FLAG_NEEDSDTMF)) {
 					if (ast_test_flag(feature, AST_FEATURE_FLAG_BYCALLER))
 						ast_set_flag(config, AST_BRIDGE_DTMF_CHANNEL_0);
 					if (ast_test_flag(feature, AST_FEATURE_FLAG_BYCALLEE))
 						ast_set_flag(config, AST_BRIDGE_DTMF_CHANNEL_1);
 				}
-				ast_rwlock_unlock(&features_lock);
+				AST_LIST_UNLOCK(&feature_list);
 			}
 		}
 	}
@@ -2613,10 +2614,13 @@
 			continue;
 		}
 
-		if ((feature = find_feature(var->name))) {
+		AST_LIST_LOCK(&feature_list);
+		if ((feature = find_dynamic_feature(var->name))) {
+			AST_LIST_UNLOCK(&feature_list);
 			ast_log(LOG_WARNING, "Dynamic Feature '%s' specified more than once!\n", var->name);
 			continue;
 		}
+		AST_LIST_UNLOCK(&feature_list);
 				
 		if (!(feature = ast_calloc(1, sizeof(*feature))))
 			continue;