- sr-dev - kamailio.org

git:master:d92a8a6d: modules: readme files regenerated - app_python ... [skip ci]
by Kamailio Dev 10 Oct '22

10 Oct '22

Module: kamailio Branch: master Commit: d92a8a6d8d4c0d226f740a67c76ca742a3ffed2a URL: https://github.com/kamailio/kamailio/commit/d92a8a6d8d4c0d226f740a67c76ca74… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-10-10T09:46:23+02:00 modules: readme files regenerated - app_python ... [skip ci] --- Modified: src/modules/app_python/README --- Diff: https://github.com/kamailio/kamailio/commit/d92a8a6d8d4c0d226f740a67c76ca74… Patch: https://github.com/kamailio/kamailio/commit/d92a8a6d8d4c0d226f740a67c76ca74… --- diff --git a/src/modules/app_python/README b/src/modules/app_python/README index a1269d14f0..a9d0b02890 100644 --- a/src/modules/app_python/README +++ b/src/modules/app_python/README @@ -77,6 +77,10 @@ Chapter 1. Admin Guide module, look at the files inside source tree located at 'modules/app_python/python_examples/'. + As python2 is deprecated in Debian and other distributions, please use + the “app_python3” module instead. This module will be removed future + releases. + 2. Dependencies 2.1. Kamailio Modules

1 0

git:master:7306e768: app_python: add a note that python2 is deprecated and app_python3 should be used
by Henning Westerholt 10 Oct '22

10 Oct '22

Module: kamailio Branch: master Commit: 7306e7683fd50420e93b44ec5593705194bf3616 URL: https://github.com/kamailio/kamailio/commit/7306e7683fd50420e93b44ec5593705… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-10T07:39:56Z app_python: add a note that python2 is deprecated and app_python3 should be used --- Modified: src/modules/app_python/doc/app_python_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7306e7683fd50420e93b44ec5593705… Patch: https://github.com/kamailio/kamailio/commit/7306e7683fd50420e93b44ec5593705… --- diff --git a/src/modules/app_python/doc/app_python_admin.xml b/src/modules/app_python/doc/app_python_admin.xml index f9a39a8364a..f428bed6d7f 100644 --- a/src/modules/app_python/doc/app_python_admin.xml +++ b/src/modules/app_python/doc/app_python_admin.xml @@ -25,6 +25,11 @@ this module, look at the files inside source tree located at 'modules/app_python/python_examples/'. </para> + <para> + As python2 is deprecated in Debian and other distributions, please + use the <quote>app_python3</quote> module instead. This module will + be removed future releases. + </para> </section> <section> <title>Dependencies</title>

1 0

git:master:25a060bb: core: snexpr - assign the lv to evaluated variable with number value
by Daniel-Constantin Mierla 07 Oct '22

07 Oct '22

Module: kamailio Branch: master Commit: 25a060bb5d72cac5bafcd4e8e5960635bf848205 URL: https://github.com/kamailio/kamailio/commit/25a060bb5d72cac5bafcd4e8e596063… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-07T13:50:42+02:00 core: snexpr - assign the lv to evaluated variable with number value --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/25a060bb5d72cac5bafcd4e8e596063… Patch: https://github.com/kamailio/kamailio/commit/25a060bb5d72cac5bafcd4e8e596063… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index df409f8381..4fb6e3f3b7 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -781,7 +781,7 @@ static struct snexpr *snexpr_eval(struct snexpr *e) if(e->param.var.vref->evflags & SNEXPR_TSTRING) { lv = snexpr_convert_stz(e->param.var.vref->v.sval, SNE_OP_CONSTSTZ); } else { - snexpr_convert_num(e->param.var.vref->v.nval, SNE_OP_CONSTNUM); + lv = snexpr_convert_num(e->param.var.vref->v.nval, SNE_OP_CONSTNUM); } } else { lv = _snexternval_cbf(e->param.var.vref->name);

1 0

Kamailio Developers Meeting, Nov 16-17, 2022, in Dusseldorf
by Daniel-Constantin Mierla 07 Oct '22

07 Oct '22

Hello, Kamailio SIP Server project is organizing another meeting of its developers during November 16-17, 2022, hosted again by sipgate.de in Dusseldorf, Germany. The event is intended to facilitate the interaction between Kamailio developers and to offer a convenient environment for working together on several topics of high interest for the project, including writing code for Kamailio and its tools, improving documentation, or discuss about future development. Everyone from the community is welcome to join. Please note we have a limited capacity of seats in the meeting room, the main policy for accepting participants being first come first server. Also, very important to be aware that this is not an event to learn how to use Kamailio. More details about the event, the venue, how to register, are available at: * https://www.kamailio.org/w/developers-meeting/ Looking forward to those two intensive hacking Kamailio days in Dusseldorf! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Oct 10-13, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

Jenkins build became unstable: kamailio56-binaries » amd64,bookworm #2
by kamailio＠sipwise.com 06 Oct '22

06 Oct '22

See <https://kamailio.sipwise.com/job/kamailio56-binaries/architecture=amd64,dis…>

1 2

Kamailio v5.6.2 Released
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Hello, Kamailio SIP Server v5.6.2 stable release is out. This is a maintenance release of the latest stable branch, 5.6, that includes fixes since the release of v5.6.1. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.6.x. Deployments running previous v5.6.x versions are strongly recommended to be upgraded to v5.6.2. For more details about version 5.6.2 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2022/10/kamailio-v5-6-2-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 2

git:5.6:54a9c15a: ChangeLog: content prepared for v5.6.2
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: 54a9c15a5ebdaa1df82e4526534be930e0f8ca71 URL: https://github.com/kamailio/kamailio/commit/54a9c15a5ebdaa1df82e4526534be93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T12:12:39+02:00 ChangeLog: content prepared for v5.6.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/54a9c15a5ebdaa1df82e4526534be93… Patch: https://github.com/kamailio/kamailio/commit/54a9c15a5ebdaa1df82e4526534be93… --- diff --git a/ChangeLog b/ChangeLog index 35c54e6dff..7c73dc00a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,22 @@ ===================== Changes Since Version 5.6.1 =========================== +commit d02c9e3a118789d24623a9d77e09c547e9cd8f79 (HEAD -> 5.6, origin/5.6) +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Oct 6 11:24:51 2022 +0200 + + ims_qos: use inter-module api release_dlg() instead of direct unref_dlg() + + - fix missing linker symbol + + (cherry picked from commit 8d398d6a83153fc65acd49557b702879d2585dc8) + +commit 2556b6e2bb14dd18a17495c10e74915b91b80e3a +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Oct 6 10:39:51 2022 +0200 + + ChangeLog: content updated for v5.6.2 + commit fb212678708dc1ddfcf9680826986834ce703cff Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 6 10:37:06 2022 +0200

1 0

git:5.6:d02c9e3a: ims_qos: use inter-module api release_dlg() instead of direct unref_dlg()
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: d02c9e3a118789d24623a9d77e09c547e9cd8f79 URL: https://github.com/kamailio/kamailio/commit/d02c9e3a118789d24623a9d77e09c54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T11:25:57+02:00 ims_qos: use inter-module api release_dlg() instead of direct unref_dlg() - fix missing linker symbol (cherry picked from commit 8d398d6a83153fc65acd49557b702879d2585dc8) --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/d02c9e3a118789d24623a9d77e09c54… Patch: https://github.com/kamailio/kamailio/commit/d02c9e3a118789d24623a9d77e09c54… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index da4a0e42dd7..dbc2aebaeb6 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -53,7 +53,6 @@ #include "../cdp_avp/cdp_avp_mod.h" #include "../../modules/ims_dialog/dlg_load.h" -#include "../../modules/ims_dialog/dlg_hash.h" #include "../../modules/tm/tm_load.h" #include "../ims_usrloc_pcscf/usrloc.h" #include "rx_authdata.h" @@ -182,7 +181,7 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); } else { - unref_dlg(data->dlg, 1); + dlgb.release_dlg(data->dlg); } result = CSCF_RETURN_TRUE; } else {

1 0

git:master:8d398d6a: ims_qos: use inter-module api release_dlg() instead of direct unref_dlg()
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: master Commit: 8d398d6a83153fc65acd49557b702879d2585dc8 URL: https://github.com/kamailio/kamailio/commit/8d398d6a83153fc65acd49557b70287… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T11:24:51+02:00 ims_qos: use inter-module api release_dlg() instead of direct unref_dlg() - fix missing linker symbol --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/8d398d6a83153fc65acd49557b70287… Patch: https://github.com/kamailio/kamailio/commit/8d398d6a83153fc65acd49557b70287… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index da4a0e42dd7..dbc2aebaeb6 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -53,7 +53,6 @@ #include "../cdp_avp/cdp_avp_mod.h" #include "../../modules/ims_dialog/dlg_load.h" -#include "../../modules/ims_dialog/dlg_hash.h" #include "../../modules/tm/tm_load.h" #include "../ims_usrloc_pcscf/usrloc.h" #include "rx_authdata.h" @@ -182,7 +181,7 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); } else { - unref_dlg(data->dlg, 1); + dlgb.release_dlg(data->dlg); } result = CSCF_RETURN_TRUE; } else {

1 0

git:5.6:fb212678: Makefile.defs: version set to 5.6.2
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: fb212678708dc1ddfcf9680826986834ce703cff URL: https://github.com/kamailio/kamailio/commit/fb212678708dc1ddfcf968082698683… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T10:37:06+02:00 Makefile.defs: version set to 5.6.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/fb212678708dc1ddfcf968082698683… Patch: https://github.com/kamailio/kamailio/commit/fb212678708dc1ddfcf968082698683… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index e5cc86b2c3..2697e5c193 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 6 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher

1 0

git:5.6:2556b6e2: ChangeLog: content updated for v5.6.2
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: 2556b6e2bb14dd18a17495c10e74915b91b80e3a URL: https://github.com/kamailio/kamailio/commit/2556b6e2bb14dd18a17495c10e74915… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T10:39:51+02:00 ChangeLog: content updated for v5.6.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/2556b6e2bb14dd18a17495c10e74915… Patch: https://github.com/kamailio/kamailio/commit/2556b6e2bb14dd18a17495c10e74915…

1 0

