sr-dev November 2022

sr-dev@lists.kamailio.org

11 participants
216 discussions

git:master:e93c9356: app_sqlang: updates to use generic kemi function execution from core

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e93c935628a03adad22c76b2da3a8a111344c6dd URL: https://github.com/kamailio/kamailio/commit/e93c935628a03adad22c76b2da3a8a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-25T12:10:49+01:00 app_sqlang: updates to use generic kemi function execution from core --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e93c935628a03adad22c76b2da3a8a1… Patch: https://github.com/kamailio/kamailio/commit/e93c935628a03adad22c76b2da3a8a1…

2 years

git:master:ae1628ff: app_jsdt: updates to use generic kemi function execution from core

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ae1628ffbf5bfdae2d04f337d773391dac5d455c URL: https://github.com/kamailio/kamailio/commit/ae1628ffbf5bfdae2d04f337d773391… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-25T11:58:42+01:00 app_jsdt: updates to use generic kemi function execution from core --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/ae1628ffbf5bfdae2d04f337d773391… Patch: https://github.com/kamailio/kamailio/commit/ae1628ffbf5bfdae2d04f337d773391…

2 years

git:master:08c385ab: misc/tools/kemi/kemi-code-gen.py: updates for generating generic execution function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 08c385ab20a87e4cd64ac278f56527d05a9115b8 URL: https://github.com/kamailio/kamailio/commit/08c385ab20a87e4cd64ac278f56527d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-25T11:43:26+01:00 misc/tools/kemi/kemi-code-gen.py: updates for generating generic execution function - support to generate prototypes for functions returning xval --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/08c385ab20a87e4cd64ac278f56527d… Patch: https://github.com/kamailio/kamailio/commit/08c385ab20a87e4cd64ac278f56527d… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index b7b4bba8c83..82d9ee2c12c 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -2,9 +2,9 @@ # - print IF conditions with param types for KEMI interpreters # - print typedefs for functions -PRINTPARAMS=3 -# - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="sqlang" +PRINTPARAMS=6 +# - print mode: typedefs, xtypedefs, common, js, lua, python, pythonparams, ruby, sqlang +PRINTMODE="xtypedefs" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -22,12 +22,29 @@ def printCodeFuncTypedefs(prefix): print(sfunc) +def printCodeFuncXTypedefs(prefix): + sfunc = "typedef sr_kemi_xval_t* (*sr_kemi_xfm" + prefix + "_f)(sip_msg_t*" + ", str*, str*, str*, str*, str*);" + for i, c in enumerate(prefix): + if c == 's': + sfunc += ", str*" + else: + sfunc += ", int" + sfunc += ");" + print(sfunc) + + def printCodeIfEnd(sretfunc): print(PRINTTABS + "} else {") print(PRINTTABS + "\tLM_ERR(\"invalid parameters for: %.*s\\n\", fname->len, fname->s);") print(PRINTTABS + "\treturn " + sretfunc + ";") print(PRINTTABS + "}") +def printCodeIfEndCommon(sretfunc): + print(PRINTTABS + "} else {") + print(PRINTTABS + "\tLM_ERR(\"invalid parameters for: %.*s\\n\", ket->fname.len, ket->fname.s);") + print(PRINTTABS + "\treturn " + sretfunc + ";") + print(PRINTTABS + "}") def printCodeIfParams(prefix): global PRINTELSE @@ -58,6 +75,35 @@ def printCodeIfParams(prefix): return sparams +def printCodeIfValParams(prefix): + global PRINTELSE + sparams = "" + for i, c in enumerate(prefix): + if i==0: + if c == 's': + print(PRINTTABS + PRINTELSE + "if((ket->ptypes[0] & SR_KEMIP_STR)") + sparams += "&vps[" + str(i) +"].v.s, " + else: + print(PRINTTABS + PRINTELSE + "if((ket->ptypes[0] & SR_KEMIP_INT)") + sparams += "vps[" + str(i) +"].v.n, " + PRINTELSE = "} else " + elif i==PRINTPARAMS-1: + if c == 's': + print(PRINTTABS + "\t\t&& (ket->ptypes[" + str(i) + "] & SR_KEMIP_STR)) {") + sparams += "&vps[" + str(i) +"].v.s);" + else: + print(PRINTTABS + "\t\t&& (ket->ptypes[" + str(i) + "] & SR_KEMIP_INT)) {") + sparams += "vps[" + str(i) +"].v.n);" + else: + if c == 's': + print(PRINTTABS + "\t\t&& (ket->ptypes[" + str(i) + "] & SR_KEMIP_STR)") + sparams += "&vps[" + str(i) +"].v.s, " + else: + print(PRINTTABS + "\t\t&& (ket->ptypes[" + str(i) + "] & SR_KEMIP_INT)") + sparams += "vps[" + str(i) +"].v.n, " + return sparams + + def printCodeIfJS(prefix): global PRINTELSE sparams = printCodeIfParams(prefix) @@ -181,6 +227,19 @@ def printCodeIfSQLang(prefix): print("\t\t\t\t}") +def printCodeIfCommon(prefix): + global PRINTELSE + sparams = printCodeIfValParams(prefix) + print("\t\t\t\tif(ket->rtype & SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\treturn ((sr_kemi_xfm" + prefix + "_f)(ket->func))(msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_return_int(ket, ret);") + print("\t\t\t\t}") + + # generated possible strings of length k with chars from set. def printAllKLength(cset, k): @@ -204,6 +263,10 @@ def printAllKLengthRec(cset, prefix, n, k): printCodeIfRuby(prefix) elif PRINTMODE == "sqlang": printCodeIfSQLang(prefix) + elif PRINTMODE == "common": + printCodeIfCommon(prefix) + elif PRINTMODE == "xtypedefs": + printCodeFuncXTypedefs(prefix) else: printCodeFuncTypedefs(prefix) return @@ -231,5 +294,7 @@ def printAllKLengthRec(cset, prefix, n, k): printCodeIfEnd("Qfalse") elif PRINTMODE == "sqlang": printCodeIfEnd("app_sqlang_return_false(J)") + elif PRINTMODE == "common": + printCodeIfEndCommon("sr_kemi_return_false(ket)")

