- sr-dev - kamailio.org

git:master:8531e4f5: app_python3: updates to use generic kemi function execution from core
by Daniel-Constantin Mierla 28 Nov '22

28 Nov '22

Module: kamailio Branch: master Commit: 8531e4f50ec33f06562bd102e334532df2474102 URL: https://github.com/kamailio/kamailio/commit/8531e4f50ec33f06562bd102e334532… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-28T14:27:34+01:00 app_python3: updates to use generic kemi function execution from core - replaced code to retrieve the function parameters from python to be more compact by walking the tuples list --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/8531e4f50ec33f06562bd102e334532… Patch: https://github.com/kamailio/kamailio/commit/8531e4f50ec33f06562bd102e334532…

1 0

Re: [sr-dev] [SR-Users] Info: Dates for next Kamailio World Conference in Berlin: June 5-7, 2023
by Alex Balashov 28 Nov '22

28 Nov '22

Ausgezeichnet!!! > On Nov 28, 2022, at 6:34 AM, Giovanni Maruzzelli <gmaruzz(a)gmail.com> wrote: > > On Mon, Nov 28, 2022 at 11:47 AM Daniel-Constantin Mierla <miconda(a)gmail.com> wrote: > > the next year Kamailio World Conference is planed to return in Berlin > for an in-person event at the usual location in the city center. > > > Yeeeeeeeeeeeeeeee!!!!! > > Super! > > -- > Sincerely, > > Giovanni Maruzzelli > OpenTelecom.IT > cell: +39 347 266 56 18 > -- Alex Balashov | Principal | Evariste Systems LLC Tel: +1-706-510-6800 / +1-800-250-5920 (toll-free) Web: http://www.evaristesys.com/, http://www.csrpswitch.com/

1 0

git:master:305b1323: pkg/kamailio/deb: version set 5.7.0~dev2
by Victor Seva 28 Nov '22

28 Nov '22

Module: kamailio Branch: master Commit: 305b13237cfbd11c45f19bc6a92b2fc829f05409 URL: https://github.com/kamailio/kamailio/commit/305b13237cfbd11c45f19bc6a92b2fc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-11-28T11:54:49+01:00 pkg/kamailio/deb: version set 5.7.0~dev2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/305b13237cfbd11c45f19bc6a92b2fc… Patch: https://github.com/kamailio/kamailio/commit/305b13237cfbd11c45f19bc6a92b2fc…

1 0

Info: Dates for next Kamailio World Conference in Berlin: June 5-7, 2023
by Daniel-Constantin Mierla 28 Nov '22

28 Nov '22

Hello, the next year Kamailio World Conference is planed to return in Berlin for an in-person event at the usual location in the city center. For the moment, we would like to announce the dates, respectively June 5-7, 2023. If nothing unexpected happens meanwhile, the call for speakers and registrations will be open at the beginning of 2023. We aim for a similar structure like the past in-person events, with first day starting around noon and targeting to be tutorial-oriented, followed by 2 days of conference presentations. More details soon! Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

[kamailio/kamailio] Bad content-length header value after invoking uac_auth() (Issue #3275)
by Ay 28 Nov '22

28 Nov '22

### Description We are trying to perform an outbound call through kamailio (5.6). When doing so, we are getting an expected 407 response from the trunk provider. As reponse we try to authenticate. This last invite being sent from kamailio to the trunk provider contains a bad content-length field. if the content header field value was 1234 in the original invite, the last ones content-header field value is 12341234. So it looks like it's not cleared before its set. ### Troubleshooting this source we used to troubleshoot: xlog("L_WARN", "TRUNKAUTH entered, message: $mbu\n"); AT THIS POINT CONTENT_HEADER = 1234 (just an example) if(t_check_status("401|407")) { $avp(auser) = "testuser"; $avp(apass) = "credshere"; uac_auth(); xlog("L_WARN", "TRUNKAUTH Auth done, updated message: $mbu\n"); AT THIS POINT CONTENT_HEADER = 12341234 route(RELAY); #### Reproduction See troubleshooting ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.6.2 (x86_64/linux) ``` * **Operating System**: ``` kamailio 5.6.2 (x86_64/linux) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3275 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3275(a)github.com>

3 18

git:master:afd78113: Makefile.defs: version set to 5.7.0-dev2
by Daniel-Constantin Mierla 28 Nov '22

28 Nov '22

Module: kamailio Branch: master Commit: afd781131248e4271c1ea9bc66dc5c76010838b7 URL: https://github.com/kamailio/kamailio/commit/afd781131248e4271c1ea9bc66dc5c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-28T09:55:39+01:00 Makefile.defs: version set to 5.7.0-dev2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/afd781131248e4271c1ea9bc66dc5c7… Patch: https://github.com/kamailio/kamailio/commit/afd781131248e4271c1ea9bc66dc5c7… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 1782abc657..cb41c11227 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.6:e8494799: pkg/kamailio/deb: fix jammy build
by Victor Seva 28 Nov '22

28 Nov '22

Module: kamailio Branch: 5.6 Commit: e8494799a86a0487c013ca457cac88fac4ce6501 URL: https://github.com/kamailio/kamailio/commit/e8494799a86a0487c013ca457cac88f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-11-28T10:05:40+01:00 pkg/kamailio/deb: fix jammy build --- Modified: pkg/kamailio/deb/debian/backports/jammy Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules --- Diff: https://github.com/kamailio/kamailio/commit/e8494799a86a0487c013ca457cac88f… Patch: https://github.com/kamailio/kamailio/commit/e8494799a86a0487c013ca457cac88f… --- diff --git a/pkg/kamailio/deb/debian/backports/jammy b/pkg/kamailio/deb/debian/backports/jammy index a469871dcf..097873e0fa 100755 --- a/pkg/kamailio/deb/debian/backports/jammy +++ b/pkg/kamailio/deb/debian/backports/jammy @@ -6,6 +6,12 @@ DIST=jammy rm -rf ${DIST} cp -r debian ${DIST} +# No mi_xmlrpc module +sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \ + ${DIST}/control +sed -i -e 's/ mi_xmlrpc[ ,$]*/ /' ${DIST}/rules +sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules + # No dnssec module: sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \ ${DIST}/control diff --git a/pkg/kamailio/deb/jammy/control b/pkg/kamailio/deb/jammy/control index 285c8be9a6..1c7ef64aa3 100644 --- a/pkg/kamailio/deb/jammy/control +++ b/pkg/kamailio/deb/jammy/control @@ -48,7 +48,6 @@ Build-Depends: libunistring-dev, libwebsockets-dev, libxml2-dev, - libxmlrpc-c3-dev, openssl, pkg-config, python3, diff --git a/pkg/kamailio/deb/jammy/rules b/pkg/kamailio/deb/jammy/rules index 3ab41f9f68..77ff6490f6 100755 --- a/pkg/kamailio/deb/jammy/rules +++ b/pkg/kamailio/deb/jammy/rules @@ -26,7 +26,7 @@ EXCLUDED_MODULES= # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, # they will be excluded from compile and install of all -EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy +EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc # module groups that are packaged in separate packages # (with the name kamailio-$(group_name)-modules)

1 0

git:5.6:5db7f5fe: pkg/kamailio/deb: refresh files after 6d55d9f903238479b6026b1d8feb8901d064e92c
by Victor Seva 27 Nov '22

27 Nov '22

Module: kamailio Branch: 5.6 Commit: 5db7f5fec945e8e7b49461a6e88d0efe2fef2c1e URL: https://github.com/kamailio/kamailio/commit/5db7f5fec945e8e7b49461a6e88d0ef… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-11-27T21:56:28+01:00 pkg/kamailio/deb: refresh files after 6d55d9f903238479b6026b1d8feb8901d064e92c --- Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/5db7f5fec945e8e7b49461a6e88d0ef… Patch: https://github.com/kamailio/kamailio/commit/5db7f5fec945e8e7b49461a6e88d0ef…

1 0

git:5.6:91192066: pkg/kamailio/deb: add initial support for jammy [skip ci]
by Victor Seva 27 Nov '22

27 Nov '22

Module: kamailio Branch: 5.6 Commit: 91192066d9b019b21d671e6ffc00ff0cf6c9e747 URL: https://github.com/kamailio/kamailio/commit/91192066d9b019b21d671e6ffc00ff0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-11-27T21:55:45+01:00 pkg/kamailio/deb: add initial support for jammy [skip ci] (cherry picked from commit ecbe90524165cf2fd8081ec5fe81d674f7a3334a) --- Added: pkg/kamailio/deb/debian/backports/jammy Added: pkg/kamailio/deb/jammy/changelog Added: pkg/kamailio/deb/jammy/compat Added: pkg/kamailio/deb/jammy/control Added: pkg/kamailio/deb/jammy/copyright Added: pkg/kamailio/deb/jammy/kamailio-autheph-modules.lintian-overrides Added: pkg/kamailio/deb/jammy/kamailio-berkeley-bin.dirs Added: pkg/kamailio/deb/jammy/kamailio-dnssec-modules.lintian-overrides Added: pkg/kamailio/deb/jammy/kamailio-outbound-modules.lintian-overrides Added: pkg/kamailio/deb/jammy/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/jammy/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/jammy/kamailio-tls-modules.lintian-overrides Added: pkg/kamailio/deb/jammy/kamailio-websocket-modules.lintian-overrides Added: pkg/kamailio/deb/jammy/kamailio.README.Debian Added: pkg/kamailio/deb/jammy/kamailio.default Added: pkg/kamailio/deb/jammy/kamailio.examples Added: pkg/kamailio/deb/jammy/kamailio.init Added: pkg/kamailio/deb/jammy/kamailio.lintian-overrides Added: pkg/kamailio/deb/jammy/kamailio.postinst Added: pkg/kamailio/deb/jammy/kamailio.service Added: pkg/kamailio/deb/jammy/rules Added: pkg/kamailio/deb/jammy/source.lintian-overrides Added: pkg/kamailio/deb/jammy/source/format Added: pkg/kamailio/deb/jammy/watch --- Diff: https://github.com/kamailio/kamailio/commit/91192066d9b019b21d671e6ffc00ff0… Patch: https://github.com/kamailio/kamailio/commit/91192066d9b019b21d671e6ffc00ff0…

1 0

git:master:977b56c7: app_ruby: updates to use generic kemi function execution from core
by Daniel-Constantin Mierla 26 Nov '22

26 Nov '22

Module: kamailio Branch: master Commit: 977b56c70c26b8f07cfdc557e32fbebc267c67bb URL: https://github.com/kamailio/kamailio/commit/977b56c70c26b8f07cfdc557e32fbeb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-26T14:19:22+01:00 app_ruby: updates to use generic kemi function execution from core --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/977b56c70c26b8f07cfdc557e32fbeb… Patch: https://github.com/kamailio/kamailio/commit/977b56c70c26b8f07cfdc557e32fbeb…

1 0

[kamailio/kamailio] To stop automatic creation of RabbitMQ queues by kazoo module (Issue #3285)
by sharmilas123 25 Nov '22

25 Nov '22

Hello Team, **Description** Automatic queue creation with Kazoo module in kamailio. Noticed that , amqp_max_channels parameter creates automatic queues in Rabbitmq-server based on the channel number provided. Expecting that , it should create only channels not queues. **Parameter Used** modparam("kazoo", "amqp_max_channels", 10) **Additional Information** Kamailio Version - output of kamailio -v kamailio 5.5.1 (x86_64/linux) Can any one help on this issue as why the kazoo module creates an automatic queue based on amqp_max_channels param ? Thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3285 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3285(a)github.com>

2 2

git:master:ae1628ff: app_jsdt: updates to use generic kemi function execution from core
by Daniel-Constantin Mierla 25 Nov '22

25 Nov '22

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…

1 0

git:master:e93c9356: app_sqlang: updates to use generic kemi function execution from core
by Daniel-Constantin Mierla 25 Nov '22

25 Nov '22

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…

1 0

git:master:6820b78c: app_lua: updates to use generic kemi function execution from core
by Daniel-Constantin Mierla 25 Nov '22

25 Nov '22

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…

1 0

git:master:08c385ab: misc/tools/kemi/kemi-code-gen.py: updates for generating generic execution function
by Daniel-Constantin Mierla 25 Nov '22

25 Nov '22

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)")

1 0

git:master:c38c1801: core: kemi - added prototypes for various functions with 4+ params
by Daniel-Constantin Mierla 25 Nov '22

25 Nov '22

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…

1 0

git:master:74796c75: core: kemi - added generic function to execute a kemi export with any kind of parameters
by Daniel-Constantin Mierla 25 Nov '22

25 Nov '22

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…

1 0

git:master:11ffe722: app_lua: updated handling function with (str, xval) params
by Daniel-Constantin Mierla 25 Nov '22

25 Nov '22

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 {

1 0

git:master:360337fc: core: kemi - changed prototypes with xval instead of long param
by Daniel-Constantin Mierla 25 Nov '22

25 Nov '22

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);

1 0

git:master:63d0df60: app_lua: support returning long value and functions with (str, long) params
by Daniel-Constantin Mierla 24 Nov '22

24 Nov '22

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);

