Merge "ari: Implement 'debug all' and request/response logging"
[asterisk/asterisk.git] / funcs / func_math.c
index 3d737ef..6fc7255 100644 (file)
@@ -1,9 +1,10 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 2004 - 2006, Andy Powell 
+ * Copyright (C) 2004 - 2006, Andy Powell
  *
  * Updated by Mark Spencer <markster@digium.com>
+ * Updated by Nir Simionovich <nirs@greenfieldtech.net>
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
  *
  * \author Andy Powell
  * \author Mark Spencer <markster@digium.com>
+ * \author Nir Simionovich <nirs@greenfieldtech.net>
  *
  * \ingroup functions
  */
 
-#include "asterisk.h"
+/*** MODULEINFO
+       <support_level>core</support_level>
+ ***/
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "asterisk.h"
 
 #include <math.h>
 
@@ -38,6 +42,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/config.h"
+#include "asterisk/test.h"
 
 /*** DOCUMENTATION
        <function name="MATH" language="en_US">
@@ -50,7 +55,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                <replaceable>number1</replaceable><replaceable>op</replaceable><replaceable>number2</replaceable>
                                where the possible values for <replaceable>op</replaceable>
                                are:</para>
-                               <para>+,-,/,*,%,&lt;&lt;,&gt;&gt;,^,AND,OR,XOR,&lt;,%gt;,&gt;=,&lt;=,== (and behave as their C equivalents)</para>
+                               <para>+,-,/,*,%,&lt;&lt;,&gt;&gt;,^,AND,OR,XOR,&lt;,&gt;,&lt;=,&gt;=,== (and behave as their C equivalents)</para>
                        </parameter>
                        <parameter name="type">
                                <para>Wanted type of result:</para>
@@ -66,6 +71,40 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>Example: Set(i=${MATH(123%16,int)}) - sets var i=11</para>
                </description>
        </function>
+       <function name="INC" language="en_US">
+               <synopsis>
+                       Increments the value of a variable, while returning the updated value to the dialplan
+               </synopsis>
+               <syntax>
+                       <parameter name="variable" required="true">
+                               <para>
+                               The variable name to be manipulated, without the braces.
+                               </para>
+                       </parameter>
+               </syntax>
+               <description>
+                       <para>Increments the value of a variable, while returning the updated value to the dialplan</para>
+                       <para>Example: INC(MyVAR) - Increments MyVar</para>
+                       <para>Note: INC(${MyVAR}) - Is wrong, as INC expects the variable name, not its value</para>
+               </description>
+       </function>
+       <function name="DEC" language="en_US">
+               <synopsis>
+                       Decrements the value of a variable, while returning the updated value to the dialplan
+               </synopsis>
+               <syntax>
+                       <parameter name="variable" required="true">
+                               <para>
+                               The variable name to be manipulated, without the braces.
+                               </para>
+                       </parameter>
+               </syntax>
+               <description>
+                       <para>Decrements the value of a variable, while returning the updated value to the dialplan</para>
+                       <para>Example: DEC(MyVAR) - Decrements MyVar</para>
+                       <para>Note: DEC(${MyVAR}) - Is wrong, as DEC expects the variable name, not its value</para>
+               </description>
+       </function>
  ***/
 
 enum TypeOfFunctions {
@@ -143,47 +182,47 @@ static int math(struct ast_channel *chan, const char *cmd, char *parse,
                *op = '\0';
        } else if ((op = strstr(mvalue1, "AND"))) {
                iaction = BITWISEANDFUNCTION;
-               op += 3;
                *op = '\0';
+               op += 2;
        } else if ((op = strstr(mvalue1, "XOR"))) {
                iaction = BITWISEXORFUNCTION;
-               op += 3;
                *op = '\0';
+               op += 2;
        } else if ((op = strstr(mvalue1, "OR"))) {
                iaction = BITWISEORFUNCTION;
-               op += 2;
                *op = '\0';
+               ++op;
        } else if ((op = strchr(mvalue1, '>'))) {
                iaction = GTFUNCTION;
                *op = '\0';
                if (*(op + 1) == '=') {
-                       *++op = '\0';
                        iaction = GTEFUNCTION;
+                       ++op;
                } else if (*(op + 1) == '>') {
-                       *++op = '\0';
                        iaction = SHRIGHTFUNCTION;
+                       ++op;
                }
        } else if ((op = strchr(mvalue1, '<'))) {
                iaction = LTFUNCTION;
                *op = '\0';
                if (*(op + 1) == '=') {
-                       *++op = '\0';
                        iaction = LTEFUNCTION;
+                       ++op;
                } else if (*(op + 1) == '<') {
-                       *++op = '\0';
                        iaction = SHLEFTFUNCTION;
+                       ++op;
                }
        } else if ((op = strchr(mvalue1, '='))) {
                *op = '\0';
                if (*(op + 1) == '=') {
-                       *++op = '\0';
                        iaction = EQFUNCTION;
+                       ++op;
                } else
                        op = NULL;
        } else if ((op = strchr(mvalue1, '+'))) {
                iaction = ADDFUNCTION;
                *op = '\0';
-       } else if ((op = strchr(mvalue1, '-'))) { /* subtraction MUST always be last, in case we have a negative first number */
+       } else if ((op = strchr(mvalue1, '-'))) { /* subtraction MUST always be last, in case we have a negative second number */
                iaction = SUBTRACTFUNCTION;
                *op = '\0';
        }
@@ -213,18 +252,18 @@ static int math(struct ast_channel *chan, const char *cmd, char *parse,
                }
        }
 
