sr-dev May 2018

sr-dev@lists.kamailio.org

22 participants
214 discussions

[kamailio/kamailio] lcr: export rule_id_avp with matching rule id (#1546)

by Carlos Cruz Luengo

#### Pre-Submission Checklist - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description LCR module exports information about selected gateways in flags and tag AVPs if you define corresponding modparams (flags_avp and tag_avp). This PR exports a similar optional AVP that stores the id of the rule that selected each gateway. For that, a new modparam is added (rule_id_avp). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1546 -- Commit Summary -- * lcr: export rule_id_avp with matching rule id -- File Changes -- M src/modules/lcr/doc/lcr_admin.xml (34) M src/modules/lcr/lcr_mod.c (62) M src/modules/lcr/lcr_mod.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1546.patch https://github.com/kamailio/kamailio/pull/1546.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1546

6 years, 6 months

Re: [sr-dev] [SR-Users] Developer Guide

by Henning Westerholt

Am Sonntag, 27. Mai 2018, 15:17:23 CEST schrieb Igor Olhovskiy: > Is http://www.asipto.com/pub/kamailio-devel-guide/ still holds actual info? > Cause it’s mostly for 3.3 version, and now is 5.1 > > And where to read, except source code of course, about how to develop > modules for Kamailio? (adding sr-dev as CC, as its a development question) Hello Igor, I would say that most of the core concepts (architecture, memory management, pseudo- variables etc..) are still valid. In my opinion the value of such a guide is not that it provides up to date information e.g. to the specific layout of header files, but instead gives an overview about the concepts and provide pointer to the appropriate parts of development. About the module development question - you probably already saw the chapter 16.9 about module development in this guide. This is a good start. Then look to some more simple modules like cfgutils or siputils to learn how to interact exactly with the core, the cfg, SIP msg etc.. For a new database module the db_mysql module is a good starting point. If you have more specific question, just ask them on our developer list sr-dev. Best regards, Henning

6 years, 6 months

git:master:93932a4f: rls: allocate size for normalized uri for cloning buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 93932a4ff18760d8fc8c59bd08984fd00cfd7759 URL: https://github.com/kamailio/kamailio/commit/93932a4ff18760d8fc8c59bd08984fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-27T10:56:00+02:00 rls: allocate size for normalized uri for cloning buffer - it can be longer than pres uri, when proto prefix needs to be added --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/93932a4ff18760d8fc8c59bd08984fd… Patch: https://github.com/kamailio/kamailio/commit/93932a4ff18760d8fc8c59bd08984fd… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index a96d1674f7..3d71e7e3f3 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -978,6 +978,8 @@ int send_resource_subs(char* uri, void* param) pres_uri.len, pres_uri.s); return -1; } + LM_DBG("pres uri [%.*s] - normalized uri [%.*s]\n", + pres_uri.len, pres_uri.s, normalized_uri->len, normalized_uri->s); if (parse_uri(normalized_uri->s, normalized_uri->len, &parsed_pres_uri) < 0) { @@ -1009,7 +1011,8 @@ int send_resource_subs(char* uri, void* param) LM_ERR("out of private memory\n"); return -1; } - if ((tmp_str->s = (char *)pkg_malloc(sizeof(char) * pres_uri.len)) == NULL) + if ((tmp_str->s = (char *)pkg_malloc(sizeof(char) + * normalized_uri->len)) == NULL) { pkg_free(tmp_str); LM_ERR("out of private memory\n");

6 years, 6 months

Re: [sr-dev] [kamailio/kamailio] topos_redis: proper length value when comparing to insert INVITE branch (2a3ca59)

by dtryba

This patch fixes the issue with PRACK and TOPOS reported in https://lists.kamailio.org/pipermail/sr-users/2018-May/101327.html -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/2a3ca5942291d29de05b14338a36cec…

6 years, 6 months

kamailio.org server maintenance work

by Oriol Capsada

Hello, A kamailio.org server maintenance work will be done today at 18:00 CEST. There will be some minutes of downtime (should be less than 5') of the following main services: website (including the wiki) and mailing lists. Regards, Oriol.

6 years, 6 months

[kamailio/kamailio] KSR.xhttp.xhttp_reply code cant understand type (#1544)

by ovoshlook

Hi. I'm building small HTTP API using kemi lua on kamailio 5.1 version: kamailio -v version: kamailio 5.1.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 18:16:53 Apr 7 2018 with gcc 4.8.5 On the system Linux CentOS-74-64-minimal 3.10.0-693.17.1.el7.x86_64 #1 SMP Thu Jan 25 20:13:58 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux When i sending xhttp_reply I getting wrong code that kamailio sends to the client instead of code I use Im used as this exmaple as template int xhttp_reply(int code, str "reason", str "ctype", str "body") as classic (with code in string) `KSR.xhttp.xhttp_reply("200", "OK", application/json, "")` So in both cases I getting next trouble: When i trying to set params to the xhttp_reply i getting this in the log (on debug layer) DEBUG: app_lua [app_lua_sr.c:1500]: sr_kemi_lua_exec_func_ex(): param[0] for: xhttp_reply is int: 200 DEBUG: app_lua [app_lua_sr.c:1496]: sr_kemi_lua_exec_func_ex(): param[1] for: xhttp_reply is str: OK DEBUG: app_lua [app_lua_sr.c:1496]: sr_kemi_lua_exec_func_ex(): param[2] for: xhttp_reply is str: application/json but next string I shows DEBUG: xhttp [xhttp_mod.c:443]: xhttp_send_reply(): sending out response: 161110576 OK This first 3 digits at the reslonse I see **161** 110576 Digits are random, as positive as negative (with "-" at the start) -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1544

6 years, 6 months

git:master:b035558e: app_python3: fix for executing kemi functions with 4 or more params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b035558ec76a68ee17b612adb9dce116ed89c48c URL: https://github.com/kamailio/kamailio/commit/b035558ec76a68ee17b612adb9dce11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-25T12:09:32+02:00 app_python3: fix for executing kemi functions with 4 or more params - more combinations for 4 params --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b035558ec76a68ee17b612adb9dce11… Patch: https://github.com/kamailio/kamailio/commit/b035558ec76a68ee17b612adb9dce11… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index cacd9067f4..fc0368822b 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -563,21 +563,37 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 4: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { /* ssss */ ret = ((sr_kemi_fmssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_apy_return_int(ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + /* ssnn */ + ret = ((sr_kemi_fmsssn_f)(ket->func))(lmsg, + &vps[0].s, &vps[1].s, &vps[2].s, vps[3].n); + return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { /* ssnn */ ret = ((sr_kemi_fmssnn_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + /* ssnn */ + ret = ((sr_kemi_fmnsss_f)(ket->func))(lmsg, + vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); + return sr_kemi_apy_return_int(ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname.len, fname.s); @@ -586,10 +602,10 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 5: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR) { /* sssss */ ret = ((sr_kemi_fmsssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, @@ -603,11 +619,11 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 6: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR - || ket->ptypes[5]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR + && ket->ptypes[5]==SR_KEMIP_STR) { /* ssssss */ ret = ((sr_kemi_fmssssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s,

6 years, 6 months

git:master:d86b67bb: app_sqlang: fix for executing kemi functions with 4 or more params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d86b67bbde300e4aa1be7ea7c5bdb21469ece03c URL: https://github.com/kamailio/kamailio/commit/d86b67bbde300e4aa1be7ea7c5bdb21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-25T12:01:00+02:00 app_sqlang: fix for executing kemi functions with 4 or more params - more combinations for 4 params --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/d86b67bbde300e4aa1be7ea7c5bdb21… Patch: https://github.com/kamailio/kamailio/commit/d86b67bbde300e4aa1be7ea7c5bdb21… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 77d98ddc3d..27f4ac2f36 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1330,19 +1330,33 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) break; case 4: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { ret = ((sr_kemi_fmssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_sqlang_return_int(J, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmsssn_f)(ket->func))(env_J->msg, + &vps[0].s, &vps[1].s, &vps[2].s, vps[3].n); + return sr_kemi_sqlang_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { ret = ((sr_kemi_fmssnn_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_sqlang_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnsss_f)(ket->func))(env_J->msg, + vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); + return sr_kemi_sqlang_return_int(J, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1351,10 +1365,10 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) break; case 5: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR) { ret = ((sr_kemi_fmsssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s); @@ -1367,11 +1381,11 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) break; case 6: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR - || ket->ptypes[5]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR + && ket->ptypes[5]==SR_KEMIP_STR) { ret = ((sr_kemi_fmssssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s, &vps[5].s);

6 years, 6 months

git:master:551e4d37: app_python: fix for executing kemi functions with 4 or more params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 551e4d372892d1d5c7803c3812d0bd4613efaf36 URL: https://github.com/kamailio/kamailio/commit/551e4d372892d1d5c7803c3812d0bd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-25T11:57:15+02:00 app_python: fix for executing kemi functions with 4 or more params - more combinations for 4 params --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/551e4d372892d1d5c7803c3812d0bd4… Patch: https://github.com/kamailio/kamailio/commit/551e4d372892d1d5c7803c3812d0bd4… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 6ea72e3d1c..6a1d62d932 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -560,21 +560,37 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 4: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { /* ssss */ ret = ((sr_kemi_fmssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_apy_return_int(ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + /* ssnn */ + ret = ((sr_kemi_fmsssn_f)(ket->func))(lmsg, + &vps[0].s, &vps[1].s, &vps[2].s, vps[3].n); + return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { /* ssnn */ ret = ((sr_kemi_fmssnn_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + /* ssnn */ + ret = ((sr_kemi_fmnsss_f)(ket->func))(lmsg, + vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); + return sr_kemi_apy_return_int(ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname.len, fname.s); @@ -583,10 +599,10 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 5: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR) { /* sssss */ ret = ((sr_kemi_fmsssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, @@ -600,11 +616,11 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 6: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR - || ket->ptypes[5]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR + && ket->ptypes[5]==SR_KEMIP_STR) { /* ssssss */ ret = ((sr_kemi_fmssssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s,

6 years, 6 months

git:master:81d517f0: app_jsdt: fix for executing kemi functions with 4 or more params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 81d517f0a3dcd769dc84ff019c58e248ef7eb466 URL: https://github.com/kamailio/kamailio/commit/81d517f0a3dcd769dc84ff019c58e24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-25T11:49:25+02:00 app_jsdt: fix for executing kemi functions with 4 or more params - more combinations for 4 params --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/81d517f0a3dcd769dc84ff019c58e24… Patch: https://github.com/kamailio/kamailio/commit/81d517f0a3dcd769dc84ff019c58e24… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index ef86d51165..1b6dba4145 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1120,19 +1120,33 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) break; case 4: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { ret = ((sr_kemi_fmssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_jsdt_return_int(J, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmsssn_f)(ket->func))(env_J->msg, + &vps[0].s, &vps[1].s, &vps[2].s, vps[3].n); + return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { ret = ((sr_kemi_fmssnn_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnsss_f)(ket->func))(env_J->msg, + vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); + return sr_kemi_jsdt_return_int(J, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1141,10 +1155,10 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) break; case 5: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR) { ret = ((sr_kemi_fmsssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s); @@ -1157,11 +1171,11 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) break; case 6: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR - || ket->ptypes[5]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR + && ket->ptypes[5]==SR_KEMIP_STR) { ret = ((sr_kemi_fmssssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s, &vps[5].s);

6 years, 6 months

← Newer
1
...
9
10
11
12
13
14
15
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2018