1 0

git:master:ccf74015: core: kemi - prototypes for kemi functions with (str, long) params
by Daniel-Constantin Mierla 24 Nov '22

24 Nov '22

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);

1 0

git:master:8b5531ad: core: kemi - added long type and field to xval union
by Daniel-Constantin Mierla 24 Nov '22

24 Nov '22

Module: kamailio Branch: master Commit: 8b5531ad22fb324551ed27aa0beac2033df1afd8 URL: https://github.com/kamailio/kamailio/commit/8b5531ad22fb324551ed27aa0beac20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-24T09:56:15+01:00 core: kemi - added long type and field to xval union --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/8b5531ad22fb324551ed27aa0beac20… Patch: https://github.com/kamailio/kamailio/commit/8b5531ad22fb324551ed27aa0beac20… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 26e9bd4860..2a8ce7105f 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -30,10 +30,11 @@ #define SR_KEMIP_INT (1<<0) /* type integer */ #define SR_KEMIP_STR (1<<1) /* type str* */ #define SR_KEMIP_BOOL (1<<2) /* type boolean (0/1) */ -#define SR_KEMIP_XVAL (1<<3) /* type extended value (integer, str*, ...) */ -#define SR_KEMIP_NULL (1<<4) /* type NULL */ -#define SR_KEMIP_DICT (1<<5) /* type dictionary */ -#define SR_KEMIP_ARRAY (1<<6) /* type array */ +#define SR_KEMIP_LONG (1<<3) /* type long integer */ +#define SR_KEMIP_XVAL (1<<4) /* type extended value (integer, str*, ...) */ +#define SR_KEMIP_NULL (1<<5) /* type NULL */ +#define SR_KEMIP_DICT (1<<6) /* type dictionary */ +#define SR_KEMIP_ARRAY (1<<7) /* type array */ #define SR_KEMI_FALSE 0 #define SR_KEMI_TRUE 1 @@ -65,6 +66,7 @@ typedef struct sr_kemi_module { typedef union { int n; + long l; str s; } sr_kemi_val_t; @@ -75,6 +77,7 @@ typedef struct sr_kemi_dict_item int vtype; union { int n; + long l; str s; struct sr_kemi_dict_item *dict; } v; @@ -84,6 +87,7 @@ typedef struct sr_kemi_xval { int vtype; union { int n; + long l; str s; sr_kemi_dict_item_t *dict; } v;

1 0

git:master:3406b914: core: kemi - function to get/set pv with long value
by Daniel-Constantin Mierla 24 Nov '22

24 Nov '22

Module: kamailio Branch: master Commit: 3406b9143a399a0445d09b83f40fe2fbe1781761 URL: https://github.com/kamailio/kamailio/commit/3406b9143a399a0445d09b83f40fe2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-24T10:15:33+01:00 core: kemi - function to get/set pv with long value --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3406b9143a399a0445d09b83f40fe2f… Patch: https://github.com/kamailio/kamailio/commit/3406b9143a399a0445d09b83f40fe2f… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index d6716507b3..ed98bffd44 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -3164,6 +3164,51 @@ static int sr_kemi_pv_geti (sip_msg_t *msg, str *pvn) return vi; } +/** + * + */ +static sr_kemi_xval_t* sr_kemi_pv_getl (sip_msg_t *msg, str *pvn) +{ + pv_spec_t *pvs; + pv_value_t val; + int vi; + + memset(&_sr_kemi_xval, 0, sizeof(sr_kemi_xval_t)); + _sr_kemi_xval.vtype = SR_KEMIP_LONG; + + LM_DBG("pv get: %.*s\n", pvn->len, pvn->s); + vi = pv_locate_name(pvn); + if(vi != pvn->len) { + LM_WARN("invalid pv [%.*s] (%d/%d)\n", pvn->len, pvn->s, vi, pvn->len); + return &_sr_kemi_xval; + } + pvs = pv_cache_get(pvn); + if(pvs==NULL) { + LM_WARN("cannot get pv spec for [%.*s]\n", pvn->len, pvn->s); + return &_sr_kemi_xval; + } + + memset(&val, 0, sizeof(pv_value_t)); + if(pv_get_spec_value(msg, pvs, &val) != 0) { + LM_WARN("unable to get pv value for [%.*s]\n", pvn->len, pvn->s); + return &_sr_kemi_xval; + } + if(val.flags&PV_VAL_NULL) { + return &_sr_kemi_xval; + } + if(val.flags&(PV_TYPE_INT|PV_VAL_INT)) { + _sr_kemi_xval.v.l = val.ri; + return &_sr_kemi_xval; + } + if(val.ri!=0) { + _sr_kemi_xval.v.l = val.ri; + return &_sr_kemi_xval; + } + str2slong(&val.rs, &_sr_kemi_xval.v.l); + + return &_sr_kemi_xval; +} + /** * */ @@ -3197,6 +3242,43 @@ static int sr_kemi_pv_seti (sip_msg_t *msg, str *pvn, int ival) return SR_KEMI_TRUE; } +/** + * + */ +static int sr_kemi_pv_setl (sip_msg_t *msg, str *pvn, sr_kemi_xval_t *xval) +{ + pv_spec_t *pvs; + pv_value_t val; + int pl; + + LM_DBG("pv get: %.*s\n", pvn->len, pvn->s); + pl = pv_locate_name(pvn); + if(pl != pvn->len) { + LM_ERR("invalid pv [%.*s] (%d/%d)\n", pvn->len, pvn->s, pl, pvn->len); + return SR_KEMI_FALSE; + } + pvs = pv_cache_get(pvn); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", pvn->len, pvn->s); + return SR_KEMI_FALSE; + } + + memset(&val, 0, sizeof(pv_value_t)); + if(xval==NULL || !(xval->vtype & SR_KEMIP_LONG)) { + val.ri = 0; + } else { + val.ri = xval->v.l; + } + val.flags |= PV_TYPE_INT|PV_VAL_INT; + + if(pv_set_spec_value(msg, pvs, 0, &val)<0) { + LM_ERR("unable to set pv [%.*s]\n", pvn->len, pvn->s); + return SR_KEMI_FALSE; + } + + return SR_KEMI_TRUE; +} + /** * */ @@ -3317,6 +3399,11 @@ static sr_kemi_t _sr_kemi_pv[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pv"), str_init("getl"), + SR_KEMIP_XVAL, sr_kemi_pv_getl, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pv"), str_init("getvn"), SR_KEMIP_XVAL, sr_kemi_pv_getvn, { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, @@ -3332,6 +3419,11 @@ static sr_kemi_t _sr_kemi_pv[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pv"), str_init("setl"), + SR_KEMIP_BOOL, sr_kemi_pv_setl, + { SR_KEMIP_STR, SR_KEMIP_LONG, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pv"), str_init("sets"), SR_KEMIP_BOOL, sr_kemi_pv_sets, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] kamailio crashs at startup in musl enviroment (Issue #3281)
by giupand 23 Nov '22

