Update of /usr/cvsroot/asterisk/funcs
In directory mongoose.digium.com:/tmp/cvs-serv32431/funcs
Modified Files:
Makefile
Added Files:
func_math.c
Log Message:
add MATH() dialplan function (bug #4473, with mods)
deprecate the Math() application
--- NEW FILE: func_math.c ---
/*
* Asterisk -- A telephony toolkit for Linux.
*
* Maths relatad dialplan functions
*
* Copyright (C) 2004 - 2005, Andy Powell
*
* Updated by Mark Spencer <[EMAIL PROTECTED]>
*
*/
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include "asterisk.h"
/* ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.1 $") */
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/logger.h"
#include "asterisk/utils.h"
#include "asterisk/app.h"
#include "asterisk/config.h"
enum TypeOfFunctions
{
ADDFUNCTION,
DIVIDEFUNCTION,
MULTIPLYFUNCTION,
SUBTRACTFUNCTION,
MODULUSFUNCTION,
GTFUNCTION,
LTFUNCTION,
GTEFUNCTION,
LTEFUNCTION,
EQFUNCTION
};
enum TypeOfResult
{
FLOAT_RESULT,
INT_RESULT,
HEX_RESULT,
CHAR_RESULT
};
static char *builtin_function_math(struct ast_channel *chan, char *cmd, char
*data, char *buf, size_t len)
{
int argc;
char *argv[2];
char *args;
float fnum1;
float fnum2;
float ftmp = 0;
char *op;
int iaction=-1;
int type_of_result=FLOAT_RESULT;
/* dunno, big calulations :D */
char user_result[30];
char *mvalue1, *mvalue2=NULL, *mtype_of_result;
if (!data || ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number
2>[,<type_of_result>]) - missing argument!\n");
return NULL;
}
args = ast_strdupa(data);
argc = ast_separate_app_args(args, '|', argv, sizeof(argv) /
sizeof(argv[0]));
if (argc < 1) {
ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number
2>[,<type_of_result>]) - missing argument!\n");
return NULL;
}
mvalue1 = argv[0];
if ((op = strchr(mvalue1, '+'))) {
iaction = ADDFUNCTION;
*op = '\0';
} else if ((op = strchr(mvalue1, '-'))) {
iaction = SUBTRACTFUNCTION;
*op = '\0';
} else if ((op = strchr(mvalue1, '*'))) {
iaction = MULTIPLYFUNCTION;
*op = '\0';
} else if ((op = strchr(mvalue1, '/'))) {
iaction = DIVIDEFUNCTION;
*op = '\0';
} else if ((op = strchr(mvalue1, '%'))) {
iaction = MODULUSFUNCTION;
*op = '\0';
} else if ((op = strchr(mvalue1, '>'))) {
iaction = GTFUNCTION;
*op = '\0';
if (*(op+1) == '=') {
*++op = '\0';
iaction = GTEFUNCTION;
}
} else if ((op = strchr(mvalue1, '<'))) {
iaction = LTFUNCTION;
*op = '\0';
if (*(op+1) == '=') {
*++op = '\0';
iaction = LTEFUNCTION;
}
} else if ((op = strchr(mvalue1, '='))) {
iaction = GTFUNCTION;
*op = '\0';
if (*(op+1) == '=') {
*++op = '\0';
iaction = EQFUNCTION;
} else
op = NULL;
}
if (op)
mvalue2 = op + 1;
/* detect wanted type of result */
mtype_of_result = argv[1];
if (mtype_of_result)
{
if (!strcasecmp(mtype_of_result,"float") ||
!strcasecmp(mtype_of_result,"f"))
type_of_result=FLOAT_RESULT;
else if (!strcasecmp(mtype_of_result,"int") ||
!strcasecmp(mtype_of_result,"i"))
type_of_result=INT_RESULT;
else if (!strcasecmp(mtype_of_result,"hex") ||
!strcasecmp(mtype_of_result,"h"))
type_of_result=HEX_RESULT;
else if (!strcasecmp(mtype_of_result,"char") ||
!strcasecmp(mtype_of_result,"c"))
type_of_result=CHAR_RESULT;
else
{
ast_log(LOG_WARNING, "Unknown type of result requested
'%s'.\n", mtype_of_result);
return NULL;
}
}
if (!mvalue1 || !mvalue2) {
ast_log(LOG_WARNING, "Supply all the parameters - just this
once, please\n");
return NULL;
}
if (sscanf(mvalue1, "%f", &fnum1) != 1) {
ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue1);
return NULL;
}
if (sscanf(mvalue2, "%f", &fnum2) != 1) {
ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue2);
return NULL;
}
switch (iaction) {
case ADDFUNCTION :
ftmp = fnum1 + fnum2;
break;
case DIVIDEFUNCTION :
if (fnum2 <= 0)
ftmp = 0; /* can't do a divide by 0 */
else
ftmp = (fnum1 / fnum2);
break;
case MULTIPLYFUNCTION :
ftmp = (fnum1 * fnum2);
break;
case SUBTRACTFUNCTION :
ftmp = (fnum1 - fnum2);
break;
case MODULUSFUNCTION :
{
int inum1 = fnum1;
int inum2 = fnum2;
ftmp = (inum1 % inum2);
break;
}
case GTFUNCTION :
ast_copy_string (user_result, (fnum1 > fnum2)?"TRUE":"FALSE",
sizeof (user_result));
break;
case LTFUNCTION :
ast_copy_string (user_result, (fnum1 < fnum2)?"TRUE":"FALSE",
sizeof (user_result));
break;
case GTEFUNCTION :
ast_copy_string (user_result, (fnum1 >= fnum2)?"TRUE":"FALSE",
sizeof (user_result));
break;
case LTEFUNCTION :
ast_copy_string (user_result, (fnum1 <= fnum2)?"TRUE":"FALSE",
sizeof (user_result));
break;
case EQFUNCTION :
ast_copy_string (user_result, (fnum1 == fnum2)?"TRUE":"FALSE",
sizeof (user_result));
break;
default :
ast_log(LOG_WARNING, "Something happened that neither of us
should be proud of %d\n", iaction);
return NULL;
}
if (iaction < GTFUNCTION || iaction > EQFUNCTION) {
if (type_of_result == FLOAT_RESULT)
snprintf(user_result, sizeof(user_result), "%f", ftmp);
else if (type_of_result == INT_RESULT)
snprintf(user_result, sizeof(user_result), "%i", (int)
ftmp);
else if (type_of_result == HEX_RESULT)
snprintf(user_result, sizeof(user_result), "%x", (unsigned int)
ftmp);
else if (type_of_result == CHAR_RESULT)
snprintf(user_result, sizeof(user_result), "%c", (unsigned
char) ftmp);
}
ast_copy_string(buf, user_result, len);
return buf;
}
#ifndef BUILTIN_FUNC
static
#endif /* BUILTIN_FUNC */
struct ast_custom_function math_function = {
.name = "MATH",
.synopsis = "Performs Mathematical Functions",
.syntax = "MATH(<number1><op><number 2>[,<type_of_result>])",
.desc = "Perform calculation on number 1 to number 2. Valid ops are: \n"
" +,-,/,*,%,<,>,>=,<=,==\n"
"and behave as their C equivalents.\n"
"<type_of_result> - wanted type of result:\n"
" f, float - float(default)\n"
" i, int - integer,\n"
" h, hex - hex,\n"
" c, char - char\n"
"Example: Set(i=${MATH(123%16,int)}) - sets var i=11",
.read = builtin_function_math
};
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/funcs/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 15 May 2005 17:45:30 -0000 1.6
+++ Makefile 9 Jun 2005 22:59:08 -0000 1.7
@@ -14,6 +14,7 @@
FUNCS=pbx_functions.so
BUILTINS=func_md5.o \
+ func_math.o \
func_groupcount.o \
func_strings.o \
func_cdr.o \
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
