[asterisk-commits] oej: branch 1.4 r242850 - /branches/1.4/main/manager.c

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Jan 25 14:03:38 2010
New Revision: 242850

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242850
Log:
Report error when writing to functions returns error in AMI setvar action

Modified:
    branches/1.4/main/manager.c

Modified: branches/1.4/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/manager.c?view=diff&rev=242850&r1=242849&r2=242850
==============================================================================
--- branches/1.4/main/manager.c (original)
+++ branches/1.4/main/manager.c Mon Jan 25 14:03:38 2010
@@ -1490,6 +1490,7 @@
 	const char *name = astman_get_header(m, "Channel");
 	const char *varname = astman_get_header(m, "Variable");
 	const char *varval = astman_get_header(m, "Value");
+	int res = 0;
 	
 	if (ast_strlen_zero(varname)) {
 		astman_send_error(s, m, "No variable specified");
@@ -1503,13 +1504,23 @@
 			return 0;
 		}
 	}
-	
-	pbx_builtin_setvar_helper(c, varname, S_OR(varval, ""));
+	if (varname[strlen(varname)-1] == ')') {
+		char *function = ast_strdupa(varname);
+		res = ast_func_write(c, function, varval);
+		ast_log(LOG_DEBUG, "---- RESULT of ast_func_write %d \n", res);
+	} else {
+		pbx_builtin_setvar_helper(c, varname, S_OR(varval, ""));
+	}
 	  
 	if (c)
 		ast_channel_unlock(c);
 
-	astman_send_ack(s, m, "Variable Set");	
+	ast_log(LOG_DEBUG, "---- RESULT 2 :: ast_func_write %d \n", res);
+	if (res == 0) {
+		astman_send_ack(s, m, "Variable Set");	
+	} else {
+		astman_send_error(s, m, "Variable not set");
+	}
 
 	return 0;
 }