git:5.6:0a0980da: pkg: version set to 5.6.2 for rpms and alpine specs
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: 0a0980da9abf348ab855b8e8b85e534501791760 URL: https://github.com/kamailio/kamailio/commit/0a0980da9abf348ab855b8e8b85e534… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T10:34:46+02:00 pkg: version set to 5.6.2 for rpms and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0a0980da9abf348ab855b8e8b85e534… Patch: https://github.com/kamailio/kamailio/commit/0a0980da9abf348ab855b8e8b85e534… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 1081afcb650..4af2cebd894 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.6.1 +pkgver=5.6.2 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f4d7468cf10..472cb4460d5 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.6.1 +%define ver 5.6.2 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.6:461e1a3a: pkg: deb specs updated for v5.6.2
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: 461e1a3acdf924e2fa665ae28f55081433d8aeab URL: https://github.com/kamailio/kamailio/commit/461e1a3acdf924e2fa665ae28f55081… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T10:36:26+02:00 pkg: deb specs updated for v5.6.2 --- 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/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/461e1a3acdf924e2fa665ae28f55081… Patch: https://github.com/kamailio/kamailio/commit/461e1a3acdf924e2fa665ae28f55081…

1 0

git:5.6:151801a9: misc/fuzz/README.md: added link to OSS-Fuzz folder for Kamailio
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: 151801a91cb25e523466a9624cd4f2dd41f7bece URL: https://github.com/kamailio/kamailio/commit/151801a91cb25e523466a9624cd4f2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T10:33:30+02:00 misc/fuzz/README.md: added link to OSS-Fuzz folder for Kamailio (cherry picked from commit 916ecb43e94fcc4662ae4212172b2b66488002de) --- Modified: misc/fuzz/README.md --- Diff: https://github.com/kamailio/kamailio/commit/151801a91cb25e523466a9624cd4f2d… Patch: https://github.com/kamailio/kamailio/commit/151801a91cb25e523466a9624cd4f2d… --- diff --git a/misc/fuzz/README.md b/misc/fuzz/README.md index bc0238f56c..72dcc17072 100644 --- a/misc/fuzz/README.md +++ b/misc/fuzz/README.md @@ -5,6 +5,10 @@ various open source projects. * https://github.com/google/oss-fuzz +Folder for Kamailio project on OSS-Fuzz: + + * https://github.com/google/oss-fuzz/tree/master/projects/kamailio + OSS-Fuzz pull request to integrate Kamailio: * https://github.com/google/oss-fuzz/pull/5279

1 0

git:5.6:13229397: misctest: allow testing with larger message size than core accepts
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: 13229397a2b72ea7f790291ee9e9c03d17fa6680 URL: https://github.com/kamailio/kamailio/commit/13229397a2b72ea7f790291ee9e9c03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T10:33:38+02:00 misctest: allow testing with larger message size than core accepts (cherry picked from commit 598969df126af4ad4d2283e37078e1afe8773a32) --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/13229397a2b72ea7f790291ee9e9c03… Patch: https://github.com/kamailio/kamailio/commit/13229397a2b72ea7f790291ee9e9c03… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index c00a8b9c5c0..e0108b5a76b 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -265,13 +265,13 @@ static int misctest_memory_init(void) static int misctest_message_init(void) { - char tbuf[BUF_SIZE]; + char tbuf[4*BUF_SIZE]; FILE *f; long fsize; sip_msg_t tmsg = { }; if(misctest_message_data.s!=0 && misctest_message_data.len>0) { - if(misctest_message_data.len>=BUF_SIZE-2) { + if(misctest_message_data.len>=4*BUF_SIZE-2) { LM_ERR("the data is too big\n"); return -1; } @@ -297,7 +297,7 @@ static int misctest_message_init(void) } fseek(f, 0, SEEK_SET); - if(fsize>=BUF_SIZE-2) { + if(fsize>=4*BUF_SIZE-2) { LM_ERR("the file data is too big\n"); fclose(f); return -1;

1 0

git:5.6:19aab189: corex: added fixup free functions in module exports
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: 19aab1894ba88bc7152e00a84819d991937665a6 URL: https://github.com/kamailio/kamailio/commit/19aab1894ba88bc7152e00a84819d99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T10:33:01+02:00 corex: added fixup free functions in module exports (cherry picked from commit d5ae9019dcdfe5b51ce87f6957902abbaa7fa071) --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/19aab1894ba88bc7152e00a84819d99… Patch: https://github.com/kamailio/kamailio/commit/19aab1894ba88bc7152e00a84819d99… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 3c6b6a59f41..7e61f1f93d7 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -112,59 +112,59 @@ static cmd_export_t cmds[]={ {"append_branch", (cmd_function)w_append_branch, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 2, fixup_spve_spve, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_udp", (cmd_function)w_send_udp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_udp", (cmd_function)w_send_udp, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_tcp", (cmd_function)w_send_tcp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_tcp", (cmd_function)w_send_tcp, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_data", (cmd_function)w_send_data, 2, fixup_spve_spve, - 0, ANY_ROUTE }, + fixup_free_spve_spve, ANY_ROUTE }, {"sendx", (cmd_function)w_sendx, 3, fixup_spve_all, - 0, ANY_ROUTE }, + fixup_free_spve_all, ANY_ROUTE }, {"is_incoming", (cmd_function)nio_check_incoming, 0, 0, 0, ANY_ROUTE }, {"msg_iflag_set", (cmd_function)w_msg_iflag_set, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"msg_iflag_reset", (cmd_function)w_msg_iflag_reset, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"msg_iflag_is_set", (cmd_function)w_msg_iflag_is_set, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"file_read", (cmd_function)w_file_read, 2, fixup_file_op, 0, ANY_ROUTE }, {"file_write", (cmd_function)w_file_write, 2, fixup_spve_spve, - 0, ANY_ROUTE }, - {"setxflag", (cmd_function)w_setxflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, - {"resetxflag", (cmd_function)w_resetxflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, - {"isxflagset", (cmd_function)w_isxflagset, 1,fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_spve_spve, ANY_ROUTE }, + {"setxflag", (cmd_function)w_setxflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, + {"resetxflag", (cmd_function)w_resetxflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, + {"isxflagset", (cmd_function)w_isxflagset, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, {"set_send_socket", (cmd_function)w_set_send_socket, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_send_socket_name", (cmd_function)w_set_send_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_recv_socket", (cmd_function)w_set_recv_socket, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_recv_socket_name", (cmd_function)w_set_recv_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_source_address", (cmd_function)w_set_source_address, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"via_add_srvid", (cmd_function)w_via_add_srvid, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"via_add_xavp_params", (cmd_function)w_via_add_xavp_params, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE }, {"is_socket_name", (cmd_function)w_is_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} };

1 0

git:5.6:c07b6c55: misc/fuzz: add checks on input size
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: c07b6c55e4cdcc4cf46dafa4431e79a024ca10ec URL: https://github.com/kamailio/kamailio/commit/c07b6c55e4cdcc4cf46dafa4431e79a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T10:33:23+02:00 misc/fuzz: add checks on input size - test with larger messages than core accepts (cherry picked from commit 1cd2fc1977bfa5e362cef0199e4643085c66d3d1) --- Modified: misc/fuzz/fuzz_parse_msg.c Modified: misc/fuzz/fuzz_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/c07b6c55e4cdcc4cf46dafa4431e79a… Patch: https://github.com/kamailio/kamailio/commit/c07b6c55e4cdcc4cf46dafa4431e79a… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index e20c2e64f3a..80fe75a226b 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -1,3 +1,4 @@ +#include "../config.h" #include "../parser/sdp/sdp.h" #include "../parser/parse_uri.c" #include "../parser/parse_hname2.h" @@ -23,6 +24,11 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { orig_inv.buf = (char*)data; orig_inv.len = size; + if(size >= 4*BUF_SIZE) { + /* test with larger message than core accepts, but not indefinitely large */ + return 0; + } + if (parse_msg(orig_inv.buf, orig_inv.len, &orig_inv) < 0) { goto cleanup; } diff --git a/misc/fuzz/fuzz_uri.c b/misc/fuzz/fuzz_uri.c index 9418d6eed4d..3cc6dec061f 100644 --- a/misc/fuzz/fuzz_uri.c +++ b/misc/fuzz/fuzz_uri.c @@ -1,8 +1,14 @@ + +#include "../config.h" #include "../parser/parse_uri.c" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { struct sip_uri uri; + if(size >= BUF_SIZE) { + /* test with larger message than core accepts, but not indefinitely large */ + return 0; + } parse_uri(data, size, &uri); return 0; }

1 0

Releasing v5.6.2
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Hello, I am considering to release Kamailio v5.6.2 (out of branch 5.6) later this week (likely on Thursday, Nov 6, 2022). If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Nov 7-10, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

git:master:598969df: misctest: allow testing with larger message size than core accepts
by Daniel-Constantin Mierla 05 Oct '22

05 Oct '22

Module: kamailio Branch: master Commit: 598969df126af4ad4d2283e37078e1afe8773a32 URL: https://github.com/kamailio/kamailio/commit/598969df126af4ad4d2283e37078e1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-05T10:41:38+02:00 misctest: allow testing with larger message size than core accepts --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/598969df126af4ad4d2283e37078e1a… Patch: https://github.com/kamailio/kamailio/commit/598969df126af4ad4d2283e37078e1a… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index c00a8b9c5c0..e0108b5a76b 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -265,13 +265,13 @@ static int misctest_memory_init(void) static int misctest_message_init(void) { - char tbuf[BUF_SIZE]; + char tbuf[4*BUF_SIZE]; FILE *f; long fsize; sip_msg_t tmsg = { }; if(misctest_message_data.s!=0 && misctest_message_data.len>0) { - if(misctest_message_data.len>=BUF_SIZE-2) { + if(misctest_message_data.len>=4*BUF_SIZE-2) { LM_ERR("the data is too big\n"); return -1; } @@ -297,7 +297,7 @@ static int misctest_message_init(void) } fseek(f, 0, SEEK_SET); - if(fsize>=BUF_SIZE-2) { + if(fsize>=4*BUF_SIZE-2) { LM_ERR("the file data is too big\n"); fclose(f); return -1;

1 0

git:master:1cd2fc19: misc/fuzz: add checks on input size
by Daniel-Constantin Mierla 05 Oct '22

05 Oct '22

