[asterisk-commits] russell: branch 1.6.2 r314776 - /branches/1.6.2/main/features.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Apr 22 08:35:22 2011
New Revision: 314776

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=314776
Log:
Fix handling of some call parking config options.

This patch adjusts the handling of some call parking config options to fix some
issues that have already been addressed in 1.8 and trunk.

(closes issue #19167)
Reported by: bluecrow76
Patches:
      asterisk-1.6.2.17.2-fix-build-parkinglot-parked-AST_FEATURE_FLAGS.diff uploaded by bluecrow76 (license 270)

Modified:
    branches/1.6.2/main/features.c

Modified: branches/1.6.2/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/features.c?view=diff&rev=314776&r1=314775&r2=314776
==============================================================================
--- branches/1.6.2/main/features.c (original)
+++ branches/1.6.2/main/features.c Fri Apr 22 08:35:22 2011
@@ -4082,17 +4082,38 @@
 			}
 		} else if (!strcasecmp(confvar->name, "findslot")) {
 			parkinglot->parkfindnext = (!strcasecmp(confvar->value, "next"));
-		} else if (!strcasecmp(confvar->name, "parkedcalltransfers") ||
-				!strcasecmp(confvar->name, "parkedcallreparking") ||
-				!strcasecmp(confvar->name, "parkedcallhangup") ||
-				!strcasecmp(confvar->name, "parkedcallrecording")) {
-			if (!strcasecmp(confvar->value, "both")) {
+		} else if (!strcasecmp(confvar->name, "parkedcalltransfers")) {
+			ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+			if (!strcasecmp(confvar->value, "both"))
 				parkinglot->parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH;
-			} else if (!strcasecmp(confvar->value, "caller")) {
+			else if (!strcasecmp(confvar->value, "caller"))
 				parkinglot->parkedcalltransfers = AST_FEATURE_FLAG_BYCALLER;
-			} else if (!strcasecmp(confvar->value, "callee")) {
+			else if (!strcasecmp(confvar->value, "callee"))
 				parkinglot->parkedcalltransfers = AST_FEATURE_FLAG_BYCALLEE;
-			}
+		} else if (!strcasecmp(confvar->name, "parkedcallreparking")) {
+			ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+			if (!strcasecmp(confvar->value, "both"))
+				parkinglot->parkedcallreparking = AST_FEATURE_FLAG_BYBOTH;
+			else if (!strcasecmp(confvar->value, "caller"))
+				parkinglot->parkedcallreparking = AST_FEATURE_FLAG_BYCALLER;
+			else if (!strcasecmp(confvar->value, "callee"))
+				parkinglot->parkedcallreparking = AST_FEATURE_FLAG_BYCALLEE;
+		} else if (!strcasecmp(confvar->name, "parkedcallhangup")) {
+			ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+			if (!strcasecmp(confvar->value, "both"))
+				parkinglot->parkedcallhangup = AST_FEATURE_FLAG_BYBOTH;
+			else if (!strcasecmp(confvar->value, "caller"))
+				parkinglot->parkedcallhangup = AST_FEATURE_FLAG_BYCALLER;
+			else if (!strcasecmp(confvar->value, "callee"))
+				parkinglot->parkedcallhangup = AST_FEATURE_FLAG_BYCALLEE;
+		} else if (!strcasecmp(confvar->name, "parkedcallrecording")) {
+			ast_debug(1, "Setting parking lot %s %s to %s\n", name, confvar->name, confvar->value);
+			if (!strcasecmp(confvar->value, "both"))
+				parkinglot->parkedcallrecording = AST_FEATURE_FLAG_BYBOTH;
+			else if (!strcasecmp(confvar->value, "caller"))
+				parkinglot->parkedcallrecording = AST_FEATURE_FLAG_BYCALLER;
+			else if (!strcasecmp(confvar->value, "callee"))
+				parkinglot->parkedcallrecording = AST_FEATURE_FLAG_BYCALLEE;
 		}
 		confvar = confvar->next;
 	}