23 Nov '22

### Description  I'm testing kamailio v 5.6.1 in an alpine linux docker with musl libc (x86_64) Version 1.2.3 and I see a kamailio crash just with version option (kamailio --version). The crash occur if I haven't localhost resolution in /etc/hosts. This isn't a canonical situation, but crash occur! Running kamailio with gdb I see that the problem is in freeaddrinfo call in log_init function. #### Reproduction  cat /etc/hosts #127.0.0.1 localhost #::1 localhost ip6-localhost ip6-loopback fe00::0 ip6-localnet ff00::0 ip6-mcastprefix ff02::1 ip6-allnodes ff02::2 ip6-allrouters #172.30.0.3 bd9375eeb5af #2001:db8:1111:2222:0:242:ac1e:3 bd9375eeb5af / # / # kamailio --version Segmentation fault (core dumped) #### Debugging Data  ``` # gdb --args kamailio --version GNU gdb (GDB) 9.2 Copyright (C) 2020 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-alpine-linux-musl". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from kamailio... (gdb) run Starting program: /usr/local/sbin/kamailio --version Program received signal SIGSEGV, Segmentation fault. 0x00007ffff7f9f5ed in freeaddrinfo () from /lib/ld-musl-x86_64.so.1 (gdb) bt #0 0x00007ffff7f9f5ed in freeaddrinfo () from /lib/ld-musl-x86_64.so.1 #1 0x000055555559087d in calc_proc_no () at main.c:1976 #2 0x00007fffffffe8d0 in ?? () #3 0x00007fffffffed58 in ?? () #4 0x000055555561b143 in log_init () at core/dprint.c:483 Backtrace stopped: previous frame inner to this frame (corrupt stack?) ``` ### Possible Solutions  I suppose that log_init function needs a check for info pointer. If info pointer is not NULL, then call freeaddrinfo. I see similar protections in other points of code. ``` void log_init(void) { struct addrinfo hints; struct addrinfo *info = NULL; int gai_result; char hostname[1024]; hostname[1023] = '\0'; gethostname (hostname, 1023); memset (&hints, 0, sizeof (hints)); hints.ai_family = AF_UNSPEC; /*either IPV4 or IPV6 */ hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_CANONNAME; if ((gai_result = getaddrinfo (hostname, 0, &hints, &info)) != 0) { log_fqdn = "?"; } else if (info == NULL) { log_fqdn = "?"; } else { log_fqdn = strdup (info->ai_canonname); } if(info) // add pointer validity freeaddrinfo (info); dprint_init_colors(); } ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.2 (x86_64/linux) 54a9c1 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 54a9c1 compiled on 09:26:43 Nov 15 2022 with gcc 9.3.0 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3281 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3281(a)github.com>

3 3

git:master:6438573c: core: safety check for freeaddrinfo() param on log_init()
by Daniel-Constantin Mierla 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: 6438573ce2d138d83cc1fa7cd88834c48d623ac6 URL: https://github.com/kamailio/kamailio/commit/6438573ce2d138d83cc1fa7cd88834c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-23T10:51:56+01:00 core: safety check for freeaddrinfo() param on log_init() - GH #3281 --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/6438573ce2d138d83cc1fa7cd88834c… Patch: https://github.com/kamailio/kamailio/commit/6438573ce2d138d83cc1fa7cd88834c… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index ff63fd9ff1..0f1eef773d 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -480,7 +480,9 @@ void log_init(void) log_fqdn = strdup (info->ai_canonname); } - freeaddrinfo (info); + if(info!=NULL) { + freeaddrinfo (info); + } dprint_init_colors(); }

1 0

git:master:b4270a57: modules: readme files regenerated - jwt ... [skip ci]
by Kamailio Dev 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: b4270a57ed10b9fcad56170bf808cc01aaeb7d7f URL: https://github.com/kamailio/kamailio/commit/b4270a57ed10b9fcad56170bf808cc0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-23T10:46:56+01:00 modules: readme files regenerated - jwt ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/b4270a57ed10b9fcad56170bf808cc0… Patch: https://github.com/kamailio/kamailio/commit/b4270a57ed10b9fcad56170bf808cc0… --- diff --git a/src/modules/jwt/README b/src/modules/jwt/README index 4c266bbd01..c4c9610f31 100644 --- a/src/modules/jwt/README +++ b/src/modules/jwt/README @@ -30,7 +30,8 @@ Daniel-Constantin Mierla 4. Functions 4.1. jwt_generate(prvkey, alg, claims, [headers]) - 4.2. jwt_verify(pubkey, alg, claims, jwtval) + 4.2. jwt_verify(pubkeypath, alg, claims, jwtval) + 4.3. jwt_verify_key(pubkeyval, alg, claims, jwtval) 5. Variables @@ -41,7 +42,8 @@ Daniel-Constantin Mierla 1.1. Set key_mode parameter 1.2. jwt_generate usage 1.3. jwt_verify usage - 1.4. $jwt(name) usage + 1.4. jwt_verify_key usage + 1.5. $jwt(name) usage Chapter 1. Admin Guide @@ -60,7 +62,8 @@ Chapter 1. Admin Guide 4. Functions 4.1. jwt_generate(prvkey, alg, claims, [headers]) - 4.2. jwt_verify(pubkey, alg, claims, jwtval) + 4.2. jwt_verify(pubkeypath, alg, claims, jwtval) + 4.3. jwt_verify_key(pubkeyval, alg, claims, jwtval) 5. Variables @@ -110,7 +113,8 @@ modparam("jwt", "key_mode", 1) 4. Functions 4.1. jwt_generate(prvkey, alg, claims, [headers]) - 4.2. jwt_verify(pubkey, alg, claims, jwtval) + 4.2. jwt_verify(pubkeypath, alg, claims, jwtval) + 4.3. jwt_verify_key(pubkeyval, alg, claims, jwtval) 4.1. jwt_generate(prvkey, alg, claims, [headers]) @@ -141,12 +145,12 @@ modparam("jwt", "key_mode", 1) "caller='$fU';callee='$tU';callid='$ci';index=100"); ... -4.2. jwt_verify(pubkey, alg, claims, jwtval) +4.2. jwt_verify(pubkeypath, alg, claims, jwtval) Verify the JWT. The parameters are: - * pubkey - path to public key + * pubkeypath - path to public key file * alg - the algoritm to build the signature, as supported by the libjwt (e.g., RS256, HS256, ES256, ...) * claims - the list of claims to be checked they are in the JWT, in @@ -166,6 +170,31 @@ modparam("jwt", "key_mode", 1) } ... +4.3. jwt_verify_key(pubkeyval, alg, claims, jwtval) + + Verify the JWT. + + The parameters are: + * pubkeyval - public key value + * alg - the algoritm to build the signature, as supported by the + libjwt (e.g., RS256, HS256, ES256, ...) + * claims - the list of claims to be checked they are in the JWT, in + the format "name1=value1;name2=value2;..." (same as the SIP + parameters format, see also the description of claims parameter for + jwt_generate()). + * jwtval - the value of the JWT to verify + + This function can be used from ANY_ROUTE. + + Example 1.4. jwt_verify_key usage +... + if(!jwt_verify_key("...", "RS256", + "caller='$fU';callee='$tU';callid='$ci';index=100", + "$var(jwt)") { + xwarn("failed to verify jwt\n"); + } +... + 5. Variables 5.1. $jwt(key) @@ -178,7 +207,7 @@ modparam("jwt", "key_mode", 1) * val - the value of JWT after a successful jwt_generate(). * status - the status of verification after a failed jwt_verify(). - Example 1.4. $jwt(name) usage + Example 1.5. $jwt(name) usage ... jwt_generate("/path/to/prvkey.pem", "RS256", "caller='$fU';callee='$tU';callid='$ci';index=100");

1 0