Module: kamailio Branch: master Commit: 1cd2fc1977bfa5e362cef0199e4643085c66d3d1 URL: https://github.com/kamailio/kamailio/commit/1cd2fc1977bfa5e362cef0199e46430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-05T10:34:43+02:00 misc/fuzz: add checks on input size - test with larger messages than core accepts --- Modified: misc/fuzz/fuzz_parse_msg.c Modified: misc/fuzz/fuzz_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/1cd2fc1977bfa5e362cef0199e46430… Patch: https://github.com/kamailio/kamailio/commit/1cd2fc1977bfa5e362cef0199e46430… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index e20c2e64f3a..80fe75a226b 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -1,3 +1,4 @@ +#include "../config.h" #include "../parser/sdp/sdp.h" #include "../parser/parse_uri.c" #include "../parser/parse_hname2.h" @@ -23,6 +24,11 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { orig_inv.buf = (char*)data; orig_inv.len = size; + if(size >= 4*BUF_SIZE) { + /* test with larger message than core accepts, but not indefinitely large */ + return 0; + } + if (parse_msg(orig_inv.buf, orig_inv.len, &orig_inv) < 0) { goto cleanup; } diff --git a/misc/fuzz/fuzz_uri.c b/misc/fuzz/fuzz_uri.c index 9418d6eed4d..3cc6dec061f 100644 --- a/misc/fuzz/fuzz_uri.c +++ b/misc/fuzz/fuzz_uri.c @@ -1,8 +1,14 @@ + +#include "../config.h" #include "../parser/parse_uri.c" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { struct sip_uri uri; + if(size >= BUF_SIZE) { + /* test with larger message than core accepts, but not indefinitely large */ + return 0; + } parse_uri(data, size, &uri); return 0; }

1 0

git:master:916ecb43: misc/fuzz/README.md: added link to OSS-Fuzz folder for Kamailio
by Daniel-Constantin Mierla 05 Oct '22

05 Oct '22

Module: kamailio Branch: master Commit: 916ecb43e94fcc4662ae4212172b2b66488002de URL: https://github.com/kamailio/kamailio/commit/916ecb43e94fcc4662ae4212172b2b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-05T10:37:01+02:00 misc/fuzz/README.md: added link to OSS-Fuzz folder for Kamailio --- Modified: misc/fuzz/README.md --- Diff: https://github.com/kamailio/kamailio/commit/916ecb43e94fcc4662ae4212172b2b6… Patch: https://github.com/kamailio/kamailio/commit/916ecb43e94fcc4662ae4212172b2b6… --- diff --git a/misc/fuzz/README.md b/misc/fuzz/README.md index bc0238f56c..72dcc17072 100644 --- a/misc/fuzz/README.md +++ b/misc/fuzz/README.md @@ -5,6 +5,10 @@ various open source projects. * https://github.com/google/oss-fuzz +Folder for Kamailio project on OSS-Fuzz: + + * https://github.com/google/oss-fuzz/tree/master/projects/kamailio + OSS-Fuzz pull request to integrate Kamailio: * https://github.com/google/oss-fuzz/pull/5279

1 0

git:master:45c4c1b1: lrkproxy: init variable and check to fix compiler warnings
by Daniel-Constantin Mierla 04 Oct '22

04 Oct '22

Module: kamailio Branch: master Commit: 45c4c1b1851212bfc8e0c84d4e1a62cd89ad7b56 URL: https://github.com/kamailio/kamailio/commit/45c4c1b1851212bfc8e0c84d4e1a62c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-04T16:12:17+02:00 lrkproxy: init variable and check to fix compiler warnings --- Modified: src/modules/lrkproxy/lrkproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/45c4c1b1851212bfc8e0c84d4e1a62c… Patch: https://github.com/kamailio/kamailio/commit/45c4c1b1851212bfc8e0c84d4e1a62c… --- diff --git a/src/modules/lrkproxy/lrkproxy.c b/src/modules/lrkproxy/lrkproxy.c index e673ffed63..cdd69bf75e 100644 --- a/src/modules/lrkproxy/lrkproxy.c +++ b/src/modules/lrkproxy/lrkproxy.c @@ -1290,7 +1290,7 @@ static struct lrkp_set * select_lrkp_set(int id_set ){ struct lrkp_node *select_lrkp_node(int do_test) { - struct lrkp_node* node; + struct lrkp_node* node = NULL; int was_forced; int was_forced2; @@ -1391,7 +1391,7 @@ struct lrkp_node *select_lrkp_node(int do_test) } found: - if (do_test) { + if (do_test && node) { // //todo... node->ln_enable = lrkp_test(node); if (!node->ln_enable)

1 0

git:master:640456bb: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 04 Oct '22

04 Oct '22

Module: kamailio Branch: master Commit: 640456bb13cd9da3ff84ca3542f9f28446062d7c URL: https://github.com/kamailio/kamailio/commit/640456bb13cd9da3ff84ca3542f9f28… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-10-04T12:01:46+02:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/640456bb13cd9da3ff84ca3542f9f28… Patch: https://github.com/kamailio/kamailio/commit/640456bb13cd9da3ff84ca3542f9f28… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index a16d628fae..0b9465dfa1 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -71,7 +71,7 @@ Daniel-Constantin Mierla 1.15. jsonrpc_exec usage 1.16. JSONRPC Commands - Examples 1.17. JSONRPC Over Fifo Command - 1.18. JSONRPC Over Fifo Command From Termina + 1.18. JSONRPC Over Fifo Command From Terminal Chapter 1. Admin Guide @@ -494,7 +494,7 @@ xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); Next is an example of how to test it from a terminal, assuming that the parameter 'fifo_name' is set to '/tmp/kamailio_jsonrpc_fifo'. - Example 1.18. JSONRPC Over Fifo Command From Termina + Example 1.18. JSONRPC Over Fifo Command From Terminal ... mkfifo /tmp/kamailio_jsonrpc_reply_fifo cat /tmp/kamailio_jsonrpc_reply_fifo &

1 0

git:master:758ec768: jsonrpcs: small spelling fix in docs
by Henning Westerholt 04 Oct '22

04 Oct '22

Module: kamailio Branch: master Commit: 758ec768576cf4e380d6cd7f678f6270f79033af URL: https://github.com/kamailio/kamailio/commit/758ec768576cf4e380d6cd7f678f627… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-04T09:50:08Z jsonrpcs: small spelling fix in docs --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/758ec768576cf4e380d6cd7f678f627… Patch: https://github.com/kamailio/kamailio/commit/758ec768576cf4e380d6cd7f678f627… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index cd8691af09a..fe18a4a76d7 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -582,7 +582,7 @@ xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); the parameter 'fifo_name' is set to '/tmp/kamailio_jsonrpc_fifo'. </para> <example> - <title>JSONRPC Over Fifo Command From Termina</title> + <title>JSONRPC Over Fifo Command From Terminal</title> <programlisting format="linespecific"> ... mkfifo /tmp/kamailio_jsonrpc_reply_fifo

1 0

