sr-dev May 2019

sr-dev@lists.kamailio.org

29 participants
306 discussions

git:master:6bc7853a: app_python3: handle kemi sssi parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6bc7853a114fb000744cba3a43f346f71e640452 URL: https://github.com/kamailio/kamailio/commit/6bc7853a114fb000744cba3a43f346f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:06:07+02:00 app_python3: handle kemi sssi parameters --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/6bc7853a114fb000744cba3a43f346f… Patch: https://github.com/kamailio/kamailio/commit/6bc7853a114fb000744cba3a43f346f… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 380821389a..b01ac53890 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -358,6 +358,22 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + if(!PyArg_ParseTuple(args, "sssi:kemi-param-sssn", + &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].n)) { + LM_ERR("unable to retrieve str-str-str-int params %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + vps[1].s.len = strlen(vps[1].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are str: [%.*s] [%.*s]" + " [%.*s] [%d]\n", i, + fname.len, fname.s, vps[0].s.len, vps[0].s.s, + vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].n); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT

5 years, 7 months

git:master:a36f2c05: app_python: handle kemi sssi parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a36f2c050ff607b5f3c08b7fc8ed01e082e91dc8 URL: https://github.com/kamailio/kamailio/commit/a36f2c050ff607b5f3c08b7fc8ed01e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:05:26+02:00 app_python: handle kemi sssi parameters --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/a36f2c050ff607b5f3c08b7fc8ed01e… Patch: https://github.com/kamailio/kamailio/commit/a36f2c050ff607b5f3c08b7fc8ed01e… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 634fa53bfd..66430fa843 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -351,6 +351,22 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + if(!PyArg_ParseTuple(args, "sssi:kemi-param-sssn", + &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].n)) { + LM_ERR("unable to retrieve str-str-int-int params %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + vps[1].s.len = strlen(vps[1].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are str: [%.*s] [%.*s]" + " [%.*s] [%d]\n", i, + fname.len, fname.s, vps[0].s.len, vps[0].s.s, + vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].n); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT

5 years, 7 months

git:master:cbec7f92: apy_python: fixed condition in matching parameter types

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cbec7f92213de1ff096ea00c5a7a3b6354f7ede9 URL: https://github.com/kamailio/kamailio/commit/cbec7f92213de1ff096ea00c5a7a3b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T08:54:28+02:00 apy_python: fixed condition in matching parameter types - GH #1944 --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/cbec7f92213de1ff096ea00c5a7a3b6… Patch: https://github.com/kamailio/kamailio/commit/cbec7f92213de1ff096ea00c5a7a3b6… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index f89ff5252a..634fa53bfd 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -334,9 +334,9 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, } else if(ket->ptypes[4]==SR_KEMIP_NONE) { i = 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) { if(!PyArg_ParseTuple(args, "ssss:kemi-param-ssss", &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].s.s)) { LM_ERR("unable to retrieve str-str-str-str params %d\n", i); @@ -352,9 +352,9 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s); } 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_INT + && ket->ptypes[3]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "ssii:kemi-param-ssnn", &vps[0].s.s, &vps[1].s.s, &vps[2].n, &vps[3].n)) { LM_ERR("unable to retrieve str-str-int-int params %d\n", i); @@ -373,10 +373,10 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, } else if(ket->ptypes[5]==SR_KEMIP_NONE) { i = 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) { if(!PyArg_ParseTuple(args, "sssss:kemi-param-sssss", &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].s.s, &vps[4].s.s)) { @@ -394,10 +394,10 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s, vps[4].s.len, vps[4].s.s); } 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[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT + && ket->ptypes[4]==SR_KEMIP_STR) { if(!PyArg_ParseTuple(args, "ssiis:kemi-param-ssnns", &vps[0].s.s, &vps[1].s.s, &vps[2].n, &vps[3].n, &vps[4].s.s)) { @@ -419,11 +419,11 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, } else { i = 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) { if(!PyArg_ParseTuple(args, "ssssss:kemi-param-ssssss", &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].s.s, &vps[4].s.s, &vps[5].s.s)) {

5 years, 7 months

git:master:5d5b9786: app_python3: fixed condition for function with siis params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5d5b9786d3cd765a9cf957e34d849fec34bf5e9f URL: https://github.com/kamailio/kamailio/commit/5d5b9786d3cd765a9cf957e34d849fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T08:48:32+02:00 app_python3: fixed condition for function with siis params - GH #1944 --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/5d5b9786d3cd765a9cf957e34d849fe… Patch: https://github.com/kamailio/kamailio/commit/5d5b9786d3cd765a9cf957e34d849fe… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 18f9dd6aa6..380821389a 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -416,10 +416,10 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s, vps[4].s.len, vps[4].s.s); } 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[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT + && ket->ptypes[4]==SR_KEMIP_STR) { if(!PyArg_ParseTuple(args, "ssiis:kemi-param-ssnns", &vps[0].s.s, &vps[1].s.s, &vps[2].n, &vps[3].n, &vps[4].s.s)) {

5 years, 7 months

master siptrace not backwards compatible

by Juha Heinanen

I built K master and tried to use 5.2 config. That resulted in error: Apr 30 15:47:10 salmon /usr/bin/sip-proxy[1659]: ERROR: siptrace [siptrace.c:908]: w_sip_trace3(): no duplicate_uri modparam nor duplicate uri sip_trace() argument provided! I think it has been practice that backwards compatibility is provided by the next version.

5 years, 7 months

siptrace module of master back to 5.2 level

by Juha Heinanen

I haven't got any response about the misery with siptrace module. I checked its commit history and become to the conclusion that many commits to master were done without any review whatsoever. For example, there was this commit: siptrace: remove unused trace flag ionutionita92 authored and henningw committed on Mar 19 which obviously badly broke normal use of the module. Then 10 days later the commit was reverted: siptrace: add trace_flag after it was removed ionutionita92 authored and henningw committed 29 days ago This is not how Kamailio should be developed. I'm proposing to revert the module back to 5.2 level after which new commits can be made to it provided that each commit is carefully tested before deployed. -- Juha

5 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2019