[kamailio/kamailio] jwt_mod.c HS256 secret inside a file kdata.len is off by one (Issue #3282)
by momoterraw 23 Nov '22

23 Nov '22

In my use case I use HS256 so its a shared secret normally using a string with environment variable or something, not a key file. The jwt mod expects a file to load up the secret/key. So I just create a file with the secret inside the file, but I keep getting. ``` failed to decode jwt value ``` After digging into the source and trying to debug. It looks like when it's handing secret in a file the kdata.len is off by one. This is the dirty fix for me. ``` diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 233a0709..a67d0b89 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -509,7 +509,7 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, } } - ret = jwt_decode(&jwt, jwtval->s, (unsigned char*)kdata.s, (size_t)kdata.len); + ret = jwt_decode(&jwt, jwtval->s, (unsigned char*)kdata.s, (size_t)kdata.len-1); if (ret!=0 || jwt==NULL) { LM_ERR("failed to decode jwt value\n"); goto error; ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3282 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3282(a)github.com>

3 4

git:master:8d33363b: jwt: docs for jwt_verify_key(...)
by Daniel-Constantin Mierla 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: 8d33363b5ec93ebd0068f270af23be9095950775 URL: https://github.com/kamailio/kamailio/commit/8d33363b5ec93ebd0068f270af23be9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-23T10:39:18+01:00 jwt: docs for jwt_verify_key(...) --- Modified: src/modules/jwt/doc/jwt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8d33363b5ec93ebd0068f270af23be9… Patch: https://github.com/kamailio/kamailio/commit/8d33363b5ec93ebd0068f270af23be9… --- diff --git a/src/modules/jwt/doc/jwt_admin.xml b/src/modules/jwt/doc/jwt_admin.xml index a72c518efe6..f247b43b46d 100644 --- a/src/modules/jwt/doc/jwt_admin.xml +++ b/src/modules/jwt/doc/jwt_admin.xml @@ -142,7 +142,7 @@ modparam("jwt", "key_mode", 1) <section id="jwt.f.jwt_verify"> <title> - <function moreinfo="none">jwt_verify(pubkey, alg, claims, jwtval)</function> + <function moreinfo="none">jwt_verify(pubkeypath, alg, claims, jwtval)</function> </title> <para> Verify the JWT. @@ -153,7 +153,7 @@ modparam("jwt", "key_mode", 1) <itemizedlist> <listitem> <para> - pubkey - path to public key + pubkeypath - path to public key file </para> </listitem> <listitem> @@ -188,6 +188,58 @@ modparam("jwt", "key_mode", 1) xwarn("failed to verify jwt\n"); } ... +</programlisting> + </example> + </section> + + <section id="jwt.f.jwt_verify_key"> + <title> + <function moreinfo="none">jwt_verify_key(pubkeyval, alg, claims, jwtval)</function> + </title> + <para> + Verify the JWT. + </para> + <para> + The parameters are: + </para> + <itemizedlist> + <listitem> + <para> + pubkeyval - public key value + </para> + </listitem> + <listitem> + <para> + alg - the algoritm to build the signature, as supported by the + libjwt (e.g., RS256, HS256, ES256, ...) + </para> + </listitem> + <listitem> + <para> + claims - the list of claims to be checked they are in the JWT, in the format + "name1=value1;name2=value2;..." (same as the SIP parameters format, + see also the description of claims parameter for jwt_generate()). + </para> + </listitem> + <listitem> + <para> + jwtval - the value of the JWT to verify + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>jwt_verify_key</function> usage</title> + <programlisting format="linespecific"> +... + if(!jwt_verify_key("...", "RS256", + "caller='$fU';callee='$tU';callid='$ci';index=100", + "$var(jwt)") { + xwarn("failed to verify jwt\n"); + } +... </programlisting> </example> </section>

1 0

git:master:269455ef: jwt: renamed parameter to indicate is a path to file
by Daniel-Constantin Mierla 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: 269455efb3827c9700f85715113b1757508b9767 URL: https://github.com/kamailio/kamailio/commit/269455efb3827c9700f85715113b175… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-23T10:32:40+01:00 jwt: renamed parameter to indicate is a path to file --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/269455efb3827c9700f85715113b175… Patch: https://github.com/kamailio/kamailio/commit/269455efb3827c9700f85715113b175… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index d533b88a15..0afedd237c 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -44,7 +44,7 @@ static void mod_destroy(void); static int w_jwt_generate_4(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, char* pheaders); static int w_jwt_generate_3(sip_msg_t* msg, char* pkey, char* palg, char* pclaims); -static int w_jwt_verify(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, +static int w_jwt_verify(sip_msg_t* msg, char* pkeypath, char* palg, char* pclaims, char *pjwtval); static int _jwt_key_mode = 0; @@ -418,16 +418,13 @@ static int w_jwt_generate_4(sip_msg_t* msg, char* pkey, char* palg, char* pclaim /** * */ -static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, +static int ki_jwt_verify_key(sip_msg_t* msg, str *key, str *alg, str *claims, str *jwtval) { str dupclaims = STR_NULL; jwt_alg_t valg = JWT_ALG_NONE; str kdata = STR_NULL; time_t iat; - FILE *fpk = NULL; - unsigned char keybuf[10240]; - size_t keybuf_len = 0; param_t* params_list = NULL; param_hooks_t phooks; param_t *pit = NULL; @@ -446,6 +443,8 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, _jwt_verify_status = 0; + kdata = *key; + trim(&kdata); valg = jwt_str_alg(alg->s); if (valg == JWT_ALG_INVAL) { LM_ERR("not supported algorithm: %s\n", alg->s); @@ -455,25 +454,6 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, LM_ERR("failed to duplicate claims\n"); return -1; } - jwt_fcache_get(key, &kdata); - if(kdata.s==NULL) { - fpk= fopen(key->s, "r"); - if(fpk==NULL) { - LM_ERR("failed to read key file: %s\n", key->s); - goto error; - } - keybuf_len = fread(keybuf, 1, sizeof(keybuf), fpk); - fclose(fpk); - if(keybuf_len==0) { - LM_ERR("unable to read key file content: %s\n", key->s); - goto error; - } - kdata.s = (char*)keybuf; - kdata.len = (int)keybuf_len; - trim(&kdata); - kdata.s[keybuf_len] = '\0'; - jwt_fcache_add(key, &kdata); - } sparams = dupclaims; if(sparams.s[sparams.len-1]==';') { sparams.len--; @@ -548,15 +528,55 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, /** * */ -static int w_jwt_verify(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, +static int ki_jwt_verify(sip_msg_t* msg, str *keypath, str *alg, str *claims, + str *jwtval) +{ + str kdata = STR_NULL; + FILE *fpk = NULL; + unsigned char keybuf[10240]; + size_t keybuf_len = 0; + + if(keypath==NULL || keypath->s==NULL || alg==NULL || alg->s==NULL + || claims==NULL || claims->s==NULL || claims->len<=0 + || jwtval==NULL || jwtval->s==NULL || jwtval->len<=0) { + LM_ERR("invalid parameters\n"); + return -1; + } + + jwt_fcache_get(keypath, &kdata); + if(kdata.s==NULL) { + fpk= fopen(keypath->s, "r"); + if(fpk==NULL) { + LM_ERR("failed to read key file: %s\n", keypath->s); + return -1; + } + keybuf_len = fread(keybuf, 1, sizeof(keybuf), fpk); + fclose(fpk); + if(keybuf_len==0) { + LM_ERR("unable to read key file content: %s\n", keypath->s); + return -1; + } + kdata.s = (char*)keybuf; + kdata.len = (int)keybuf_len; + trim(&kdata); + kdata.s[keybuf_len] = '\0'; + jwt_fcache_add(keypath, &kdata); + } + return ki_jwt_verify_key(msg, &kdata, alg, claims, jwtval); +} + +/** + * + */ +static int w_jwt_verify(sip_msg_t* msg, char* pkeypath, char* palg, char* pclaims, char *pjwtval) { - str skey = STR_NULL; + str skeypath = STR_NULL; str salg = STR_NULL; str sclaims = STR_NULL; str sjwtval = STR_NULL; - if (fixup_get_svalue(msg, (gparam_t*)pkey, &skey) != 0) { + if (fixup_get_svalue(msg, (gparam_t*)pkeypath, &skeypath) != 0) { LM_ERR("cannot get path to the key file\n"); return -1; } @@ -573,7 +593,7 @@ static int w_jwt_verify(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, return -1; } - return ki_jwt_verify(msg, &skey, &salg, &sclaims, &sjwtval); + return ki_jwt_verify(msg, &skeypath, &salg, &sclaims, &sjwtval); } /**

1 0

git:master:f264b374: jwt: added function to verify with key value given as parameter
by Daniel-Constantin Mierla 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: f264b3745a2e666f9bb617cb1d5cf9ac0e1a439e URL: https://github.com/kamailio/kamailio/commit/f264b3745a2e666f9bb617cb1d5cf9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-23T10:35:55+01:00 jwt: added function to verify with key value given as parameter --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f264b3745a2e666f9bb617cb1d5cf9a… Patch: https://github.com/kamailio/kamailio/commit/f264b3745a2e666f9bb617cb1d5cf9a… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 0afedd237c..adda8d3845 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -46,6 +46,8 @@ static int w_jwt_generate_4(sip_msg_t* msg, char* pkey, char* palg, char* pclaim static int w_jwt_generate_3(sip_msg_t* msg, char* pkey, char* palg, char* pclaims); static int w_jwt_verify(sip_msg_t* msg, char* pkeypath, char* palg, char* pclaims, char *pjwtval); +static int w_jwt_verify_key(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, + char *pjwtval); static int _jwt_key_mode = 0; @@ -67,6 +69,8 @@ static cmd_export_t cmds[]={ fixup_spve_all, 0, ANY_ROUTE}, {"jwt_verify", (cmd_function)w_jwt_verify, 4, fixup_spve_all, 0, ANY_ROUTE}, + {"jwt_verify_key", (cmd_function)w_jwt_verify_key, 4, + fixup_spve_all, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -596,6 +600,37 @@ static int w_jwt_verify(sip_msg_t* msg, char* pkeypath, char* palg, char* pclaim return ki_jwt_verify(msg, &skeypath, &salg, &sclaims, &sjwtval); } +/** + * + */ +static int w_jwt_verify_key(sip_msg_t* msg, char* pkey, char* palg, char* pclaims, + char *pjwtval) +{ + str skey = STR_NULL; + str salg = STR_NULL; + str sclaims = STR_NULL; + str sjwtval = STR_NULL; + + if (fixup_get_svalue(msg, (gparam_t*)pkey, &skey) != 0) { + LM_ERR("cannot get the key value\n"); + return -1; + } + if (fixup_get_svalue(msg, (gparam_t*)palg, &salg) != 0) { + LM_ERR("cannot get algorithm value\n"); + return -1; + } + if (fixup_get_svalue(msg, (gparam_t*)pclaims, &sclaims) != 0) { + LM_ERR("cannot get claims value\n"); + return -1; + } + if (fixup_get_svalue(msg, (gparam_t*)pjwtval, &sjwtval) != 0) { + LM_ERR("cannot get jwt value\n"); + return -1; + } + + return ki_jwt_verify(msg, &skey, &salg, &sclaims, &sjwtval); +} + /** * */ @@ -650,6 +685,11 @@ static sr_kemi_t sr_kemi_jwt_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("jwt"), str_init("jwt_verify_key"), + SR_KEMIP_INT, ki_jwt_verify_key, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:92998664: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: 929986648dcfefa1212cbfcc129b7bb3a44259d6 URL: https://github.com/kamailio/kamailio/commit/929986648dcfefa1212cbfcc129b7bb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-23T09:16:28+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/929986648dcfefa1212cbfcc129b7bb… Patch: https://github.com/kamailio/kamailio/commit/929986648dcfefa1212cbfcc129b7bb… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index 9e378a5681..571ba1872f 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -1135,7 +1135,7 @@ kamcmd presence.updateWatchers sip:alice@domain.com presence Parameters: * mode - (optional) it can be 'full' to print all the fields of - presentity record. If missine, only a selected set of fields are + presentity record. If missing, only a selected set of fields are printed in the response. RPC Command Format:

1 0

git:master:ced18c6f: presence: docs - small typo
by Daniel-Constantin Mierla 23 Nov '22

23 Nov '22

Module: kamailio Branch: master Commit: ced18c6f3c3a4632cb23510334466c236f08d26f URL: https://github.com/kamailio/kamailio/commit/ced18c6f3c3a4632cb23510334466c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-23T09:07:44+01:00 presence: docs - small typo --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ced18c6f3c3a4632cb23510334466c2… Patch: https://github.com/kamailio/kamailio/commit/ced18c6f3c3a4632cb23510334466c2… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 7e425105aa4..9a1a655cc17 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1381,7 +1381,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); <itemizedlist> <listitem> <para>mode - (optional) it can be 'full' to print all the - fields of presentity record. If missine, only a selected + fields of presentity record. If missing, only a selected set of fields are printed in the response.</para> </listitem> </itemizedlist>

1 0

git:master:e37d9dbc: cnxcc: updated to use xavp long value field
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: e37d9dbcfd199797a3514392e5a03f98a2c1151b URL: https://github.com/kamailio/kamailio/commit/e37d9dbcfd199797a3514392e5a03f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:18:04+01:00 cnxcc: updated to use xavp long value field --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e37d9dbcfd199797a3514392e5a03f9… Patch: https://github.com/kamailio/kamailio/commit/e37d9dbcfd199797a3514392e5a03f9… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index e84d63acff6..e30e875787c 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -2028,7 +2028,7 @@ static int __pv_get_calls( case CNX_PV_DROPPED: return pv_get_uintval(msg, param, res, _data.stats->dropped); default: - LM_ERR("Unknown PV type %d\n", param->pvn.u.isname.name.n); + LM_ERR("Unknown PV type %ld\n", param->pvn.u.isname.name.n); break; }

1 0

git:master:4a6b6e3f: auth_radius: updated to use xavp long value field
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: 4a6b6e3f14318794405ba88a50f3d78971d60197 URL: https://github.com/kamailio/kamailio/commit/4a6b6e3f14318794405ba88a50f3d78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:19:06+01:00 auth_radius: updated to use xavp long value field --- Modified: src/modules/auth_radius/sterman.c --- Diff: https://github.com/kamailio/kamailio/commit/4a6b6e3f14318794405ba88a50f3d78… Patch: https://github.com/kamailio/kamailio/commit/4a6b6e3f14318794405ba88a50f3d78… --- diff --git a/src/modules/auth_radius/sterman.c b/src/modules/auth_radius/sterman.c index 25eac9c9f57..1c18328826e 100644 --- a/src/modules/auth_radius/sterman.c +++ b/src/modules/auth_radius/sterman.c @@ -160,7 +160,7 @@ static int generate_avps(VALUE_PAIR *received) if(add_avp(flags, name, val) < 0) { LM_ERR("unable to create a new AVP\n"); } else { - LM_DBG("AVP '%.*s'/%d='%.*s'/%d has been added\n", + LM_DBG("AVP '%.*s'/%ld='%.*s'/%ld has been added\n", (flags & AVP_NAME_STR) ? name.s.len : 4, (flags & AVP_NAME_STR) ? name.s.s : "null", (flags & AVP_NAME_STR) ? 0 : name.n,

1 0

git:master:68dcaf76: misc_radius: updated to use xavp long value field
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: 68dcaf766c5c08ebb9ad08a9203f40dd77b74933 URL: https://github.com/kamailio/kamailio/commit/68dcaf766c5c08ebb9ad08a9203f40d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:15:14+01:00 misc_radius: updated to use xavp long value field --- Modified: src/modules/misc_radius/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/68dcaf766c5c08ebb9ad08a9203f40d… Patch: https://github.com/kamailio/kamailio/commit/68dcaf766c5c08ebb9ad08a9203f40d… --- diff --git a/src/modules/misc_radius/functions.c b/src/modules/misc_radius/functions.c index d01e79f6587..bef70b9d826 100644 --- a/src/modules/misc_radius/functions.c +++ b/src/modules/misc_radius/functions.c @@ -127,7 +127,7 @@ static void generate_avps_rad(VALUE_PAIR *received) if(add_avp(flags, name, val) < 0) { LM_ERR("unable to create a new AVP\n"); } else { - LM_DBG("AVP '%.*s'/%d='%.*s'/%d has been added\n", + LM_DBG("AVP '%.*s'/%ld='%.*s'/%ld has been added\n", (flags & AVP_NAME_STR) ? name.s.len : 4, (flags & AVP_NAME_STR) ? name.s.s : "null", (flags & AVP_NAME_STR) ? 0 : name.n, @@ -143,7 +143,7 @@ static void generate_avps_rad(VALUE_PAIR *received) if(add_avp(flags, name, val) < 0) { LM_ERR("unable to create a new AVP\n"); } else { - LM_DBG("AVP '%.*s'/%d='%.*s'/%d has been added\n", + LM_DBG("AVP '%.*s'/%ld='%.*s'/%ld has been added\n", (flags & AVP_NAME_STR) ? name.s.len : 4, (flags & AVP_NAME_STR) ? name.s.s : "null", (flags & AVP_NAME_STR) ? 0 : name.n, @@ -177,7 +177,7 @@ static void generate_avps(struct attr *attrs, VALUE_PAIR *received) if(add_avp(flags, name, val) < 0) { LM_ERR("unable to create a new AVP\n"); } else { - LM_DBG("AVP '%.*s'/%d='%.*s'/%d has been added\n", + LM_DBG("AVP '%.*s'/%ld='%.*s'/%ld has been added\n", (flags & AVP_NAME_STR) ? name.s.len : 4, (flags & AVP_NAME_STR) ? name.s.s : "null", (flags & AVP_NAME_STR) ? 0 : name.n,

1 0

git:master:d4251378: memcached: updated to use xavp long value field
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: d4251378c701a46803e24df607c0959a2975fa7b URL: https://github.com/kamailio/kamailio/commit/d4251378c701a46803e24df607c0959… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:16:35+01:00 memcached: updated to use xavp long value field --- Modified: src/modules/memcached/mcd_var.c --- Diff: https://github.com/kamailio/kamailio/commit/d4251378c701a46803e24df607c0959… Patch: https://github.com/kamailio/kamailio/commit/d4251378c701a46803e24df607c0959… --- diff --git a/src/modules/memcached/mcd_var.c b/src/modules/memcached/mcd_var.c index 0a7cb8e9b2c..3c12e9c44fd 100644 --- a/src/modules/memcached/mcd_var.c +++ b/src/modules/memcached/mcd_var.c @@ -403,10 +403,10 @@ int pv_set_mcd_expire(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t goto errout; } - LM_DBG("set expire time %d for key %.*s with flag %d\n", val->ri, key.len, key.s, return_flags); + LM_DBG("set expire time %ld for key %.*s with flag %d\n", val->ri, key.len, key.s, return_flags); if ((rc= memcached_set(memcached_h, key.s, key.len, return_value, strlen(return_value), val->ri, return_flags)) != MEMCACHED_SUCCESS) { - LM_ERR("could not set expire time %d for key %.*s - error was %s\n", val->ri, key.len, key.s, memcached_strerror(memcached_h, rc)); + LM_ERR("could not set expire time %ld for key %.*s - error was %s\n", val->ri, key.len, key.s, memcached_strerror(memcached_h, rc)); goto errout; }

1 0

git:master:4b6328ce: erlang: use proper name for the long field of xavp
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: 4b6328ce015bbdc0899dc948c0f981649039407c URL: https://github.com/kamailio/kamailio/commit/4b6328ce015bbdc0899dc948c0f9816… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:10:41+01:00 erlang: use proper name for the long field of xavp --- Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/4b6328ce015bbdc0899dc948c0f9816… Patch: https://github.com/kamailio/kamailio/commit/4b6328ce015bbdc0899dc948c0f9816… --- diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index 42af43798f..1ea5c8331c 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -914,7 +914,7 @@ int xavp_encode(ei_x_buff *xbuff, sr_xavp_t *xavp,int level) ei_x_encode_string_len(xbuff,xavp->val.v.s.s,xavp->val.v.s.len); break; case 'i': - ei_x_encode_long(xbuff,xavp->val.v.i); + ei_x_encode_long(xbuff,xavp->val.v.l); break; case 't': n = xavp_get_count(xavp->val.v.xavp);

1 0

git:master:e14d2ee2: peering: updated to use xavp long value field
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: e14d2ee291f76cc4d1187ccbc1c88f6ccf36fe28 URL: https://github.com/kamailio/kamailio/commit/e14d2ee291f76cc4d1187ccbc1c88f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T10:12:17+01:00 peering: updated to use xavp long value field --- Modified: src/modules/peering/verify.c --- Diff: https://github.com/kamailio/kamailio/commit/e14d2ee291f76cc4d1187ccbc1c88f6… Patch: https://github.com/kamailio/kamailio/commit/e14d2ee291f76cc4d1187ccbc1c88f6… --- diff --git a/src/modules/peering/verify.c b/src/modules/peering/verify.c index 6865cf1b414..a84c1f79c32 100644 --- a/src/modules/peering/verify.c +++ b/src/modules/peering/verify.c @@ -141,7 +141,7 @@ static int generate_avps(VALUE_PAIR* received) if (add_avp( flags, name, val) < 0) { LM_ERR("unable to add a new AVP\n"); } else { - LM_DBG("AVP '%.*s'/%d='%.*s'/%d has been added\n", + LM_DBG("AVP '%.*s'/%ld='%.*s'/%ld has been added\n", (flags&AVP_NAME_STR)?name.s.len:4, (flags&AVP_NAME_STR)?name.s.s:"null", (flags&AVP_NAME_STR)?0:name.n,

1 0

Make Kamailio rtpengine module commands asynchronous
by Aditya Gupta 22 Nov '22

22 Nov '22

Hello! We needed rtpengine module to be asynchronous. I needed help for this. 1) I want to understand how many of the commands in the list are needed to be made asynchronous. 2) I went through evapi module to understand how asynchronous commands were implemented by suspending request/responses and then continuing. But I couldn't see anywhere where the suspended commands were being continued. Thank you.