[kamailio/kamailio] segfault at f8 ip 00007fd49cf02f72 sp 00007ffea6e37e70 error 4 in dmq_usrloc.so[7fd49cef0000+17000] (Issue #3242)
by Joel Serrano 04 Oct '22

04 Oct '22

### Description We have a cluster of two Kamailio nodes on Debian 10 + v5.5.2. We have added a node and updated to v5.6.1. So now it's a cluster of: 2x debian10 + v5.6.1 1x debian11 + v5.6.1 ### Troubleshooting I'm not sure what is the issue but per `dmesg` logs it seems related to `dmq_usrloc` module. We have a lot of cores, so it's happening constantly since the upgrade and the extra node addition. #### Debugging Data [core.kamailio.53605.1663462643.txt](https://github.com/kamailio/kamailio/fi… #### Log Messages  ``` [155017.987497] kamailio[53605]: segfault at f8 ip 00007fd49cf02f72 sp 00007ffea6e37e70 error 4 in dmq_usrloc.so[7fd49cef0000+17000] [155017.987527] Code: 40 38 01 d0 89 05 12 95 00 00 48 8b 05 cf 8f 00 00 8b 00 83 f8 01 0f 85 80 00 00 00 48 8b 85 48 ff ff ff 48 8b 80 a0 00 00 00 <8b> 90 f8 00 00 00 48 8b 85 48 ff ff ff 48 8b 80 a0 00 00 00 48 8b ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1 (x86_64/linux) 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: unknown compiled with gcc 10.2.1 ``` * **Operating System**:  ``` No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye Linux sip03.example.com 5.18.0-0.deb11.4-amd64 #1 SMP PREEMPT_DYNAMIC Debian 5.18.16-1~bpo11+1 (2022-08-12) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3242 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3242(a)github.com>

2 8

[kamailio/kamailio] speeddial: allow search uri of speed dial by group (PR #3255)
by Tomohare 04 Oct '22

04 Oct '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This new feature provides a way to have multiple users sharing the same speed dial number, if they belong to the same group. A new function is add: "sd_lookup_group". It finds the URI for a specific sd_username and group_id (and sd_domain if is_domain value is defined) in the database, returning its URI. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3255 -- Commit Summary -- * speeddial: allow search uri of speed dial by group -- File Changes -- M src/modules/speeddial/doc/speeddial_admin.xml (35) M src/modules/speeddial/sdlookup.h (2) M src/modules/speeddial/speeddial.c (8) M src/modules/speeddial/speeddial.h (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3255.patch https://github.com/kamailio/kamailio/pull/3255.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3255 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3255(a)github.com>

3 12

git:master:6f400a80: modules: readme files regenerated - carrierroute ... [skip ci]
by Kamailio Dev 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: 6f400a8074fe60916867596431ca26dff00435d1 URL: https://github.com/kamailio/kamailio/commit/6f400a8074fe60916867596431ca26d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-09-30T11:46:18+02:00 modules: readme files regenerated - carrierroute ... [skip ci] --- Modified: src/modules/carrierroute/README --- Diff: https://github.com/kamailio/kamailio/commit/6f400a8074fe60916867596431ca26d… Patch: https://github.com/kamailio/kamailio/commit/6f400a8074fe60916867596431ca26d… --- diff --git a/src/modules/carrierroute/README b/src/modules/carrierroute/README index ad924c1ca2..ba1d19d230 100644 --- a/src/modules/carrierroute/README +++ b/src/modules/carrierroute/README @@ -41,7 +41,7 @@ Lucian Balaceanu 4. Functions - 4.1. cr_user_carrier(user, domain, dstavp) + 4.1. cr_user_carrier(user, domain, dstvar) 4.2. cr_route(carrier, domain, prefix_matching, rewrite_user, hash_source, descavp) @@ -185,7 +185,7 @@ Chapter 1. Admin Guide 4. Functions - 4.1. cr_user_carrier(user, domain, dstavp) + 4.1. cr_user_carrier(user, domain, dstvar) 4.2. cr_route(carrier, domain, prefix_matching, rewrite_user, hash_source, descavp) @@ -473,7 +473,7 @@ modparam("carrierroute", "avoid_failed_destinations", 0) 4. Functions - 4.1. cr_user_carrier(user, domain, dstavp) + 4.1. cr_user_carrier(user, domain, dstvar) 4.2. cr_route(carrier, domain, prefix_matching, rewrite_user, hash_source, descavp) @@ -501,22 +501,23 @@ cr_user_rewrite_uri(uri, domain) cr_tree_rewrite_uri(tree, domain) -> cr_route(tree, domain, "$rU", "$rU", "call_id") -4.1. cr_user_carrier(user, domain, dstavp) +4.1. cr_user_carrier(user, domain, dstvar) - This function loads the carrier and stores it in an AVP. It cannot be - used in the config file mode, as it needs a mapping of the given user - to a certain carrier. The is derived from a database entry belonging to - the user parameter. This mapping must be available in the table that is - specified in the “subscriber_table” variable. This data is not cached - in memory, that means for every execution of this function a database - query will be done. + This function loads the carrier and stores it in a config variable. It + cannot be used in the config file mode, as it needs a mapping of the + given user to a certain carrier. The is derived from a database entry + belonging to the user parameter. This mapping must be available in the + table that is specified in the “subscriber_table” variable. This data + is not cached in memory, that means for every execution of this + function a database query will be done. Meaning of the parameters is as follows: * user - Name of the user for the carrier tree lookup. Additional to a string any pseudo-variable could be used as input. * domain - Name of the routing domain to be used. Additional to a string any pseudo-variable could be used as input. - * dstavp - Name of the AVP where to store the carrier id. + * dstvar - Name of the writaable variable (e.g., an AVP) where to + store the carrier id. 4.2. cr_route(carrier, domain, prefix_matching, rewrite_user, hash_source, descavp)

1 0

git:master:1e3f1886: carrierroute: exported cr_user_carrier() to kemi
by Daniel-Constantin Mierla 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: 1e3f1886cef43fcbf6cdd6f1cefb5b72e5151abc URL: https://github.com/kamailio/kamailio/commit/1e3f1886cef43fcbf6cdd6f1cefb5b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-30T11:35:53+02:00 carrierroute: exported cr_user_carrier() to kemi --- Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/cr_func.c Modified: src/modules/carrierroute/cr_func.h --- Diff: https://github.com/kamailio/kamailio/commit/1e3f1886cef43fcbf6cdd6f1cefb5b7… Patch: https://github.com/kamailio/kamailio/commit/1e3f1886cef43fcbf6cdd6f1cefb5b7… --- diff --git a/src/modules/carrierroute/carrierroute.c b/src/modules/carrierroute/carrierroute.c index b1d6b986bd..68fa793971 100644 --- a/src/modules/carrierroute/carrierroute.c +++ b/src/modules/carrierroute/carrierroute.c @@ -39,6 +39,7 @@ #include "../../core/str.h" #include "../../core/mem/mem.h" #include "../../core/ut.h" /* for user2uid() */ +#include "../../core/kemi.h" #include "carrierroute.h" #include "cr_fixup.h" #include "cr_map.h" @@ -270,3 +271,28 @@ static void mod_destroy(void) { } destroy_route_data(); } + + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_carrierroute_exports[] = { + { str_init("carrierroute"), str_init("cr_user_carrier"), + SR_KEMIP_INT, ki_cr_load_user_carrier, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_carrierroute_exports); + return 0; +} diff --git a/src/modules/carrierroute/cr_func.c b/src/modules/carrierroute/cr_func.c index e4e7fc1c41..90875a8df0 100644 --- a/src/modules/carrierroute/cr_func.c +++ b/src/modules/carrierroute/cr_func.c @@ -722,6 +722,48 @@ int cr_do_route(struct sip_msg * _msg, gparam_t *_carrier, } +/** + * + */ +int ki_cr_load_user_carrier_helper(struct sip_msg *_msg, + str *user, str *domain, pv_spec_t *dvar) { + pv_value_t val = {0}; + + /* get carrier id */ + if ((val.ri = load_user_carrier(user, domain)) < 0) { + LM_ERR("error in load user carrier"); + return -1; + } else { + /* set var */ + val.flags = PV_VAL_INT|PV_TYPE_INT; + if(dvar->setf(_msg, &dvar->pvp, (int)EQ_T, &val)<0) { + LM_ERR("failed setting dst var\n"); + return -1; + } + } + return 1; +} + +/** + * + */ +int ki_cr_load_user_carrier(struct sip_msg *_msg, + str *user, str *domain, str *dstvar) { + pv_spec_t *dst; + + dst = pv_cache_get(dstvar); + if(dst==NULL) { + LM_ERR("failed to get pv spec for: %.*s\n", dstvar->len, dstvar->s); + return -1; + } + if(dst->setf==NULL) { + LM_ERR("target pv is not writable: %.*s\n", dstvar->len, dstvar->s); + return -1; + } + + return ki_cr_load_user_carrier_helper(_msg, user, domain, dst); +} + /** * Loads user carrier from subscriber table and stores it in an AVP. * @@ -735,8 +777,6 @@ int cr_do_route(struct sip_msg * _msg, gparam_t *_carrier, int cr_load_user_carrier(struct sip_msg * _msg, char *_user, char *_domain, char *_dstvar) { str user, domain; - pv_spec_t *dst; - pv_value_t val = {0}; if (fixup_get_svalue(_msg, (gparam_t*)_user, &user)<0) { LM_ERR("cannot print the user\n"); @@ -747,22 +787,10 @@ int cr_load_user_carrier(struct sip_msg * _msg, LM_ERR("cannot print the domain\n"); return -1; } - /* get carrier id */ - if ((val.ri = load_user_carrier(&user, &domain)) < 0) { - LM_ERR("error in load user carrier"); - return -1; - } else { - /* set var */ - dst = (pv_spec_t *)_dstvar; - val.flags = PV_VAL_INT|PV_TYPE_INT; - if(dst->setf(_msg, &dst->pvp, (int)EQ_T, &val)<0) { - LM_ERR("failed setting dst var\n"); - return -1; - } - } - return 1; -} + return ki_cr_load_user_carrier_helper(_msg, &user, &domain, + (pv_spec_t*)_dstvar); +} /** * rewrites the request URI of msg after determining the diff --git a/src/modules/carrierroute/cr_func.h b/src/modules/carrierroute/cr_func.h index 1fc7343611..b2e861ac76 100644 --- a/src/modules/carrierroute/cr_func.h +++ b/src/modules/carrierroute/cr_func.h @@ -49,6 +49,9 @@ int cr_load_user_carrier(struct sip_msg * _msg, char *_user, char *_domain, char *_dstavp); +int ki_cr_load_user_carrier(struct sip_msg *_msg, + str *user, str *domain, str *dstvar); + /** * rewrites the request URI of msg after determining the * new destination URI

1 0

git:master:e84c1947: carrierroute: updated cr_load_user_carrier() to support any output variable
by Daniel-Constantin Mierla 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: e84c1947b3c9fa5dc07fbab0361758a9f87e9da2 URL: https://github.com/kamailio/kamailio/commit/e84c1947b3c9fa5dc07fbab0361758a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-30T11:16:48+02:00 carrierroute: updated cr_load_user_carrier() to support any output variable - third parameter can be any writable - added fixup-free function for it --- Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/cr_fixup.c Modified: src/modules/carrierroute/cr_fixup.h Modified: src/modules/carrierroute/cr_func.c Modified: src/modules/carrierroute/cr_func.h --- Diff: https://github.com/kamailio/kamailio/commit/e84c1947b3c9fa5dc07fbab0361758a… Patch: https://github.com/kamailio/kamailio/commit/e84c1947b3c9fa5dc07fbab0361758a…

1 0

git:master:c32ce4d7: carrierroute: docs updated for cr_user_carrier()
by Daniel-Constantin Mierla 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: c32ce4d776d40fe2eccea9007fb842cd8c9c3af9 URL: https://github.com/kamailio/kamailio/commit/c32ce4d776d40fe2eccea9007fb842c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-30T11:21:29+02:00 carrierroute: docs updated for cr_user_carrier() --- Modified: src/modules/carrierroute/doc/carrierroute_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c32ce4d776d40fe2eccea9007fb842c… Patch: https://github.com/kamailio/kamailio/commit/c32ce4d776d40fe2eccea9007fb842c… --- diff --git a/src/modules/carrierroute/doc/carrierroute_admin.xml b/src/modules/carrierroute/doc/carrierroute_admin.xml index 3b883d75155..341349495ec 100644 --- a/src/modules/carrierroute/doc/carrierroute_admin.xml +++ b/src/modules/carrierroute/doc/carrierroute_admin.xml @@ -412,10 +412,10 @@ cr_tree_rewrite_uri(tree, domain) <section> <title> - <function moreinfo="none">cr_user_carrier(user, domain, dstavp)</function> + <function moreinfo="none">cr_user_carrier(user, domain, dstvar)</function> </title> <para> - This function loads the carrier and stores it in an AVP. + This function loads the carrier and stores it in a config variable. It cannot be used in the config file mode, as it needs a mapping of the given user to a certain carrier. The is derived from a database entry belonging to the user parameter. This mapping must be available in the @@ -438,7 +438,8 @@ cr_tree_rewrite_uri(tree, domain) </para> </listitem> <listitem> - <para><emphasis>dstavp</emphasis> - Name of the AVP where to store the carrier id. + <para><emphasis>dstvar</emphasis> - Name of the writaable variable (e.g., an AVP) + where to store the carrier id. </para> </listitem> </itemizedlist>

1 0

git:master:d5ae9019: corex: added fixup free functions in module exports
by Daniel-Constantin Mierla 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: d5ae9019dcdfe5b51ce87f6957902abbaa7fa071 URL: https://github.com/kamailio/kamailio/commit/d5ae9019dcdfe5b51ce87f6957902ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-30T10:52:25+02:00 corex: added fixup free functions in module exports --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5ae9019dcdfe5b51ce87f6957902ab… Patch: https://github.com/kamailio/kamailio/commit/d5ae9019dcdfe5b51ce87f6957902ab… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 3c6b6a59f41..7e61f1f93d7 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -112,59 +112,59 @@ static cmd_export_t cmds[]={ {"append_branch", (cmd_function)w_append_branch, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 2, fixup_spve_spve, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_udp", (cmd_function)w_send_udp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_udp", (cmd_function)w_send_udp, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_tcp", (cmd_function)w_send_tcp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_tcp", (cmd_function)w_send_tcp, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_data", (cmd_function)w_send_data, 2, fixup_spve_spve, - 0, ANY_ROUTE }, + fixup_free_spve_spve, ANY_ROUTE }, {"sendx", (cmd_function)w_sendx, 3, fixup_spve_all, - 0, ANY_ROUTE }, + fixup_free_spve_all, ANY_ROUTE }, {"is_incoming", (cmd_function)nio_check_incoming, 0, 0, 0, ANY_ROUTE }, {"msg_iflag_set", (cmd_function)w_msg_iflag_set, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"msg_iflag_reset", (cmd_function)w_msg_iflag_reset, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"msg_iflag_is_set", (cmd_function)w_msg_iflag_is_set, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"file_read", (cmd_function)w_file_read, 2, fixup_file_op, 0, ANY_ROUTE }, {"file_write", (cmd_function)w_file_write, 2, fixup_spve_spve, - 0, ANY_ROUTE }, - {"setxflag", (cmd_function)w_setxflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, - {"resetxflag", (cmd_function)w_resetxflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, - {"isxflagset", (cmd_function)w_isxflagset, 1,fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_spve_spve, ANY_ROUTE }, + {"setxflag", (cmd_function)w_setxflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, + {"resetxflag", (cmd_function)w_resetxflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, + {"isxflagset", (cmd_function)w_isxflagset, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, {"set_send_socket", (cmd_function)w_set_send_socket, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_send_socket_name", (cmd_function)w_set_send_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_recv_socket", (cmd_function)w_set_recv_socket, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_recv_socket_name", (cmd_function)w_set_recv_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_source_address", (cmd_function)w_set_source_address, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"via_add_srvid", (cmd_function)w_via_add_srvid, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"via_add_xavp_params", (cmd_function)w_via_add_xavp_params, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE }, {"is_socket_name", (cmd_function)w_is_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} };

1 0

OpenSSL and LibreSSL - food for thought
by Olle E. Johansson 30 Sep '22

30 Sep '22

Hi! A few years ago Daniel and I checked the possibility of supporting LibreSSL in addition to OpenSSL. I might not remember all the details, but I think it failed on LibreSSL not willing to support the memory allocation API we use in OpenSSL. There has been a lot of discussion about the OpenSSL project lately, their focus and lack of communication skills. AlpineLinux has tried moving away from OpenSSL but failed in the first attempt and now discuss making another attempt. It they do and we want to run Kamailio in Alpine - which is used in many container environments - we need to pay attention. https://gitlab.alpinelinux.org/alpine/tsc/-/issues/28 Some quotes: "Meanwhile, there are more problems: it turns out that OpenSSL 3.x will not have LTS releases of the same length as past branches of OpenSSL. In addition, there are governance problems, as outlined by Rich Salz in his email to the openssl-project mailing list: the OpenSSL developers appear to want to focus on developing new features rather than cleaning up the mess of regressions they have created with OpenSSL 3.” "However, it is the opinion of the Alpine license review community that the Apache 2.0 license is not compatible with GPLv2. It is also the opinion of the Alpine license review community that the OpenSSL 1.x license was alreadycompatible with both GPLv2 and GPLv3 due to the system library exception: it is generally not possible to install an Alpine system without having an OpenSSL implementation, so it clearly qualifies as a system library.” Kamailio has GPLv2 - if we parse the license the same way, we can’t support OpenSSL 3. We have many third-party libraries we use, like Curl, that also use OpenSSL. Curl may be a bad example, since the support of various TLS stacks is huge in Curl, but other libraries may have to make a decision here too. Do you have any feeling if other Open Source projects discuss this? Should we take another look at using LibreSSL? Personally I’m rather worried about all the discussions around the OpenSSL project. There has been meetings at IETF with this as a topic. It is a very important building block for a lot of what we work with. Cheers, /O

3 4

git:master:ff7913f5: core: snexpr - compile time options for formatting fload with full precission
by Daniel-Constantin Mierla 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: ff7913f511f95a891fe870cb1fe88f586573af79 URL: https://github.com/kamailio/kamailio/commit/ff7913f511f95a891fe870cb1fe88f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-30T09:17:36+02:00 core: snexpr - compile time options for formatting fload with full precission --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/ff7913f511f95a891fe870cb1fe88f5… Patch: https://github.com/kamailio/kamailio/commit/ff7913f511f95a891fe870cb1fe88f5… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index d6b9adac86..df409f8381 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -395,7 +395,11 @@ static int snexpr_format_num(char **out, float value) return -1; } if(value - (long)value != 0) { +#ifdef SNEXPR_FLOAT_FULLPREC + ret = snprintf(*out, 24, "%g", value); +#else ret = snprintf(*out, 24, "%.4g", value); +#endif } else { ret = snprintf(*out, 24, "%lld", (long long)value); }

1 0

Kamailio_IMS VMware image
by Khalil Toubia 29 Sep '22

29 Sep '22

Dear all I'm sending this email asking for Kamailio_IMS VMware image regards -- Khalil Toubia Telecom Consultant / Electronic Expert +961 70 226 442 Beirut - Lebanon

3 2

New feature: #defexp -preprocessor define with expression
by Daniel-Constantin Mierla 29 Sep '22

29 Sep '22

Hello, following the recent new feature of #!ifexp based on snexpr (https://www.kamailio.org/w/2022/09/ifexp-conditional-preprocessor-blocks/), another preprocessor directive was added which allows defining IDs with a value computed from the evaluation of an expression, respectively: #!defexp ID EXP The EXP can be any expression supported by snexpr, including the previously defined IDs. For example: #!define IPADDR 1.2.3.4 #!define PORT 5060 #!defexp SIPURI "sip:" + IPADDR + ":" + PORT The result is that SIPURI is defined to sip:1.2.3.4:5060. Another variant is available as #!defexps, which encloses the result of the expression in double quotes, making it suitable to be used further as string value: #!defexps SIPURI "sip:" + IPADDR + ":" + PORT The result is that SIPURI is defined to “sip:1.2.3.4:5060”. More details at: - https://www.kamailio.org/wikidocs/cookbooks/devel/core/#defexp - https://www.kamailio.org/wikidocs/cookbooks/devel/core/#defexps Testing would be appreciated, feedback can be addressed to sr-users mailing list! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Nov 7-10, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:d5df2e45: core: snexpr.h - custom function to format float value
by Daniel-Constantin Mierla 29 Sep '22

29 Sep '22

Module: kamailio Branch: master Commit: d5df2e45cf6ae3c8fc61f565c9291b26ff255ede URL: https://github.com/kamailio/kamailio/commit/d5df2e45cf6ae3c8fc61f565c9291b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-29T10:06:03+02:00 core: snexpr.h - custom function to format float value - use a precision of 4 decimals --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/d5df2e45cf6ae3c8fc61f565c9291b2… Patch: https://github.com/kamailio/kamailio/commit/d5df2e45cf6ae3c8fc61f565c9291b2… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index d1ade48525..d6b9adac86 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -387,6 +387,26 @@ static int to_int(float x) } +static int snexpr_format_num(char **out, float value) +{ + int ret = 0; + *out = (char*)malloc(24*sizeof(char)); + if(*out==NULL) { + return -1; + } + if(value - (long)value != 0) { + ret = snprintf(*out, 24, "%.4g", value); + } else { + ret = snprintf(*out, 24, "%lld", (long long)value); + } + if((ret < 0) || (ret >= 24)) { + free(*out); + *out = NULL; + return -2; + } + return 0; +} + static struct snexpr *snexpr_convert_num(float value, unsigned int ctype) { struct snexpr *e = (struct snexpr *)malloc(sizeof(struct snexpr)); @@ -398,7 +418,7 @@ static struct snexpr *snexpr_convert_num(float value, unsigned int ctype) if(ctype == SNE_OP_CONSTSTZ) { e->eflags |= SNEXPR_EXPALLOC | SNEXPR_VALALLOC; e->type = SNE_OP_CONSTSTZ; - asprintf(&e->param.stz.sval, "%g", value); + snexpr_format_num(&e->param.stz.sval, value); return e; }

1 0

git:master:d5eebda3: core: snexpr.h - removed mistakenly placed string concat
by Daniel-Constantin Mierla 29 Sep '22

29 Sep '22

Module: kamailio Branch: master Commit: d5eebda3a09401478e6707bb03043d75b90fe1d3 URL: https://github.com/kamailio/kamailio/commit/d5eebda3a09401478e6707bb03043d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-29T09:27:51+02:00 core: snexpr.h - removed mistakenly placed string concat --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/d5eebda3a09401478e6707bb03043d7… Patch: https://github.com/kamailio/kamailio/commit/d5eebda3a09401478e6707bb03043d7… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index a0834c5180..d1ade48525 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -508,7 +508,6 @@ static void snexpr_result_free(struct snexpr *e) rv1 = tv; \ snexpr_eval_check_val(rv1, SNE_OP_CONSTSTZ); \ } \ - lv = snexpr_concat_strz(rv0->param.stz.sval, rv1->param.stz.sval); \ if(strcmp(rv0->param.stz.sval, rv1->param.stz.sval) _CMPOP_ 0) { \ lv = snexpr_convert_num(1, SNE_OP_CONSTNUM); \ } else { \

1 0

[kamailio/kamailio] Regression on app_lua after ASLR enable (Issue #3202)
by Boris Korzun 28 Sep '22

28 Sep '22

### Description There's a regression after enabling Address Space Layout Randomization (ASLR). Kamailio causes SIGSEGV while loading `app_lua` (or other KEMI Interpreters probably). ### Troubleshooting #### Reproduction The regression has appeared after update FreeBSD kernel to https://github.com/freebsd/freebsd-src/commit/10192e77cfacd1f27601882af6188… Kamailio falls after `loadmodule "app_lua.so"` in `kamailio.cfg`. #### Debugging Data ``` root@server:/usr/jails/containers/kamailio/var/coredump/986# jexec kamailio lldb -c /var/coredump/986/kamailio.13521.core -- /usr/local/sbin/kamailio (lldb) target create "/usr/local/sbin/kamailio" --core "/var/coredump/986/kamailio.13521.core" Core file '/var/coredump/986/kamailio.13521.core' (x86_64) was loaded. (lldb) bt all * thread #1, name = 'kamailio', stop reason = signal SIGSEGV * frame #0: 0x0000000825b61350 libc.so.7`strncmp(s1=<unavailable>, s2=<unavailable>, n=<unavailable>) at strncmp.c:47:7 frame #1: 0x00000000003fc394 kamailio`sr_kemi_modules_add(klist=0x0000000861afb410) at kemi.c:3392:8 frame #2: 0x0000000861ae6154 app_lua.so`mod_register(path="/usr/local/lib/kamailio/modules/app_lua.so", dlflags=0x0000000821805b48, p1=0x0000000000000000, p2=0x0000000000000000) at app_lua_mod.c:605:2 frame #3: 0x00000000005e4b30 kamailio`load_module(mod_path="app_lua.so") at sr_module.c:592:7 frame #4: 0x0000000000885936 kamailio`yyparse at cfg.y:1965:8 frame #5: 0x00000000002ff384 kamailio`main(argc=7, argv=0x000000082180a848) at main.c:2506:6 frame #6: 0x00000000002ddd90 kamailio`_start(ap=<unavailable>, cleanup=<unavailable>) at crt1_c.c:75:7 ``` `_sr_kemi_modules[].mname.s` for `app_lua` points to incorrect data after second call `mod_register()(a)app_lua_mod.c` from `load_module()(a)sr_module.c` (reloading the module for setting correct `dlflags`). #### Log Messages ``` 08:35:53.689647 DEBUG: <core> [core/cfg.y:1964]: yyparse(): loading module kemix.so 08:35:53.689684 DEBUG: <core> [core/sr_module.c:516]: ksr_locate_module(): found module to load </usr/local/lib/kamailio/modules/kemix.so> 08:35:53.689698 DEBUG: <core> [core/sr_module.c:566]: load_module(): trying to load </usr/local/lib/kamailio/modules/kemix.so> 08:35:53.689796 DEBUG: <core> [core/kemi.c:3398]: sr_kemi_modules_add(): adding module: kx 08:35:53.689847 DEBUG: <core> [core/cfg.lex:2039]: pp_define(): defining id: MOD_kemix 08:35:53.689895 DEBUG: <core> [core/cfg.y:1964]: yyparse(): loading module app_lua.so 08:35:53.689931 DEBUG: <core> [core/sr_module.c:516]: ksr_locate_module(): found module to load </usr/local/lib/kamailio/modules/app_lua.so> 08:35:53.689948 DEBUG: <core> [core/sr_module.c:566]: load_module(): trying to load </usr/local/lib/kamailio/modules/app_lua.so> 08:35:53.690418 DEBUG: <core> [core/kemi.c:3494]: sr_kemi_eng_register(): registered config routing enginge [lua] 08:35:53.690444 DEBUG: <core> [core/kemi.c:3398]: sr_kemi_modules_add(): adding module: app_lua ``` ### Possible Solutions Temporary solution is disabling ASLR, ex. FreeBSD: ``` # sysctl kern.elf64.aslr.enable=0 # sysctl kern.elf64.aslr.pie_enable=0 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1 (x86_64/freebsd) b36a13 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, 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, select, kqueue. id: b36a13 compiled on 08:12:34 Jul 27 2022 with cc FreeBSD clang version 14.0.5 (https://github.com/llvm/llvm-project.git llvmorg-14.0.5-0-gc12386ae247c) ``` 5.5.4 is affected too * **Operating System**: ``` FreeBSD 13/stable ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3202 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3202(a)github.com>

3 16

git:master:9a41fb54: rtpengine: allow to-tag usage for all commands
by Richard Fuchs 28 Sep '22

28 Sep '22

Module: kamailio Branch: master Commit: 9a41fb5403a6bc4fd5ccee239ccdf725fe6f91df URL: https://github.com/kamailio/kamailio/commit/9a41fb5403a6bc4fd5ccee239ccdf72… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2022-09-28T09:33:56-04:00 rtpengine: allow to-tag usage for all commands --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/9a41fb5403a6bc4fd5ccee239ccdf72… Patch: https://github.com/kamailio/kamailio/commit/9a41fb5403a6bc4fd5ccee239ccdf72… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 2a38636609..ac1387bb39 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2689,8 +2689,11 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ || op == OP_UNBLOCK_MEDIA || op == OP_START_FORWARDING || op == OP_STOP_FORWARDING || op == OP_SILENCE_MEDIA || op == OP_UNSILENCE_MEDIA) { - if (ng_flags.directional) + if (ng_flags.directional) { bencode_dictionary_add_str(ng_flags.dict, "from-tag", &ng_flags.from_tag); + if (ng_flags.to && ng_flags.to_tag.s && ng_flags.to_tag.len) + bencode_dictionary_add_str(ng_flags.dict, "to-tag", &ng_flags.to_tag); + } } else if ((msg->first_line.type == SIP_REQUEST && op != OP_ANSWER) || (msg->first_line.type == SIP_REPLY && op == OP_DELETE)

1 0

git:master:28ce28f2: modules: readme files regenerated - lrkproxy ... [skip ci]
by Kamailio Dev 28 Sep '22

28 Sep '22

Module: kamailio Branch: master Commit: 28ce28f26ba069781ac6aee6c7ffcbd1281d7848 URL: https://github.com/kamailio/kamailio/commit/28ce28f26ba069781ac6aee6c7ffcbd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-09-28T13:01:21+02:00 modules: readme files regenerated - lrkproxy ... [skip ci] --- Modified: src/modules/lrkproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/28ce28f26ba069781ac6aee6c7ffcbd… Patch: https://github.com/kamailio/kamailio/commit/28ce28f26ba069781ac6aee6c7ffcbd…

1 0

git:master:6eb5bb67: lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports
by Mojtaba Esfandiari.S 28 Sep '22

28 Sep '22

Module: kamailio Branch: master Commit: 6eb5bb67586bf91c5d42a5864d881a4fc82a6638 URL: https://github.com/kamailio/kamailio/commit/6eb5bb67586bf91c5d42a5864d881a4… Author: Mojtaba Esfandiari.S <mespio(a)gmail.com> Committer: Mojtaba Esfandiari.S <mespio(a)gmail.com> Date: 2022-09-28T14:25:26+03:30 lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports --- Modified: src/modules/lrkproxy/doc/lrkproxy_admin.xml Modified: src/modules/lrkproxy/lrkproxy.c Modified: src/modules/lrkproxy/lrkproxy_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/6eb5bb67586bf91c5d42a5864d881a4… Patch: https://github.com/kamailio/kamailio/commit/6eb5bb67586bf91c5d42a5864d881a4…

1 0

git:master:a26eb52b: core: snexpr.h - declare iterators out of for() statements
by Daniel-Constantin Mierla 28 Sep '22

28 Sep '22

Module: kamailio Branch: master Commit: a26eb52bf50e687251f994fd35b3afc5ff2a32ca URL: https://github.com/kamailio/kamailio/commit/a26eb52bf50e687251f994fd35b3afc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-28T09:19:58+02:00 core: snexpr.h - declare iterators out of for() statements - support non-C99 compilers --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/a26eb52bf50e687251f994fd35b3afc… Patch: https://github.com/kamailio/kamailio/commit/a26eb52bf50e687251f994fd35b3afc… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index d6e853ffb4..a0834c5180 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -269,7 +269,8 @@ static struct static enum snexpr_type snexpr_op(const char *s, size_t len, int unary) { - for(unsigned int i = 0; i < sizeof(OPS) / sizeof(OPS[0]); i++) { + unsigned int i; + for(i = 0; i < sizeof(OPS) / sizeof(OPS[0]); i++) { if(strlen(OPS[i].s) == len && strncmp(OPS[i].s, s, len) == 0 && (unary == -1 || snexpr_is_unary(OPS[i].op) == unary)) { return OPS[i].op; @@ -283,7 +284,8 @@ static float snexpr_parse_number(const char *s, size_t len) float num = 0; unsigned int frac = 0; unsigned int digits = 0; - for(unsigned int i = 0; i < len; i++) { + unsigned int i; + for(i = 0; i < len; i++) { if(s[i] == '.' && frac == 0) { frac++; continue; @@ -319,7 +321,8 @@ struct snexpr_func static struct snexpr_func *snexpr_func_find( struct snexpr_func *funcs, const char *s, size_t len) { - for(struct snexpr_func *f = funcs; f->name; f++) { + struct snexpr_func *f; + for(f = funcs; f->name; f++) { if(strlen(f->name) == len && strncmp(f->name, s, len) == 0) { return f; } @@ -1190,7 +1193,8 @@ static struct snexpr *snexpr_create(const char *s, size_t len, sne_vec_free(&arg.args); goto cleanup; /* first argument is not a variable */ } - for(struct snexpr_var *v = vars->head; v; v = v->next) { + struct snexpr_var *v; + for(v = vars->head; v; v = v->next) { if(v == u->param.var.vref) { struct macro m = {v->name, arg.args}; sne_vec_push(&macros, m); @@ -1213,8 +1217,9 @@ static struct snexpr *snexpr_create(const char *s, size_t len, m = sne_vec_nth(&macros, found); struct snexpr root = snexpr_constnum(0); struct snexpr *p = &root; + int j; /* Assign macro parameters */ - for(int j = 0; j < sne_vec_len(&arg.args); j++) { + for(j = 0; j < sne_vec_len(&arg.args); j++) { char varname[4]; snprintf(varname, sizeof(varname) - 1, "$%d", (j + 1)); @@ -1228,7 +1233,7 @@ static struct snexpr *snexpr_create(const char *s, size_t len, p = &sne_vec_nth(&p->param.op.args, 1); } /* Expand macro body */ - for(int j = 1; j < sne_vec_len(&m.body); j++) { + for(j = 1; j < sne_vec_len(&m.body); j++) { if(j < sne_vec_len(&m.body) - 1) { *p = snexpr_binary(SNE_OP_COMMA, snexpr_constnum(0), snexpr_constnum(0)); @@ -1402,6 +1407,7 @@ static void snexpr_destroy_args(struct snexpr *e) static void snexpr_destroy(struct snexpr *e, struct snexpr_var_list *vars) { + struct snexpr_var *v; _snexternval_cbf = NULL; if(e != NULL) { @@ -1409,7 +1415,7 @@ static void snexpr_destroy(struct snexpr *e, struct snexpr_var_list *vars) free(e); } if(vars != NULL) { - for(struct snexpr_var *v = vars->head; v;) { + for(v = vars->head; v;) { struct snexpr_var *next = v->next; if(v->evflags & SNEXPR_VALALLOC) { free(v->v.sval);

1 0

[kamailio/kamailio] 5.6 @ ebda78c92c inserts wrong timestamps in acc_cdrs table (Issue #3243)
by Anthony Messina 28 Sep '22

28 Sep '22

### Description After upgrading from the 5.6.1 release by applying 5.6 branch changes through ebda78c92c, the `acc_cdr` entries for `start_time` and `end_time` in my PostgreSQL database are incorrect; the syslog output is also incorrect. The entries in the `acc` table contain the correct timestamps. In PostgreSQL, each of these timestamp columns are `timestamp without time zone`. ``` kamailio=# SELECT id, start_time, end_time, duration, callid FROM acc_cdrs ORDER BY id DESC LIMIT 1; id | start_time | end_time | duration | callid -------+---------------------+---------------------+----------+----------------------------------------- 24867 | 1969-12-31 18:00:25 | 1969-12-31 18:00:25 | 25.41 | 0_1083748456@fd00:a::215:65ff:fe9e:e168 (1 row) kamailio=# SELECT id, method, time, callid FROM acc ORDER BY id DESC LIMIT 2; id | method | time | callid --------+--------+---------------------+----------------------------------------- 108653 | BYE | 2022-09-17 20:54:43 | 0_1083748456@fd00:a::215:65ff:fe9e:e168 108652 | INVITE | 2022-09-17 20:54:18 | 0_1083748456@fd00:a::215:65ff:fe9e:e168 ``` #### Log Messages It appears that `duration` is being copied into `start_time` and `end_time`. ``` INFO: acc [acc_cdr.c:367]: log_write_cdr(): start_time=25.410; end_time=25.410; duration=25.410; callid=0_1083748456@fd00:a::215:65ff:fe9e:e168; from_tag=1137456145; to_tag=645d9eee-9c3a-420a-ac37-8d3c741a5ce9; ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1-2.20220917gitebda78c9.fc36 (x86_64/linux) b36a13 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: b36a13 compiled on 00:00:00 Sep 18 2022 with gcc 12.2.1 ``` * **Operating System**:  ``` Fedora 36 Linux 5.19.9-200.fc36.x86_64 #1 SMP PREEMPT_DYNAMIC Thu Sep 15 09:49:52 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3243 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3243(a)github.com>

3 13

git:master:07424a61: modules: readme files regenerated - presence_reginfo ... [skip ci]
by Kamailio Dev 27 Sep '22

27 Sep '22

Module: kamailio Branch: master Commit: 07424a6143c79037a3a6631bece9e536508d6d7d URL: https://github.com/kamailio/kamailio/commit/07424a6143c79037a3a6631bece9e53… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-09-27T16:16:21+02:00 modules: readme files regenerated - presence_reginfo ... [skip ci] --- Modified: src/modules/presence_reginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/07424a6143c79037a3a6631bece9e53… Patch: https://github.com/kamailio/kamailio/commit/07424a6143c79037a3a6631bece9e53… --- diff --git a/src/modules/presence_reginfo/README b/src/modules/presence_reginfo/README index ef9dd2fe39..8acd3a7ea7 100644 --- a/src/modules/presence_reginfo/README +++ b/src/modules/presence_reginfo/README @@ -27,12 +27,14 @@ Carsten Bock 3. Parameters 3.1. default_expires (int) + 3.2. aggregate_presentities (int) 4. Functions List of Examples 1.1. Set default_expires parameter + 1.2. Set aggregate_presentities parameter Chapter 1. Admin Guide @@ -47,6 +49,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. default_expires (int) + 3.2. aggregate_presentities (int) 4. Functions @@ -86,6 +89,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. default_expires (int) + 3.2. aggregate_presentities (int) 3.1. default_expires (int) @@ -99,6 +103,20 @@ Chapter 1. Admin Guide modparam("presence_reginfo", "default_expires", 3600) ... +3.2. aggregate_presentities (int) + + Whether to aggregate in a single notify body all registration + presentities. Useful to have all registrations on first NOTIFY + following initial SUBSCRIBE. + + Default value is “0” (disabled). + + Example 1.2. Set aggregate_presentities parameter + ... + modparam("presence_reginfo", "aggregate_ +presentities", 1) + ... + 4. Functions None to be used in configuration file.

1 0

[kamailio/kamailio] [WIP] presence_reginfo: Add option for aggregating reginfo presentities (PR #3240)
by Matteo 27 Sep '22

27 Sep '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Right now the `presence_reginfo` module does not perform any aggregation on presentities from the same AoR. While this is generally ok for new notifies driven by new publishes, when a new subscription is received only the most recent presentity is notified. This PR adds a new parameter, disabled by default to preserve compatibility, which merges all presentities for the same AoR into a single document. For example, two registrations from the same AoR will create the following document: ```<?xml version="1.0"?> <reginfo xmlns="urn:ietf:params:xml:ns:reginfo" version="23" state="full"> <registration aor="sip:user2@example.com" id="0x7f9b6bbf9cf8" state="active"> <contact id="0x7f9b6bbf3ea8" state="active" event="created" expires="300" callid="23439394725296-103541137625012(a)192.168.10.130" cseq="38" received="" path="&lt;sip:172.23.42.1;lr;received=sip:uac.public.ip:60015;r2=on&gt;,&lt;sip:kamailio.public.ip;lr;received=sip:uac.public.ip:60015;r2=on&gt;" user_agent="MyUA 1.2.3.4"> <uri>sip:user2@192.168.10.130:5060</uri> </contact> </registration> <registration aor="sip:user2@example.com" id="0x7f46836f63b8" state="active"> <contact id="0x7f46836f64e0" state="active" event="refreshed" expires="300" callid="15796302815379-26687127665413(a)192.168.10.130" cseq="38" received="" path="&lt;sip:172.23.42.1;lr;received=sip:uac.public.ip:5099;r2=on&gt;,&lt;sip:kamailio.public.ip;lr;received=sip:uac.public.ip:5099;r2=on&gt;" user_agent="MyUA 1.2.3.4"> <uri>sip:user2@192.168.10.130:5099</uri> </contact> </registration> </reginfo> ``` Example of a body with two registrations with different bodies: ``` <?xml version="1.0"?> <reginfo xmlns="urn:ietf:params:xml:ns:reginfo" version="21" state="full"> <registration aor="sip:user2@example.com" id="0x7f9b6bc55540" state="terminated"/> <registration aor="sip:user2@example.com" id="0x7f46836f63b8" state="active"> <contact id="0x7f46836f64e0" state="active" event="refreshed" expires="300" callid="15796302815379-26687127665413(a)192.168.10.130" cseq="36" received="" path="&lt;sip:172.23.42.1;lr;received=sip:uac.public.ip:5099;r2=on&gt;,&lt;sip:kamailio.public.ip;lr;received=sip:uac.public.ip:5099;r2=on&gt;" user_agent="MyUA 1.2.3.4"> <uri>sip:user2@192.168.10.130:5099</uri> </contact> </registration> </reginfo> ``` What is maybe missing: if the aor and id are the same on different presentities (is possible ?) we should not put it twice in the same body, because aor+id identify an unique registration. Most of the code has been adapted from `presence_dialoginfo` so I have preserved the original authors, too. Since is a bit complex PR (for me, at least) I'm begging for a in deep review ;) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3240 -- Commit Summary -- * [presence_reginfo] Add option for aggregating presentities -- File Changes -- M src/modules/presence_reginfo/Makefile (19) M src/modules/presence_reginfo/add_events.c (17) M src/modules/presence_reginfo/doc/presence_reginfo_admin.xml (21) A src/modules/presence_reginfo/notify_body.c (322) A src/modules/presence_reginfo/notify_body.h (43) M src/modules/presence_reginfo/presence_reginfo.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3240.patch https://github.com/kamailio/kamailio/pull/3240.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3240 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3240(a)github.com>

2 12

git:master:91cf0ce5: presence_reginfo: Add option for aggregating presentities
by Henning Westerholt 27 Sep '22

27 Sep '22

Module: kamailio Branch: master Commit: 91cf0ce599b41fd6482e3206217fc9b6e7821a66 URL: https://github.com/kamailio/kamailio/commit/91cf0ce599b41fd6482e3206217fc9b… Author: Matteo Brancaleoni <matteo.brancaleoni(a)voismart.it> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-27T16:11:32+02:00 presence_reginfo: Add option for aggregating presentities --- Added: src/modules/presence_reginfo/notify_body.c Added: src/modules/presence_reginfo/notify_body.h Modified: src/modules/presence_reginfo/Makefile Modified: src/modules/presence_reginfo/add_events.c Modified: src/modules/presence_reginfo/doc/presence_reginfo_admin.xml Modified: src/modules/presence_reginfo/presence_reginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/91cf0ce599b41fd6482e3206217fc9b… Patch: https://github.com/kamailio/kamailio/commit/91cf0ce599b41fd6482e3206217fc9b…

1 0

git: new commits in branch 5.6
by Daniel-Constantin Mierla 27 Sep '22

27 Sep '22

- URL: https://github.com/kamailio/kamailio/commit/47131b03e882576f80ae7cd80804e39… Author: Matthias Urlichs <matthias(a)urlichs.de> Date: 2022-09-27T11:51:22+02:00 modules/python3: return NULL on error. - PyErr_SetString is a void function. It doesn't return NULL. (cherry picked from commit b7911b63d7a27a4f29acc4bca3101f7857930084) - URL: https://github.com/kamailio/kamailio/commit/f8b08d32713063403819600559477c7… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2022-09-27T11:51:36+02:00 ratelimit: export functions to kemi (cherry picked from commit 678d93a742ba294bbe571c975814e01fdd795371) - URL: https://github.com/kamailio/kamailio/commit/f30bed90a892d3ec367d5244d089e75… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2022-09-27T11:51:42+02:00 siputils: export is_gruu() to kemi (cherry picked from commit a33b41ba804bc944b0e1c4ecf17fdc3ca68d4da0) - URL: https://github.com/kamailio/kamailio/commit/cd167423e063dd5e1b1b33aca07c9a2… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2022-09-27T11:51:48+02:00 dialplan: export dp_translate to kemi (cherry picked from commit 2f67daa9ce945cb57b8429101569203d4b891d1c) - URL: https://github.com/kamailio/kamailio/commit/ca84452027e8b66957b14420df94b9d… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-09-27T11:52:03+02:00 dialplan: Fix typos Fix typos in kemi exports (cherry picked from commit 2e8bfcef4f3f90214df0c1fe4d40d359265f060a) - URL: https://github.com/kamailio/kamailio/commit/2ee8fad13416c5c447effe9263b3cef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:52:14+02:00 dialplan: rename exports to kemi - function names have to be unique (cherry picked from commit f89bab70ef9cc842f37799c7c414f40d8ac581ab) - URL: https://github.com/kamailio/kamailio/commit/86a73afc57b6aedb08662175604d340… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:52:22+02:00 dialplan: removed unnecessary define (cherry picked from commit 220750f79737b13b6aad0c38d6dd8ea3e28d5ca5) - URL: https://github.com/kamailio/kamailio/commit/88e98ed7810d198703c006a8dec7508… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:52:53+02:00 dialplan: prefixed some global variables to avoid naming conflicts (cherry picked from commit e43083e32df03b629f0eab9d567bd41d6cb749ff) - URL: https://github.com/kamailio/kamailio/commit/3033b7681b4240fd64c9f1ff446b529… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:53:59+02:00 websocket: clean up ws structures without an active tcp connection - GH #3236 (cherry picked from commit abe60832de46796a1395a75a67753c1a12a1ec0a) - URL: https://github.com/kamailio/kamailio/commit/aa645fbebf35183e1c30662f9ed7f48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:54:09+02:00 websocket: debug message for rpc command when finding no tcp connection (cherry picked from commit 4434e83db1d4b668dabbe915fe36719ede165915) - URL: https://github.com/kamailio/kamailio/commit/7d3bf6dc12db22d26f119c3479de05b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:54:40+02:00 dmq_usrloc: safety checks for sock field - GH #3243 (cherry picked from commit 518296523db0c1735c3234d77d6af312f5c9babb) - URL: https://github.com/kamailio/kamailio/commit/e336519e133419d61967b1cb931fb04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:54:51+02:00 acc: more meaningful array index names for building cdr attributes (cherry picked from commit c5f71a45c7c55af0cf4a6aa482d8a57018af7900) - URL: https://github.com/kamailio/kamailio/commit/d223f608282f04844bc492c6ced9a3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:54:58+02:00 acc: clone dlg core attributes - GH #3243 (cherry picked from commit d616dc46b5373b1474bf855afde4c5687d2a2d09) - URL: https://github.com/kamailio/kamailio/commit/ad68b6737b478c1cbdd5ca838078e42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:55:08+02:00 acc_json: update to free cdr core attrs (cherry picked from commit f7b35f05f31bd7cc01aea4572c79ba48d84d8123) - URL: https://github.com/kamailio/kamailio/commit/b2ef87bcd84d4d4f7b0f6bf14d5e647… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-27T11:55:53+02:00 kex: add additional safety checks for printing, based on PR #3250 from bensly-shanmugam (cherry picked from commit e241f7b8a07b24fba6d6ecf2c344a39d2b2b5859) - URL: https://github.com/kamailio/kamailio/commit/feeacb2338c874b7f65353790112848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:56:05+02:00 acc_json: moved global vars declaration to .c file - made them static (cherry picked from commit 023af516f4ede3742f2e1836474978b596a4a3a8) - URL: https://github.com/kamailio/kamailio/commit/d3dd1ea6dfbba83148d005234a0dbe9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:56:14+02:00 acc_json: use the variable for the time key (cherry picked from commit 3e2b5d9ed6a0f18199359444c5ae33a1d6b94eb2) - URL: https://github.com/kamailio/kamailio/commit/408b15d756cfaba592c3540b1199229… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:56:21+02:00 acc_json: code formatting updates (cherry picked from commit bcb3970d7a89ab27b43f86aee5b93a473a8b790b) - URL: https://github.com/kamailio/kamailio/commit/ddd4bc1b1481c1ea7c8d5339efd9969… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:03:49+02:00 dialog: internal api functions to get dlg variable reference or value (cherry picked from commit a7cecdcbc3c1d53fce22a33a3768da2a1907d64e) - URL: https://github.com/kamailio/kamailio/commit/547f8f0dc27a1365ab822dd2f9f2d32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:04:14+02:00 dialog: init output dlg var value param eariler (cherry picked from commit ce3cd42631ac06a6a20892bd308901c6acd58f7a) - URL: https://github.com/kamailio/kamailio/commit/c1196024c8373d8112e7b088f202446… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:04:21+02:00 acc: use get_dlg_varval() to get values for dialog variables (cherry picked from commit fb7c497893f05587bda1c37e09d73a7ebb522715) - URL: https://github.com/kamailio/kamailio/commit/458ba44f3805fbca4656071b43e820c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:04:27+02:00 uac: use dlg api functions get_dlg_varval() and get_dlg_varref() (cherry picked from commit cd4e2259526bc4642259201ee96b00624f300437) - URL: https://github.com/kamailio/kamailio/commit/02ef4a197372615355875c1ef0a3494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:04:53+02:00 dialog: update check on dialog var key length (cherry picked from commit a7571233bc7dee0381e8ed7e44408f63fa45c156) - URL: https://github.com/kamailio/kamailio/commit/c4bebdca67335b0a23588039665bc9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:06+02:00 dialog: api function get pkg-allocated duplicate of dlg var value (cherry picked from commit 13512f48e03a2ef99847edf639582aaf3b4dfeb3) - URL: https://github.com/kamailio/kamailio/commit/ed86cd4030aa479545c23b31e16c376… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:13+02:00 dialog: updated comments for api functions to get dlg var value (cherry picked from commit 8548aaa8a798b939e041821848b2f05b963451d8) - URL: https://github.com/kamailio/kamailio/commit/bd87a18abefb818fd033be14db35642… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:19+02:00 dialog: api function to get the status if dlg var is set or not (cherry picked from commit c2c3211cd31405188891abd16ef770c26a8ddd44) - URL: https://github.com/kamailio/kamailio/commit/c77fe2578428acdf08144f9e9bc7e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:24+02:00 dialog: updated ki_dlg_var_is_null() to use safer api function (cherry picked from commit abdb02d3d2eec9fb45646f68996da3526c92ef58) - URL: https://github.com/kamailio/kamailio/commit/d5003c0905d112cb7f0d852301681c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:32+02:00 dialog: export new itermodule api functions - get duplicate var value and status (cherry picked from commit 320af48dffaa3c9b2c266ad9f68233e3cf48f9f0) - URL: https://github.com/kamailio/kamailio/commit/a138996a58a0e1f8202b61888019ab9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:40+02:00 uac: use get_dlg_varstatus() to check if var exists (cherry picked from commit 86a357c278c45a8d7b580e79ac074115871065fb) - URL: https://github.com/kamailio/kamailio/commit/bfc5c2aacb272e91da80096ef27fbe6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:11:11+02:00 pua_dialoginfo: use dlg api function get_dlg_varref() - manual update to the new dlg api function replacing the old get_dlg_var()

1 0

git:5.6:8404ba8c: pv: use the function for header name parsing that does not require the colon termination
by Daniel-Constantin Mierla 26 Sep '22

26 Sep '22

Module: kamailio Branch: 5.6 Commit: 8404ba8c869f5d1e44bdf0111d97f249f68d90b5 URL: https://github.com/kamailio/kamailio/commit/8404ba8c869f5d1e44bdf0111d97f24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T20:49:46+02:00 pv: use the function for header name parsing that does not require the colon termination (cherry picked from commit 1fbdc35c3d29da048cb06bfe0268c503c5015c3c) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/8404ba8c869f5d1e44bdf0111d97f24… Patch: https://github.com/kamailio/kamailio/commit/8404ba8c869f5d1e44bdf0111d97f24… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1410d80b43..2441b49324 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2139,7 +2139,7 @@ int pv_get_hdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return -1; } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_null(msg, param, res); @@ -2188,7 +2188,7 @@ int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return pv_get_sintval(msg, param, res, hcount); } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_sintval(msg, param, res, 0); @@ -2256,7 +2256,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return -1; } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_sintval(msg, param, res, 0); @@ -2500,7 +2500,7 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return pv_get_sintval(msg, param, res, 0); } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_sintval(msg, param, res, 0);

1 0

git:master:86a357c2: uac: use get_dlg_varstatus() to check if var exists
by Daniel-Constantin Mierla 26 Sep '22

26 Sep '22

Module: kamailio Branch: master Commit: 86a357c278c45a8d7b580e79ac074115871065fb URL: https://github.com/kamailio/kamailio/commit/86a357c278c45a8d7b580e79ac07411… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T15:58:15+02:00 uac: use get_dlg_varstatus() to check if var exists --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/86a357c278c45a8d7b580e79ac07411… Patch: https://github.com/kamailio/kamailio/commit/86a357c278c45a8d7b580e79ac07411… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 513623ba26..36827aeb3e 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -391,7 +391,7 @@ int replace_uri( struct sip_msg *msg, str *display, str *uri, if (dlg) { dlgvar_names = (uac_flag==FL_USE_UAC_FROM)?from_dlgvar:to_dlgvar; - if(dlg_api.get_dlg_varref(dlg, &dlgvar_names[0])) { + if(dlg_api.get_dlg_varstatus(dlg, &dlgvar_names[0])) { LM_INFO("Already called uac_replace for this dialog\n"); /* delete the from_new dlg var */

1 0

git:master:1fbdc35c: pv: use the function for header name parsing that does not require the colon termination
by Daniel-Constantin Mierla 26 Sep '22

26 Sep '22

Module: kamailio Branch: master Commit: 1fbdc35c3d29da048cb06bfe0268c503c5015c3c URL: https://github.com/kamailio/kamailio/commit/1fbdc35c3d29da048cb06bfe0268c50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T20:37:31+02:00 pv: use the function for header name parsing that does not require the colon termination --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/1fbdc35c3d29da048cb06bfe0268c50… Patch: https://github.com/kamailio/kamailio/commit/1fbdc35c3d29da048cb06bfe0268c50… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index ab5bdc4887..27966dbdcd 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2139,7 +2139,7 @@ int pv_get_hdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return -1; } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_null(msg, param, res); @@ -2188,7 +2188,7 @@ int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return pv_get_sintval(msg, param, res, hcount); } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_sintval(msg, param, res, 0); @@ -2256,7 +2256,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return -1; } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_null(msg, param, res); @@ -2500,7 +2500,7 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return pv_get_sintval(msg, param, res, 0); } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_sintval(msg, param, res, 0);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev