retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Added arithmetical comparation and engine runid functions. 

git-svn-id: http://voip.null.ro/svn/yate@1153 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2007-01-02 08:20:48 +00:00
parent 1fe48a1867
commit aacaeffab0
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf.d/regexroute.conf.sample
View File

@ -28,9 +28,14 @@
; $(mul,VAL1,VAL2[,LEN]) = VAL1*VAL2 left filled to LEN or length of VAL1
; $(div,VAL1,VAL2[,LEN]) = VAL1/VAL2 left filled to LEN or length of VAL1
; $(mod,VAL1,VAL2[,LEN]) = VAL1%VAL2 left filled to LEN or length of VAL1
; $(lt,VAL1,VAL2) = "true" if VAL1 < VAL2, "false" otherwise
; $(gt,VAL1,VAL2) = "true" if VAL1 > VAL2, "false" otherwise
; $(le,VAL1,VAL2) = "true" if VAL1 <= VAL2, "false" otherwise
; $(ge,VAL1,VAL2) = "true" if VAL1 >= VAL2, "false" otherwise
; $(random,STRING) = STRING with each ? character replaced with a random digit
; $(index,N,ITEM1,ITEM2,...) = N-th (modulo length of list) item in list
; $(rotate,N,ITEM1,ITEM2,...) = list rotated N (modulo length of list) times
; $(runid) = the current Engine run identifier
; Note that functions ++, --, index and rotate will automatically update N
; if it is a variable in the $varname format.

40
modules/regexroute.cpp
View File

@ -56,11 +56,17 @@ static String& vars(String& s, String* vName = 0)
return s;
}
#define OPER_ADD 1
#define OPER_SUB 2
#define OPER_MUL 3
#define OPER_DIV 4
#define OPER_MOD 5
enum {
OPER_ADD,
OPER_SUB,
OPER_MUL,
OPER_DIV,
OPER_MOD,
OPER_GT,
OPER_LT,
OPER_GE,
OPER_LE,
};
static void mathOper(String& str, String& par, int sep, int oper)
{
@ -91,6 +97,18 @@ static void mathOper(String& str, String& par, int sep, int oper)
case OPER_MOD:
str = p2 ? p1%p2 : 0;
break;
case OPER_GT:
str = (p1 > p2);
return;
case OPER_LT:
str = (p1 < p2);
return;
case OPER_GE:
str = (p1 >= p2);
return;
case OPER_LE:
str = (p1 <= p2);
return;
}
// TODO: deal with negative results
while (len > (int)str.length())
@ -137,6 +155,14 @@ static void evalFunc(String& str)
mathOper(str,par,sep,OPER_DIV);
else if ((sep > 0) && ((str == "mod") || (str == "%")))
mathOper(str,par,sep,OPER_MOD);
else if ((sep > 0) && ((str == "gt") || (str == ">")))
mathOper(str,par,sep,OPER_GT);
else if ((sep > 0) && ((str == "lt") || (str == "<")))
mathOper(str,par,sep,OPER_LT);
else if ((sep > 0) && ((str == "ge") || (str == ">=")))
mathOper(str,par,sep,OPER_GE);
else if ((sep > 0) && ((str == "le") || (str == "<=")))
mathOper(str,par,sep,OPER_LE);
else if (str == "random") {
str.clear();
vars(par);
@ -183,6 +209,10 @@ static void evalFunc(String& str)
}
lst->destruct();
}
else if (str == "runid") {
str.clear();
str << Engine::runId();
}
else if ((sep < 0) && str.trimBlanks())
str = s_vars.getValue(str);
else {