sr-dev October 2022

sr-dev@lists.kamailio.org

12 participants
200 discussions

git:5.6:54a9c15a: ChangeLog: content prepared for v5.6.2

by Daniel-Constantin Mierla

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 year, 9 months

git:5.6:d02c9e3a: ims_qos: use inter-module api release_dlg() instead of direct unref_dlg()

by Daniel-Constantin Mierla

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 year, 9 months

git:master:8d398d6a: ims_qos: use inter-module api release_dlg() instead of direct unref_dlg()

by Daniel-Constantin Mierla

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 year, 9 months

git:5.6:2556b6e2: ChangeLog: content updated for v5.6.2

by Daniel-Constantin Mierla

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 year, 9 months

git:5.6:fb212678: Makefile.defs: version set to 5.6.2

by Daniel-Constantin Mierla

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 year, 9 months

git:5.6:461e1a3a: pkg: deb specs updated for v5.6.2

by Daniel-Constantin Mierla

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 year, 9 months

git:5.6:0a0980da: pkg: version set to 5.6.2 for rpms and alpine specs

by Daniel-Constantin Mierla

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 year, 9 months

git:5.6:13229397: misctest: allow testing with larger message size than core accepts

by Daniel-Constantin Mierla

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 year, 9 months

git:5.6:151801a9: misc/fuzz/README.md: added link to OSS-Fuzz folder for Kamailio

by Daniel-Constantin Mierla

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 year, 9 months

git:5.6:c07b6c55: misc/fuzz: add checks on input size

by Daniel-Constantin Mierla

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 year, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2022