1 0

git:master:8860f244: jwt: trim read value for the key
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

Module: kamailio Branch: master Commit: 8860f244d2ad3587621b033374792a2daae7df22 URL: https://github.com/kamailio/kamailio/commit/8860f244d2ad3587621b033374792a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:56:12+01:00 jwt: trim read value for the key - GH #3282 --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8860f244d2ad3587621b033374792a2… Patch: https://github.com/kamailio/kamailio/commit/8860f244d2ad3587621b033374792a2… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 233a0709e39..d533b88a152 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -31,6 +31,7 @@ #include "../../core/dprint.h" #include "../../core/mod_fix.h" #include "../../core/lvalue.h" +#include "../../core/trim.h" #include "../../core/kemi.h" #include "../../core/parser/parse_param.h" @@ -467,9 +468,10 @@ static int ki_jwt_verify(sip_msg_t* msg, str *key, str *alg, str *claims, LM_ERR("unable to read key file content: %s\n", key->s); goto error; } - keybuf[keybuf_len] = '\0'; kdata.s = (char*)keybuf; kdata.len = (int)keybuf_len; + trim(&kdata); + kdata.s[keybuf_len] = '\0'; jwt_fcache_add(key, &kdata); } sparams = dupclaims;

1 0

git: new commits in branch master
by Daniel-Constantin Mierla 22 Nov '22

22 Nov '22

- URL: https://github.com/kamailio/kamailio/commit/228bdac63e53a39b048e055dbecd0c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:12:35+01:00 core: pv - helper functions use long for value - URL: https://github.com/kamailio/kamailio/commit/4c022cb9d6efbdd9d8a46353d8a9d9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:18:47+01:00 core: xavp - number value is hold on long type field - removed the int field for type SR_XTYPE_INT - URL: https://github.com/kamailio/kamailio/commit/e97541cda7ad5342b3b9daaa29469d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:57+01:00 app_lua_sr: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/74f0c5414c3992d3790dc8195672607… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:57+01:00 avpops: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/96a174a4f4fe2cb3ba8ae3ba09a2519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:57+01:00 cfgt: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/cfbe1e405948dfa873d49a36036ffcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:57+01:00 debugger: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/619a65b94d6a7980cee11731248e2c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:57+01:00 dispatcher: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/81232aba8a95f79647a5d6189bd9d3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:57+01:00 erlang: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/e06fb0a84fa3db63d06cb764e89e8b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:57+01:00 jansson: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/24b3bf22546c7692e562eba35a8f57e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:58+01:00 log_systemd: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/642530f6541a39b386f6618b859e48d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:58+01:00 presence: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/afbd2bf2db1d1ac6a1ee3bad6613e35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:58+01:00 pv: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/b958a486a4ac586cd04f13f32e0204d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:58+01:00 pv_headers: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/9e7e3675c55122c7df83aef49fe3662… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:58+01:00 registrar: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/2dd4a5902cb292948378ef4f25ac92c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:58+01:00 rtjson: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/c090b40c5d63458904349c3800101ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:58+01:00 sqlops: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/44c018db84c846dbb2f1cb9551793b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:58+01:00 tm: updated to use xavp long value field - URL: https://github.com/kamailio/kamailio/commit/f80c9a016bd3664cde3132f0f71064a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-22T09:32:58+01:00 usrloc: updated to use xavp long value field

1 0

git: new commits in branch master
by Daniel-Constantin Mierla 21 Nov '22

21 Nov '22

- URL: https://github.com/kamailio/kamailio/commit/8c4feb02e0e85771746b5c39af9fe65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T08:48:18+01:00 ims_dialog: cast pv value to long - URL: https://github.com/kamailio/kamailio/commit/00a8b6d765cdd8a1fc3b77416912f11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T09:02:18+01:00 lib/srdb1: cast pv value to long - URL: https://github.com/kamailio/kamailio/commit/d536fb24bc265358924887877ce4395… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T10:32:21+01:00 core: avp - number field set to long - URL: https://github.com/kamailio/kamailio/commit/887903caa12a7cae785a8814ee9fa9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:34+01:00 avp: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/132ffd7a48664c013aa3c095996e0c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:34+01:00 avpops: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/bbaafb0bc0b94a7b14c1ef17d731521… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:34+01:00 carrierroute: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/8cdcb9b28c22b40099df3bab3a402eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:34+01:00 cfgt: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/46214133bf64b8c89872b9937cda54c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:34+01:00 debugger: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/59fb187c7706f9e59cdb69079127b5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:34+01:00 domain: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/34ec72e099eb51a81a32155fc7e50cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:34+01:00 domainpolicy: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/d2f1e39d153fb0b6b83085f980cb6d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:34+01:00 group: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/ce0d289824b5dac742355340703e705… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:34+01:00 htable: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/179af99d46d176e07cfaff4057025b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:34+01:00 matrix: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/25afad678b5753af6f3ad68fee44c7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:35+01:00 mtree: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/6033dbf16a3f16292ef2dece95aba4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:35+01:00 pv: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/39b71dcf637794ef95a1e218e9bb285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:35+01:00 rtpengine: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/9911482bc6889107a1930239f4e2860… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:35+01:00 rtpproxy: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/6a5c4930976a9e2a6d52748524759f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:35+01:00 sdpops: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/6a22d4168a1614cf84df690ac6b56c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:35+01:00 tls: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/5ff6404b4d5d63a3c0b573b485abfb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:09:35+01:00 tm: updated for avp long value field - URL: https://github.com/kamailio/kamailio/commit/7f258d97431a9a4bccf8155def52c9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:28:32+01:00 sipcapture: debug message with header offset and address family - URL: https://github.com/kamailio/kamailio/commit/d1db642736e9b573644f97a828dc7ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-21T11:30:35+01:00 core: avp - renamed structures to use num instead of int - type of number is long

1 0

git:master:cbcad7a1: core: updates to functions for cfg val int to long replacement
by Daniel-Constantin Mierla 18 Nov '22

18 Nov '22

Module: kamailio Branch: master Commit: cbcad7a16173c2c436aabb70f848bcde5eb839b2 URL: https://github.com/kamailio/kamailio/commit/cbcad7a16173c2c436aabb70f848bcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-18T19:11:53+01:00 core: updates to functions for cfg val int to long replacement --- Modified: src/core/action.c Modified: src/core/route.c Modified: src/core/rvalue.c Modified: src/core/rvalue.h Modified: src/core/switch.c Modified: src/core/switch.h --- Diff: https://github.com/kamailio/kamailio/commit/cbcad7a16173c2c436aabb70f848bcd… Patch: https://github.com/kamailio/kamailio/commit/cbcad7a16173c2c436aabb70f848bcd…

1 0

git:master:d02732ad: core: helper function to get mod param function in a string buffer
by Daniel-Constantin Mierla 17 Nov '22

17 Nov '22

