[svn-commits] mnick: trunk r233093 - /trunk/pbx/pbx_config.c

[SVN commits to the Digium repositories]

Author: mnick
Date: Fri Dec  4 11:15:47 2009
New Revision: 233093

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=233093
Log:
Parse global variables or expressions in hint extensions

Parse global variables or expressions in hint extensions. Like: exten => 400,hint,DAHDI/i2/${GLOBAL(var)}

(closes issue #16166)
Reported by: rmudgett
Tested by: mnick, rmudgett

Modified:
    trunk/pbx/pbx_config.c

Modified: trunk/pbx/pbx_config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/pbx/pbx_config.c?view=diff&rev=233093&r1=233092&r2=233093
==============================================================================
--- trunk/pbx/pbx_config.c (original)
+++ trunk/pbx/pbx_config.c Fri Dec  4 11:15:47 2009
@@ -1496,13 +1496,29 @@
 					/* No arguments */
 					data = "";
 				} else {
+					char *orig_appl = ast_strdup(appl);
+
+					if (!orig_appl)
+						return -1;
+					
 					appl = strsep(&stringp, "(");
-					data = S_OR(stringp, "");
-					if ((end = strrchr(data, ')'))) {
-						*end = '\0';
+
+					/* check if there are variables or expressions without an application, like: exten => 100,hint,DAHDI/g0/${GLOBAL(var)}  */
+					if (strstr(appl, "${") || strstr(appl, "$[")){
+						/* set appl to original one */
+						strcpy(appl, orig_appl);
+						/* set no data */
+						data = "";
+					/* no variable before application found -> go ahead */
 					} else {
-						ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s'\n", appl, data);
+						data = S_OR(stringp, "");
+						if ((end = strrchr(data, ')'))) {
+							*end = '\0';
+						} else {
+							ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s'\n", appl, data);
+						}
 					}
+					ast_free(orig_appl);
 				}
 
 				appl = ast_skip_blanks(appl);