-       if (!mvalue1 || !mvalue2) {
+       if (!mvalue2) {
                ast_log(LOG_WARNING,
                                "Supply all the parameters - just this once, please\n");
                return -1;
        }
 
-       if (sscanf(mvalue1, "%lf", &fnum1) != 1) {
+       if (sscanf(mvalue1, "%30lf", &fnum1) != 1) {
                ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue1);
                return -1;
        }
 
-       if (sscanf(mvalue2, "%lf", &fnum2) != 1) {
+       if (sscanf(mvalue2, "%30lf", &fnum2) != 1) {
                ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue2);
                return -1;
        }
@@ -253,7 +292,11 @@ static int math(struct ast_channel *chan, const char *cmd, char *parse,
                        int inum1 = fnum1;
                        int inum2 = fnum2;
 
-                       ftmp = (inum1 % inum2);
+                       if (inum2 == 0) {
+                               ftmp = 0;
+                       } else {
+                               ftmp = (inum1 % inum2);
+                       }
 
                        break;
                }
@@ -333,19 +376,163 @@ static int math(struct ast_channel *chan, const char *cmd, char *parse,
        return 0;
 }
 
+static int crement_function_read(struct ast_channel *chan, const char *cmd,
+                     char *data, char *buf, size_t len)
+{
+       int ret = -1;
+       int int_value = 0;
+       int modify_orig = 0;
+       const char *var;
+       char endchar = 0, returnvar[12]; /* If you need a variable longer than 11 digits - something is way wrong */
+
+       if (ast_strlen_zero(data)) {
+               ast_log(LOG_WARNING, "Syntax: %s(<data>) - missing argument!\n", cmd);
+               return -1;
+       }
+
+       if (!chan) {
+               ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd);
+               return -1;
+       }
+
+       ast_channel_lock(chan);
+
+       if (!(var = pbx_builtin_getvar_helper(chan, data))) {
+               ast_log(LOG_NOTICE, "Failed to obtain variable %s, bailing out\n", data);
+               ast_channel_unlock(chan);
+               return -1;
+       }
+
+       if (ast_strlen_zero(var)) {
+               ast_log(LOG_NOTICE, "Variable %s doesn't exist - are you sure you wrote it correctly?\n", data);
+               ast_channel_unlock(chan);
+               return -1;
+       }
+
+       if (sscanf(var, "%30d%1c", &int_value, &endchar) == 0 || endchar != 0) {
+               ast_log(LOG_NOTICE, "The content of ${%s} is not a numeric value - bailing out!\n", data);
+               ast_channel_unlock(chan);
+               return -1;
+       }
+
+       /* now we'll actually do something useful */
+       if (!strcasecmp(cmd, "INC")) {              /* Increment variable */
+               int_value++;
+               modify_orig = 1;
+       } else if (!strcasecmp(cmd, "DEC")) {       /* Decrement variable */
+               int_value--;
+               modify_orig = 1;
+       }
+
+       if (snprintf(returnvar, sizeof(returnvar), "%d", int_value) > 0) {
+               pbx_builtin_setvar_helper(chan, data, returnvar);
+               if (modify_orig) {
+                       ast_copy_string(buf, returnvar, len);
+               }
+               ret = 0;
+       } else {
+               pbx_builtin_setvar_helper(chan, data, "0");
+               if (modify_orig) {
+                       ast_copy_string(buf, "0", len);
+               }
+               ast_log(LOG_NOTICE, "Variable %s refused to be %sREMENTED, setting value to 0", data, cmd);
+               ret = 0;
+       }
+
+       ast_channel_unlock(chan);
+
+       return ret;
+}
+
+
 static struct ast_custom_function math_function = {
        .name = "MATH",
        .read = math
 };
 