Module: kamailio Branch: master Commit: d02732adef800b7a1107d106ac8e58730e256485 URL: https://github.com/kamailio/kamailio/commit/d02732adef800b7a1107d106ac8e587… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-17T14:40:07+01:00 core: helper function to get mod param function in a string buffer --- Modified: src/core/mod_fix.h Modified: src/core/sr_module.c Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/d02732adef800b7a1107d106ac8e587… Patch: https://github.com/kamailio/kamailio/commit/d02732adef800b7a1107d106ac8e587… --- diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 8c2c766c1e..043b1e3546 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -62,6 +62,8 @@ int fixup_get_svalue(struct sip_msg* msg, gparam_p gp, str *val); */ #define fixup_get_svalue(msg, fp, sval) get_str_fparam(sval, msg, fp) +#define fixup_get_bufvalue(msg, fp, sval) get_strbuf_fparam(sval, msg, fp) + /** get an int value out of a fparam_t. * * Note: this macro/function is for kamailio compatibility diff --git a/src/core/sr_module.c b/src/core/sr_module.c index d869b8ae63..154ce27740 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -1727,6 +1727,92 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) } +/** Get the function parameter value as string cpoied in the dst->s buffer. + * - dst->len has to provide size of dst->s buffer and it is updated to the + * size of the value + * @return 0 - Success + * -1 - Cannot get value + */ +int get_strbuf_fparam(str* dst, struct sip_msg* msg, fparam_t* param) +{ + int_str val; + int ret; + avp_t* avp; + pv_value_t pv_val; + str sv = STR_NULL; + + if(dst==NULL || dst->s==NULL || dst->len<=0) { + return -1; + } + + switch(param->type) { + case FPARAM_REGEX: + case FPARAM_UNSPEC: + case FPARAM_INT: + return -1; + case FPARAM_STRING: + sv.s = param->v.asciiz; + sv.len = strlen(param->v.asciiz); + break; + case FPARAM_STR: + sv = param->v.str; + break; + case FPARAM_AVP: + avp = search_first_avp(param->v.avp.flags, param->v.avp.name, + &val, 0); + if (unlikely(!avp)) { + LM_DBG("Could not find AVP from function parameter '%s'\n", + param->orig); + return -1; + } + if (likely(avp->flags & AVP_VAL_STR)) { + sv = val.s; + } else { + /* The caller does not know of what type the AVP will be so + * convert int AVPs into string here + */ + sv.s = int2str(val.n, &sv.len); + } + break; + case FPARAM_SELECT: + ret = run_select(&sv, param->v.select, msg); + if (unlikely(ret < 0 || ret > 0)) return -1; + break; + case FPARAM_PVS: + if (likely((pv_get_spec_value(msg, param->v.pvs, &pv_val)==0) && + ((pv_val.flags&(PV_VAL_NULL|PV_VAL_STR))==PV_VAL_STR))){ + sv=pv_val.rs; + }else{ + LM_ERR("Could not convert PV to str\n"); + return -1; + } + break; + case FPARAM_PVE: + if (unlikely(pv_printf(msg, param->v.pve, dst->s, &dst->len)!=0)){ + LM_ERR("Could not convert the PV-formated string to str\n"); + dst->len=0; + return -1; + }; + break; + } + if(param->type != FPARAM_PVE) { + if(sv.len>=dst->len-1) { + LM_ERR("not enough space in output buffer (size: %d need: %d)\n", + dst->len, sv.len); + return -1; + } + if(sv.len > 0) { + memcpy(dst->s, sv.s, sv.len); + dst->len = sv.len; + dst->s[dst->len] = '\0'; + } else { + dst->len = 0; + dst->s[dst->len] = '\0'; + } + } + return 0; +} + /** Get the function parameter value as integer. * @return 0 - Success * -1 - Cannot get value diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 7235c2840a..ba6f54bd8d 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -489,6 +489,8 @@ int fixup_str_2(void** param, int param_no); */ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param); +int get_strbuf_fparam(str* dst, struct sip_msg* msg, fparam_t* param); + /** * @brief Get the function parameter value as integer * @param dst string destination

1 0

git:master:1256392a: modules: readme files regenerated - jansson ... [skip ci]
by Kamailio Dev 17 Nov '22

17 Nov '22

Module: kamailio Branch: master Commit: 1256392ab12ec1ada491f2fc5212bb99ba6fc14c URL: https://github.com/kamailio/kamailio/commit/1256392ab12ec1ada491f2fc5212bb9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-17T13:46:55+01:00 modules: readme files regenerated - jansson ... [skip ci] --- Modified: src/modules/jansson/README --- Diff: https://github.com/kamailio/kamailio/commit/1256392ab12ec1ada491f2fc5212bb9… Patch: https://github.com/kamailio/kamailio/commit/1256392ab12ec1ada491f2fc5212bb9…

1 0

git:master:d47d62f5: jansson: docs for jansson_pv_get() function
by Daniel-Constantin Mierla 17 Nov '22

17 Nov '22

Module: kamailio Branch: master Commit: d47d62f54c9115c765a1437ffc8c8e619e056f54 URL: https://github.com/kamailio/kamailio/commit/d47d62f54c9115c765a1437ffc8c8e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-17T13:44:37+01:00 jansson: docs for jansson_pv_get() function --- Modified: src/modules/jansson/doc/jansson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d47d62f54c9115c765a1437ffc8c8e6… Patch: https://github.com/kamailio/kamailio/commit/d47d62f54c9115c765a1437ffc8c8e6… --- diff --git a/src/modules/jansson/doc/jansson_admin.xml b/src/modules/jansson/doc/jansson_admin.xml index b65fb70d8cd..969804c96b2 100644 --- a/src/modules/jansson/doc/jansson_admin.xml +++ b/src/modules/jansson/doc/jansson_admin.xml @@ -59,7 +59,8 @@ <function moreinfo="none">jansson_get(key/path, src, dst)</function> </title> <para> - Copy the value at the location 'path' from the json object 'src' and store it in pvar 'dst'. + Copy the value at the location 'path' from the json object 'src' and store it in pvar 'dst'. + The 'src' can be a static string or a dynamic string with variables. </para> <para> The path string supports dot delimited notation (e.g. foo.bar.baz), @@ -82,7 +83,29 @@ <title><function>jansson_get</function> usage</title> <programlisting format="linespecific"> ... -if(!jansson_get("inner.deep.list[3]", $var(myjson), "$var(n)")) { +if(!jansson_get("inner.deep.list[3]", "$var(myjson)", "$var(n)")) { + xlog("L_ERR", "Can't parse json data"); +} +xlog("L_INFO", "foo is $var(n)"); +... +jansson_get("test", "{\"test\":\"abc\",\"idx\":20}", "$var(n)") +... + </programlisting> + </example> + </section> + <section id="jansson.f.jansson_pv_get"> + <title> + <function moreinfo="none">jansson_pv_get(key/path, srcvar, dst)</function> + </title> + <para> + Similar to jansson_get(), but the 'srcvar' parameter can be only a + variable name. + </para> + <example> + <title><function>jansson_pv_get</function> usage</title> + <programlisting format="linespecific"> +... +if(!jansson_pv_get("inner.deep.list[3]", "$var(myjson)", "$var(n)")) { xlog("L_ERR", "Can't parse json data"); } xlog("L_INFO", "foo is $var(n)");

1 0

git:master:3ce5c42c: jansson: added jansson_pv_get(...)
by Daniel-Constantin Mierla 17 Nov '22

17 Nov '22

Module: kamailio Branch: master Commit: 3ce5c42c53dcf6f3f1da952d3b523876c7381913 URL: https://github.com/kamailio/kamailio/commit/3ce5c42c53dcf6f3f1da952d3b52387… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-17T13:38:05+01:00 jansson: added jansson_pv_get(...) - similar to jansson_geet(), but the input has to be a single variable name, not a dynamic string --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h Modified: src/modules/jansson/jansson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3ce5c42c53dcf6f3f1da952d3b52387… Patch: https://github.com/kamailio/kamailio/commit/3ce5c42c53dcf6f3f1da952d3b52387… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 857b6871f0c..0ff937ee7be 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -92,6 +92,29 @@ int janssonmod_get(struct sip_msg* msg, char* path_in, char* src_in, char* dst) return janssonmod_get_helper(msg, &path_s, &src_s, (pv_spec_t *)dst); } +int janssonmod_pv_get(struct sip_msg* msg, char* path_in, char* src_in, char* dst) +{ + str path_s; + pv_value_t val; + int ret; + + if((pv_get_spec_value(msg, (pv_spec_t*)src_in, &val) < 0) + || ((val.flags & PV_VAL_STR) == 0)) { + ERR("cannot get json string value\n"); + return -1; + } + if (fixup_get_svalue(msg, (gparam_p)path_in, &path_s) != 0) { + ERR("cannot get path string value\n"); + return -1; + } + + ret = janssonmod_get_helper(msg, &path_s, &val.rs, (pv_spec_t*)dst); + + pv_value_destroy(&val); + + return ret; +} + #define STR_EQ_STATIC(a,b) ((a.len == sizeof(b)-1) && (strncmp(a.s, b, sizeof(b)-1)==0)) int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, diff --git a/src/modules/jansson/jansson_funcs.h b/src/modules/jansson/jansson_funcs.h index aeaf0791b90..ce8e9d5b4a1 100644 --- a/src/modules/jansson/jansson_funcs.h +++ b/src/modules/jansson/jansson_funcs.h @@ -27,6 +27,8 @@ int janssonmod_get(struct sip_msg* msg, char* path_in, char* json_in, char* result); +int janssonmod_pv_get(struct sip_msg* msg, char* path_in, char* json_in, + char* result); int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, char* path_in, char* value_in, char* result); int janssonmod_array_size(struct sip_msg* msg, char* json_in, diff --git a/src/modules/jansson/jansson_mod.c b/src/modules/jansson/jansson_mod.c index 6a2fe6ead66..46cfda2fec4 100644 --- a/src/modules/jansson/jansson_mod.c +++ b/src/modules/jansson/jansson_mod.c @@ -36,6 +36,8 @@ MODULE_VERSION static int mod_init(void); static int fixup_get_params(void** param, int param_no); static int fixup_get_params_free(void** param, int param_no); +static int fixup_pv_get_params(void** param, int param_no); +static int fixup_pv_get_params_free(void** param, int param_no); static int fixup_set_params(void** param, int param_no); static int fixup_set_params_free(void** param, int param_no); static int fixup_xencode(void** param, int param_no); @@ -60,6 +62,8 @@ int janssonmod_get_field(struct sip_msg* msg, char* jansson_in, char* path_in, static cmd_export_t cmds[]={ {"jansson_get", (cmd_function)janssonmod_get, 3, fixup_get_params, fixup_get_params_free, ANY_ROUTE}, + {"jansson_pv_get", (cmd_function)janssonmod_pv_get, 3, + fixup_pv_get_params, fixup_pv_get_params_free, ANY_ROUTE}, {"jansson_array_size", (cmd_function)janssonmod_array_size, 3, fixup_get_params, fixup_get_params_free, ANY_ROUTE}, {"jansson_set", (cmd_function)janssonmod_set_replace, 4, @@ -121,6 +125,34 @@ static int fixup_get_params_free(void** param, int param_no) return -1; } +static int fixup_pv_get_params(void** param, int param_no) +{ + if (param_no == 1) { + return fixup_spve_null(param, 1); + } + + if (param_no == 2 || param_no == 3) { + return fixup_pvar_null(param, 1); + } + + ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + +static int fixup_pv_get_params_free(void** param, int param_no) +{ + if (param_no == 1) { + return fixup_free_spve_null(param, 1); + } + + if (param_no == 2 || param_no == 3) { + return fixup_free_pvar_null(param, 1); + } + + ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + static int fixup_set_params(void** param, int param_no) { if(param_no <= 3) { @@ -232,4 +264,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_jansson_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:a83e44b7: core: new global parameter return_mode
by Daniel-Constantin Mierla 17 Nov '22