2 years

git:master:6820b78c: app_lua: updates to use generic kemi function execution from core

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6820b78c7e983b9b28efbc11f43b721709130e0f URL: https://github.com/kamailio/kamailio/commit/6820b78c7e983b9b28efbc11f43b721… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-25T11:44:28+01:00 app_lua: updates to use generic kemi function execution from core --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/6820b78c7e983b9b28efbc11f43b721… Patch: https://github.com/kamailio/kamailio/commit/6820b78c7e983b9b28efbc11f43b721…

2 years

git:master:74796c75: core: kemi - added generic function to execute a kemi export with any kind of parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 74796c75c630211c1807424be36cf77634b7b2c0 URL: https://github.com/kamailio/kamailio/commit/74796c75c630211c1807424be36cf77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-25T11:29:42+01:00 core: kemi - added generic function to execute a kemi export with any kind of parameters --- Added: src/core/kemiexec.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/74796c75c630211c1807424be36cf77… Patch: https://github.com/kamailio/kamailio/commit/74796c75c630211c1807424be36cf77…

2 years

git:master:c38c1801: core: kemi - added prototypes for various functions with 4+ params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c38c1801d84f7b6049901e85c271f23dc63edb40 URL: https://github.com/kamailio/kamailio/commit/c38c1801d84f7b6049901e85c271f23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-25T11:27:52+01:00 core: kemi - added prototypes for various functions with 4+ params --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/c38c1801d84f7b6049901e85c271f23… Patch: https://github.com/kamailio/kamailio/commit/c38c1801d84f7b6049901e85c271f23…

2 years

git:master:11ffe722: app_lua: updated handling function with (str, xval) params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 11ffe722ae7530dff13da64a64122931b0758c7c URL: https://github.com/kamailio/kamailio/commit/11ffe722ae7530dff13da64a6412293… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-25T09:05:09+01:00 app_lua: updated handling function with (str,xval) params --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/11ffe722ae7530dff13da64a6412293… Patch: https://github.com/kamailio/kamailio/commit/11ffe722ae7530dff13da64a6412293… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 40ca71afe6..4431d4a46b 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -1003,6 +1003,7 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) str *fname; str *mname; sr_kemi_val_t vps[SR_KEMI_PARAMS_MAX]; + sr_kemi_xval_t xval; sr_lua_env_t *env_L; sr_kemi_xval_t *xret; @@ -1144,11 +1145,13 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) return sr_kemi_lua_return_int(L, ket, ret); } } else if(ket->ptypes[1]==SR_KEMIP_LONG) { + xval.vtype = SR_KEMIP_LONG; + xval.v.l = vps[1].l; if(ket->rtype==SR_KEMIP_XVAL) { - xret = ((sr_kemi_xfmsl_f)(ket->func))(env_L->msg, &vps[0].s, vps[1].l); + xret = ((sr_kemi_xfmsv_f)(ket->func))(env_L->msg, &vps[0].s, &xval); return sr_kemi_lua_return_xval(L, ket, xret); } else { - ret = ((sr_kemi_fmsl_f)(ket->func))(env_L->msg, &vps[0].s, vps[1].l); + ret = ((sr_kemi_fmsv_f)(ket->func))(env_L->msg, &vps[0].s, &xval); return sr_kemi_lua_return_int(L, ket, ret); } } else {

2 years

git:master:360337fc: core: kemi - changed prototypes with xval instead of long param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 360337fcf36cd91902af6d07e60782ae70f10911 URL: https://github.com/kamailio/kamailio/commit/360337fcf36cd91902af6d07e60782a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-25T09:02:29+01:00 core: kemi - changed prototypes with xval instead of long param --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/360337fcf36cd91902af6d07e60782a… Patch: https://github.com/kamailio/kamailio/commit/360337fcf36cd91902af6d07e60782a… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 9749f2632d..3d76b432ce 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -105,7 +105,7 @@ typedef int (*sr_kemi_fmnn_f)(sip_msg_t*, int, int); typedef int (*sr_kemi_fmns_f)(sip_msg_t*, int, str*); typedef int (*sr_kemi_fmsn_f)(sip_msg_t*, str*, int); typedef int (*sr_kemi_fmss_f)(sip_msg_t*, str*, str*); -typedef int (*sr_kemi_fmsl_f)(sip_msg_t*, str*, long); +typedef int (*sr_kemi_fmsv_f)(sip_msg_t*, str*, sr_kemi_xval_t*); /* sip_msg_t and three int|str params */ typedef int (*sr_kemi_fmnnn_f)(sip_msg_t*, int, int, int); @@ -184,7 +184,7 @@ typedef sr_kemi_xval_t* (*sr_kemi_xfmnn_f)(sip_msg_t*, int, int); typedef sr_kemi_xval_t* (*sr_kemi_xfmns_f)(sip_msg_t*, int, str*); typedef sr_kemi_xval_t* (*sr_kemi_xfmsn_f)(sip_msg_t*, str*, int); typedef sr_kemi_xval_t* (*sr_kemi_xfmss_f)(sip_msg_t*, str*, str*); -typedef sr_kemi_xval_t* (*sr_kemi_xfmsl_f)(sip_msg_t*, str*, long); +typedef sr_kemi_xval_t* (*sr_kemi_xfmsv_f)(sip_msg_t*, str*, sr_kemi_xval_t*); /* return xval, params sip_msg_t and three int|str params */ typedef sr_kemi_xval_t* (*sr_kemi_xfmnnn_f)(sip_msg_t*, int, int, int);

2 years

git:master:63d0df60: app_lua: support returning long value and functions with (str, long) params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 63d0df60c84c81b8143d7e38a798f92b8a5a1744 URL: https://github.com/kamailio/kamailio/commit/63d0df60c84c81b8143d7e38a798f92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-24T10:35:36+01:00 app_lua: support returning long value and functions with (str,long) params --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/63d0df60c84c81b8143d7e38a798f92… Patch: https://github.com/kamailio/kamailio/commit/63d0df60c84c81b8143d7e38a798f92… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 0a1d13532cc..40ca71afe63 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -957,6 +957,9 @@ int sr_kemi_lua_return_xval(lua_State* L, sr_kemi_t *ket, sr_kemi_xval_t *rx) case SR_KEMIP_INT: lua_pushinteger(L, rx->v.n); return 1; + case SR_KEMIP_LONG: + lua_pushnumber(L, rx->v.l); + return 1; case SR_KEMIP_STR: lua_pushlstring(L, rx->v.s.s, rx->v.s.len); return 1; @@ -1066,6 +1069,10 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) vps[i].n = lua_tointeger(L, i+pdelta+1); LM_DBG("param[%d] for: %.*s is int: %d\n", i, fname->len, fname->s, vps[i].n); + } else if(ket->ptypes[i]==SR_KEMIP_LONG) { + vps[i].l = (long)lua_tonumber(L, i+pdelta+1); + LM_DBG("param[%d] for: %.*s is long: %ld\n", i, + fname->len, fname->s, vps[i].l); } else { LM_ERR("unknown parameter type %d (%d)\n", ket->ptypes[i], i); return app_lua_return_false(L); @@ -1136,6 +1143,14 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) ret = ((sr_kemi_fmss_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s); return sr_kemi_lua_return_int(L, ket, ret); } + } else if(ket->ptypes[1]==SR_KEMIP_LONG) { + if(ket->rtype==SR_KEMIP_XVAL) { + xret = ((sr_kemi_xfmsl_f)(ket->func))(env_L->msg, &vps[0].s, vps[1].l); + return sr_kemi_lua_return_xval(L, ket, xret); + } else { + ret = ((sr_kemi_fmsl_f)(ket->func))(env_L->msg, &vps[0].s, vps[1].l); + return sr_kemi_lua_return_int(L, ket, ret); + } } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s);

2 years

git:master:ccf74015: core: kemi - prototypes for kemi functions with (str, long) params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ccf74015e7f1bf60f56efa1f24a6370e0857c4c9 URL: https://github.com/kamailio/kamailio/commit/ccf74015e7f1bf60f56efa1f24a6370… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-24T10:32:29+01:00 core: kemi - prototypes for kemi functions with (str,long) params --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/ccf74015e7f1bf60f56efa1f24a6370… Patch: https://github.com/kamailio/kamailio/commit/ccf74015e7f1bf60f56efa1f24a6370… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 2a8ce7105f..9749f2632d 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -105,6 +105,7 @@ typedef int (*sr_kemi_fmnn_f)(sip_msg_t*, int, int); typedef int (*sr_kemi_fmns_f)(sip_msg_t*, int, str*); typedef int (*sr_kemi_fmsn_f)(sip_msg_t*, str*, int); typedef int (*sr_kemi_fmss_f)(sip_msg_t*, str*, str*); +typedef int (*sr_kemi_fmsl_f)(sip_msg_t*, str*, long); /* sip_msg_t and three int|str params */ typedef int (*sr_kemi_fmnnn_f)(sip_msg_t*, int, int, int); @@ -183,6 +184,7 @@ typedef sr_kemi_xval_t* (*sr_kemi_xfmnn_f)(sip_msg_t*, int, int); typedef sr_kemi_xval_t* (*sr_kemi_xfmns_f)(sip_msg_t*, int, str*); typedef sr_kemi_xval_t* (*sr_kemi_xfmsn_f)(sip_msg_t*, str*, int); typedef sr_kemi_xval_t* (*sr_kemi_xfmss_f)(sip_msg_t*, str*, str*); +typedef sr_kemi_xval_t* (*sr_kemi_xfmsl_f)(sip_msg_t*, str*, long); /* return xval, params sip_msg_t and three int|str params */ typedef sr_kemi_xval_t* (*sr_kemi_xfmnnn_f)(sip_msg_t*, int, int, int);

2 years

← Newer
1
...
13
14
15
16
17
18
19
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2022