+static struct ast_custom_function increment_function = {
+       .name = "INC",
+       .read = crement_function_read,
+};
+
+static struct ast_custom_function decrement_function = {
+       .name = "DEC",
+       .read = crement_function_read,
+};
+
+#ifdef TEST_FRAMEWORK
+AST_TEST_DEFINE(test_MATH_function)
+{
+       enum ast_test_result_state res = AST_TEST_PASS;
+       struct ast_str *expr, *result;
+
+       switch (cmd) {
+       case TEST_INIT:
+               info->name = "test_MATH_function";
+               info->category = "/main/pbx/";
+               info->summary = "Test MATH function substitution";
+               info->description =
+                       "Executes a series of variable substitutions using the MATH function and ensures that the expected results are received.";
+               return AST_TEST_NOT_RUN;
+       case TEST_EXECUTE:
+               break;
+       }
+
+       ast_test_status_update(test, "Testing MATH() substitution ...\n");
+
+       if (!(expr = ast_str_create(16))) {
+               return AST_TEST_FAIL;
+       }
+       if (!(result = ast_str_create(16))) {
+               ast_free(expr);
+               return AST_TEST_FAIL;
+       }
+
+       ast_str_set(&expr, 0, "${MATH(170 AND 63,i)}");
+       ast_str_substitute_variables(&result, 0, NULL, ast_str_buffer(expr));
+       if (strcmp(ast_str_buffer(result), "42") != 0) {
+               ast_test_status_update(test, "Expected result '42' not returned! ('%s')\n",
+                               ast_str_buffer(result));
+               res = AST_TEST_FAIL;
+       }
+
+       ast_str_set(&expr, 0, "${MATH(170AND63,i)}");
+       ast_str_substitute_variables(&result, 0, NULL, ast_str_buffer(expr));
+       if (strcmp(ast_str_buffer(result), "42") != 0) {
+               ast_test_status_update(test, "Expected result '42' not returned! ('%s')\n",
+                               ast_str_buffer(result));
+               res = AST_TEST_FAIL;
+       }
+
+       ast_free(expr);
+       ast_free(result);
+
+       return res;
+}
+#endif
+
 static int unload_module(void)
 {
-       return ast_custom_function_unregister(&math_function);
+       int res = 0;
+
+       res |= ast_custom_function_unregister(&math_function);
+       res |= ast_custom_function_unregister(&increment_function);
+       res |= ast_custom_function_unregister(&decrement_function);
+       AST_TEST_UNREGISTER(test_MATH_function);
+
+       return res;
 }
 
 static int load_module(void)
 {
-       return ast_custom_function_register(&math_function);
+       int res = 0;
+
+       res |= ast_custom_function_register(&math_function);
+       res |= ast_custom_function_register(&increment_function);
+       res |= ast_custom_function_register(&decrement_function);
+       AST_TEST_REGISTER(test_MATH_function);
+
+       return res;
 }
 
 AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Mathematical dialplan function");