17 Nov '22

Module: kamailio Branch: master Commit: a83e44b7a942afcf1770fa179cda8e530c74e28a URL: https://github.com/kamailio/kamailio/commit/a83e44b7a942afcf1770fa179cda8e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-17T13:08:59+01:00 core: new global parameter return_mode - control the return code evaluation mode: - 0 (default) - evaluation is like so far (negative is false, positive is true) - 1 - propagate return value and evaluation has to be done with >0 or <0, otherwise value!=0 is evaluated to true no matter is negative or positive --- Modified: src/core/action.c Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/a83e44b7a942afcf1770fa179cda8e5… Patch: https://github.com/kamailio/kamailio/commit/a83e44b7a942afcf1770fa179cda8e5… --- diff --git a/src/core/action.c b/src/core/action.c index 48b150dd70..b95c531e1d 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1065,7 +1065,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & break in expr*/ ret=1; /*default is continue */ - if (v>0) { + if ((ksr_return_mode==0 && v>0) || (ksr_return_mode!=0 && v!=0)) { if ((a->val[1].type==ACTIONS_ST)&&a->val[1].u.data){ ret=run_actions(h, (struct action*)a->val[1].u.data, msg); @@ -1363,12 +1363,13 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) rve=(struct rval_expr*)a->val[0].u.data; ret=1; while(!(flags & (BREAK_R_F|RETURN_R_F|EXIT_R_F)) && - (rval_expr_eval_int(h, msg, &v, rve) == 0) && v){ + (rval_expr_eval_int(h, msg, &v, rve) == 0) && + ((ksr_return_mode==0 && v>0) || (ksr_return_mode!=0 && v!=0))) { if (cfg_get(core, core_cfg, max_while_loops) > 0) i++; if (unlikely(i > cfg_get(core, core_cfg, max_while_loops))){ - LM_ERR("runaway while (%d, %d): more then %d loops\n", + LM_ERR("runaway while (%d, %d): more then %d loops\n", rve->fpos.s_line, rve->fpos.s_col, cfg_get(core, core_cfg, max_while_loops)); ret=-1; diff --git a/src/core/cfg.lex b/src/core/cfg.lex index cc0afb8f22..d4379da3fc 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -147,6 +147,7 @@ FORWARD_SCTP forward_sctp DROP "drop" EXIT "exit" RETURN "return" +RETURN_MODE "return_mode" BREAK "break" LOG log ERROR error @@ -1049,6 +1050,7 @@ IMPORTFILE "import_file" <INITIAL>{CFGENGINE} { count(); yylval.strval=yytext; return CFGENGINE; } <INITIAL>{URI_HOST_EXTRA_CHARS} { yylval.strval=yytext; return URI_HOST_EXTRA_CHARS; } <INITIAL>{HDR_NAME_EXTRA_CHARS} { yylval.strval=yytext; return HDR_NAME_EXTRA_CHARS; } +<INITIAL>{RETURN_MODE} { count(); yylval.strval=yytext; return RETURN_MODE; } <INITIAL>{EQUAL} { count(); return EQUAL; } <INITIAL>{ADDEQ} { count(); return ADDEQ; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 89eb5c210f..230be193dd 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -227,6 +227,7 @@ extern char *default_routename; %token EXIT %token DROP %token RETURN +%token RETURN_MODE %token BREAK %token LOG_TOK %token ERROR @@ -1900,6 +1901,8 @@ assign_stm: | WAIT_WORKER1_USLEEP EQUAL error { yyerror("number expected"); } | SERVER_ID EQUAL NUMBER { server_id=$3; } | SERVER_ID EQUAL error { yyerror("number expected"); } + | RETURN_MODE EQUAL NUMBER { ksr_return_mode=$3; } + | RETURN_MODE EQUAL error { yyerror("number expected"); } | KEMI DOT ONSEND_ROUTE_CALLBACK EQUAL STRING { kemi_onsend_route_callback.s = $5; kemi_onsend_route_callback.len = strlen($5); diff --git a/src/core/globals.h b/src/core/globals.h index 03eb1ef897..8d72807aee 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -219,6 +219,7 @@ extern str _ksr_xavp_via_params; extern str _ksr_xavp_via_fields; extern int ksr_sip_parser_mode; extern int ksr_cfg_print_mode; +extern int ksr_return_mode; extern int ksr_wait_worker1_mode; extern int ksr_wait_worker1_time; diff --git a/src/core/rvalue.c b/src/core/rvalue.c index 9e5268c888..4ab93f44f4 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -82,6 +82,9 @@ #define rv_unref(rv) ((--(rv)->refcnt)==0) +/* control return code evaluation mode */ +int ksr_return_mode = 0; + inline static void rval_force_clean(struct rvalue* rv) { if (rv->flags & RV_CNT_ALLOCED_F){ @@ -946,7 +949,11 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) { - *i=(run_actions_safe(h, rv->v.action, msg)>0); + if(unlikely(ksr_return_mode==1)) { + *i=run_actions_safe(h, rv->v.action, msg); + } else { + *i=(run_actions_safe(h, rv->v.action, msg)>0); + } h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & break in expr*/ } else

1 0

git:5.5:fdfb8c55: dialog: remove dialog variable debugging function, it might cause race conditions
by Henning Westerholt 16 Nov '22

16 Nov '22

Module: kamailio Branch: 5.5 Commit: fdfb8c5563bd327774802cb08b68b27faee2e840 URL: https://github.com/kamailio/kamailio/commit/fdfb8c5563bd327774802cb08b68b27… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-16T16:05:42Z dialog: remove dialog variable debugging function, it might cause race conditions --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/fdfb8c5563bd327774802cb08b68b27… Patch: https://github.com/kamailio/kamailio/commit/fdfb8c5563bd327774802cb08b68b27… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index b2a373a5018..8fd261c4bf5 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -254,31 +254,6 @@ int pv_parse_dialog_var_name(pv_spec_p sp, str *in) return 0; } -/*! Internal debugging function: Prints the list of dialogs */ -void print_lists(struct dlg_cell *dlg) { - struct dlg_var *varlist; - varlist = _dlg_var_table; - LM_DBG("Internal var-list (%p):\n", varlist); - while (varlist) { - LM_DBG("%.*s=%.*s (flags %i)\n", - varlist->key.len, varlist->key.s, - varlist->value.len, varlist->value.s, - varlist->vflags); - varlist = varlist->next; - } - if (dlg) { - varlist = dlg->vars; - LM_DBG("Dialog var-list (%p):\n", varlist); - while (varlist) { - LM_DBG("%.*s=%.*s (flags %i)\n", - varlist->key.len, varlist->key.s, - varlist->value.len, varlist->value.s, - varlist->vflags); - varlist = varlist->next; - } - } -} - str * get_dlg_variable(struct dlg_cell *dlg, str *key) { str* var = NULL; @@ -317,8 +292,6 @@ int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) if ( dlg_db_mode==DB_MODE_REALTIME ) update_dialog_dbinfo(dlg); - print_lists(dlg); - return 0; done: @@ -366,8 +339,6 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } } - print_lists(dlg); - /* unlock dialog */ if (dlg) { dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); @@ -440,8 +411,6 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value } dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); } - print_lists(dlg); - dlg_release(dlg); return 0; error:

1 0

git:5.6:1e083043: dialog: remove dialog variable debugging function, it might cause race conditions
by Henning Westerholt 16 Nov '22

16 Nov '22

Module: kamailio Branch: 5.6 Commit: 1e0830433e46827ed9424a6d9cc01e95546c04f0 URL: https://github.com/kamailio/kamailio/commit/1e0830433e46827ed9424a6d9cc01e9… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-16T16:02:09Z dialog: remove dialog variable debugging function, it might cause race conditions --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/1e0830433e46827ed9424a6d9cc01e9… Patch: https://github.com/kamailio/kamailio/commit/1e0830433e46827ed9424a6d9cc01e9… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 473736b4373..883b99b630f 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -254,31 +254,6 @@ int pv_parse_dialog_var_name(pv_spec_p sp, str *in) return 0; } -/*! Internal debugging function: Prints the list of dialogs */ -void print_lists(struct dlg_cell *dlg) { - struct dlg_var *varlist; - varlist = _dlg_var_table; - LM_DBG("Internal var-list (%p):\n", varlist); - while (varlist) { - LM_DBG("%.*s=%.*s (flags %i)\n", - varlist->key.len, varlist->key.s, - varlist->value.len, varlist->value.s, - varlist->vflags); - varlist = varlist->next; - } - if (dlg) { - varlist = dlg->vars; - LM_DBG("Dialog var-list (%p):\n", varlist); - while (varlist) { - LM_DBG("%.*s=%.*s (flags %i)\n", - varlist->key.len, varlist->key.s, - varlist->value.len, varlist->value.s, - varlist->vflags); - varlist = varlist->next; - } - } -} - /** * return reference to the dlg variable value * - unsafe - use only when it is sure that the value is not updated @@ -449,8 +424,6 @@ int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) if ( dlg_db_mode==DB_MODE_REALTIME ) update_dialog_dbinfo(dlg); - print_lists(dlg); - return 0; done: @@ -510,8 +483,6 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } } - print_lists(dlg); - /* unlock dialog */ if (dlg) { dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); @@ -584,8 +555,6 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value } dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); } - print_lists(dlg); - dlg_release(dlg); return 0; error:

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev