- sr-dev - kamailio.org

[kamailio/kamailio] kamailio.cfg updates for v6.0.x series (Issue #4034)
by Daniel-Constantin Mierla 16 Dec '24

16 Dec '24

Discuss and track updates to default kamailio.cfg for v6.0.x series. If you want to add something new to or remove from kamailio.cfg, post a comment in this thread. Commits to kamailio.cfg can also reference this tracker item. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4034 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4034(a)github.com>

2 5

git:master:4811a670: etc/kamailio.cfg: use dlgs to get dialog stats via rpc
by Daniel-Constantin Mierla 16 Dec '24

16 Dec '24

Module: kamailio Branch: master Commit: 4811a6706e7898049adea7b833caef61b587aff5 URL: https://github.com/kamailio/kamailio/commit/4811a6706e7898049adea7b833caef6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-16T09:10:49+01:00 etc/kamailio.cfg: use dlgs to get dialog stats via rpc --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/4811a6706e7898049adea7b833caef6… Patch: https://github.com/kamailio/kamailio/commit/4811a6706e7898049adea7b833caef6… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 606155f02da..ea0aa10ca7e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -307,6 +307,7 @@ loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "acc.so" loadmodule "counters.so" +loadmodule "dlgs.so" #!ifdef WITH_AUTH loadmodule "auth.so" @@ -388,6 +389,12 @@ modparam("rr", "enable_full_lr", 0) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) +# ----- dlgs params ----- +modparam("dlgs", "timer_interval", 10) +modparam("dlgs", "init_lifetime", 180) +modparam("dlgs", "active_lifetime", 7200) +modparam("dlgs", "finish_lifetime", 10) + # ----- registrar params ----- modparam("registrar", "method_filtering", 1) /* uncomment the next line to disable parallel forking via location */ @@ -544,6 +551,7 @@ request_route { # CANCEL processing if (is_method("CANCEL")) { + dlgs_update(); if (t_check_trans()) { route(RELAY); } @@ -596,6 +604,10 @@ request_route { exit; } + if(is_method("INVITE")) { + dlgs_init("$fu", "$tu", "srcip=$si"); + } + # dispatch destinations to PSTN route(PSTN); @@ -681,6 +693,7 @@ route[WITHINDLG] { # take the path determined by record-routing if (loose_route()) { route(DLGURI); + dlgs_update(); if (is_method("BYE")) { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails

1 0

git:master:76925238: etc/kamailio.cfg: example for udp_reciever_mode parameter
by Daniel-Constantin Mierla 16 Dec '24

16 Dec '24

Module: kamailio Branch: master Commit: 76925238ada0368864da0da31f9b15e59315e7c4 URL: https://github.com/kamailio/kamailio/commit/76925238ada0368864da0da31f9b15e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-16T08:59:05+01:00 etc/kamailio.cfg: example for udp_reciever_mode parameter - version set to 6.0 in header comment --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/76925238ada0368864da0da31f9b15e… Patch: https://github.com/kamailio/kamailio/commit/76925238ada0368864da0da31f9b15e… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index f77ff3e3aa2..606155f02da 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio SIP Server v5.8 - default configuration script +# Kamailio SIP Server v6.0 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio # @@ -191,6 +191,13 @@ children=8 /* number of SIP routing processes for all TCP/TLS sockets */ # tcp_children=8 +/* UDP receiving mode: + * - 0: multi-process (defaut) + * - 1: multi-threaded with async worker group 'udp' + * - 2: per socket configuration (see core cookbook) */ +# async_workers_group="name=udp;workers=8" +# udp_receiver_mode = 1 + /* uncomment the next line to disable the auto discovery of local aliases * based on reverse DNS on IPs (default on) */ # auto_aliases=no

1 0

git:master:0c769b3a: dialog: exported new functions to kemi
by Daniel-Constantin Mierla 16 Dec '24

16 Dec '24

Module: kamailio Branch: master Commit: 0c769b3a515fe3887988fee67128a5acbda339b8 URL: https://github.com/kamailio/kamailio/commit/0c769b3a515fe3887988fee67128a5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-16T08:10:50+01:00 dialog: exported new functions to kemi --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/0c769b3a515fe3887988fee67128a5a… Patch: https://github.com/kamailio/kamailio/commit/0c769b3a515fe3887988fee67128a5a… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 2e2ebe586b8..af892f080da 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2605,6 +2605,16 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("dialog"), str_init("dlg_set_state"), + SR_KEMIP_INT, ki_dlg_set_state, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dialog"), str_init("dlg_update_state"), + SR_KEMIP_INT, ki_dlg_update_state, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("dialog"), str_init("dlg_bye"), SR_KEMIP_INT, ki_dlg_bye, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:688db50c: dialog: use event callback for reply out
by Daniel-Constantin Mierla 16 Dec '24

16 Dec '24

Module: kamailio Branch: master Commit: 688db50c14f187ef5728089e4ae6c92dd091c7a8 URL: https://github.com/kamailio/kamailio/commit/688db50c14f187ef5728089e4ae6c92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-16T08:10:50+01:00 dialog: use event callback for reply out --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/688db50c14f187ef5728089e4ae6c92… Patch: https://github.com/kamailio/kamailio/commit/688db50c14f187ef5728089e4ae6c92… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 1db9468d95a..2e2ebe586b8 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -70,6 +70,7 @@ #include "../../modules/tm/tm_load.h" #include "../../core/rpc_lookup.h" #include "../../core/srapi.h" +#include "../../core/events.h" #include "../rr/api.h" #include "dlg_hash.h" #include "dlg_timer.h" @@ -228,6 +229,8 @@ static int fixup_dlg_req_with_headers(void **, int); static int fixup_dlg_req_with_content(void **, int); static int fixup_dlg_req_with_headers_and_content(void **, int); +static int dlg_sip_reply_out(sr_event_param_t *evp); + /* clang-format off */ static cmd_export_t cmds[]={ {"dlg_manage", (cmd_function)w_dlg_manage, 0,0, @@ -796,6 +799,9 @@ static int mod_init(void) ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); } + if(dlg_process_mode != 0) { + sr_event_register_cb(SREV_SIP_REPLY_OUT, dlg_sip_reply_out); + } return 0; } @@ -871,6 +877,17 @@ static void mod_destroy(void) } +/** + * + */ +static int dlg_sip_reply_out(sr_event_param_t *evp) +{ + LM_DBG("handling sip response\n"); + dlg_update_state(evp->rpl); + return 0; +} + + static int w_set_dlg_profile_helper( sip_msg_t *msg, struct dlg_profile_table *profile, str *value) {

1 0

git:master:0acd9c91: dialog: added dlg_update_state() function
by Daniel-Constantin Mierla 16 Dec '24

16 Dec '24

Module: kamailio Branch: master Commit: 0acd9c910692fcc2c7f9c9408cf916037b8fdb7b URL: https://github.com/kamailio/kamailio/commit/0acd9c910692fcc2c7f9c9408cf9160… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-16T08:10:50+01:00 dialog: added dlg_update_state() function --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_handlers.h --- Diff: https://github.com/kamailio/kamailio/commit/0acd9c910692fcc2c7f9c9408cf9160… Patch: https://github.com/kamailio/kamailio/commit/0acd9c910692fcc2c7f9c9408cf9160…

1 0

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,bullseye #2885
by kamailio＠sipwise.com 16 Dec '24

16 Dec '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 66.82 KiB...] I: new cache content 'libicu67_67.1-7_amd64.deb' added I: new cache content 'libltdl7_2.4.6-15_amd64.deb' added I: new cache content 'dwz_0.13+20210201-1_amd64.deb' added I: new cache content 'libmaxminddb0_1.5.2-1_amd64.deb' added I: new cache content 'ruby_1%3a2.7+2_amd64.deb' added I: new cache content 'sgml-data_2.0.11+nmu1_all.deb' added I: new cache content 'autopoint_0.21-4_all.deb' added I: new cache content 'libncurses6_6.2+20201114-2+deb11u2_amd64.deb' added I: new cache content 'libjson-c-dev_0.15-2+deb11u1_amd64.deb' added I: new cache content 'ruby-net-telnet_0.1.1-2_all.deb' added I: new cache content 'python3-dev_3.9.2-3_amd64.deb' added I: new cache content 'libprotobuf-dev_3.12.4-1+deb11u1_amd64.deb' added I: new cache content 'libpsl5_0.21.0-1.2_amd64.deb' added I: new cache content 'libphonenumber8_8.12.16-4_amd64.deb' added I: new cache content 'libjs-jquery_3.5.1+dfsg+~3.5.5-7_all.deb' added I: new cache content 'libsecsipid1_1.1.1~git20210601.d388d64-1+b2_amd64.deb' added I: new cache content 'libruby2.7_2.7.4-1+deb11u2_amd64.deb' added I: new cache content 'icu-devtools_67.1-7_amd64.deb' added I: new cache content 'libboost-system1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'libelf1_0.183-1_amd64.deb' added I: new cache content 'libpython3.9-stdlib_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libevent-core-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'libmnl0_1.0.4-3_amd64.deb' added I: new cache content 'libjs-underscore_1.9.1~dfsg-3_all.deb' added I: new cache content 'libreadline-dev_8.1-1_amd64.deb' added I: new cache content 'ruby-dev_1%3a2.7+2_amd64.deb' added I: new cache content 'libradcli4_1.2.11-1+b2_amd64.deb' added I: new cache content 'pkg-config_0.29.2-1_amd64.deb' added I: new cache content 'libpython2.7_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'libsigsegv2_2.13-1_amd64.deb' added I: new cache content 'm4_1.4.18-5_amd64.deb' added I: new cache content 'libmongoc-dev_1.17.6-1_amd64.deb' added I: new cache content 'librabbitmq-dev_0.10.0-1_amd64.deb' added I: new cache content 'libsqlite3-dev_3.34.1-3+deb11u1_amd64.deb' added I: new cache content 'python3-lib2to3_3.9.2-1_all.deb' added I: new cache content 'libreadline8_8.1-1_amd64.deb' added I: new cache content 'python2_2.7.18-3_amd64.deb' added I: new cache content 'default-libmysqlclient-dev_1.0.7_amd64.deb' added I: new cache content 'librdkafka-dev_1.6.0-1_amd64.deb' added I: new cache content 'libuv1-dev_1.40.0-2+deb11u1_amd64.deb' added I: new cache content 'libprotobuf23_3.12.4-1+deb11u1_amd64.deb' added I: new cache content 'libjs-sphinxdoc_3.4.3-2_all.deb' added I: new cache content 'libboost-atomic1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libpython3-dev_3.9.2-3_amd64.deb' added I: new cache content 'docbook-xml_4.5-9_all.deb' added I: new cache content 'ruby-power-assert_1.1.7-2_all.deb' added I: new cache content 'libjansson4_2.13.1-1.1_amd64.deb' added I: new cache content 'libudev-dev_247.3-7+deb11u6_amd64.deb' added I: new cache content 'libpython3.9-minimal_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libedit2_3.1-20191231-2+b1_amd64.deb' added I: new cache content 'libpci3_1%3a3.7.0-5_amd64.deb' added I: new cache content 'automake_1%3a1.16.3-2_all.deb' added I: new cache content 'flex_2.6.4-8_amd64.deb' added I: new cache content 'libdebhelper-perl_13.3.4_all.deb' added I: new cache content 'libldap2-dev_2.4.57+dfsg-3+deb11u1_amd64.deb' added I: new cache content 'libpq5_13.18-0+deb11u1_amd64.deb' added I: new cache content 'libsub-override-perl_0.09-2_all.deb' added I: new cache content 'librabbitmq4_0.10.0-1_amd64.deb' added I: new cache content 'libmemcached11_1.0.18-4.2_amd64.deb' added I: new cache content 'libsnappy-dev_1.1.8-1_amd64.deb' added I: new cache content 'libgnutls28-dev_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'python3.9-minimal_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libxml2-dev_2.9.10+dfsg-6.7+deb11u5_amd64.deb' added I: new cache content 'libpcre2-posix2_10.36-2+deb11u1_amd64.deb' added I: new cache content 'python-is-python2_2.7.18-9_all.deb' added I: new cache content 'libmariadb-dev-compat_1%3a10.5.26-0+deb11u2_amd64.deb' added I: new cache content 'odbcinst1debian2_2.3.6-0.1+b1_amd64.deb' added I: new cache content 'libbson-dev_1.17.6-1_amd64.deb' added I: new cache content 'libjansson-dev_2.13.1-1.1_amd64.deb' added I: new cache content 'libgmpxx4ldbl_2%3a6.2.1+dfsg-1+deb11u1_amd64.deb' added I: new cache content 'libsnmp-dev_5.9+dfsg-4+deb11u1_amd64.deb' added I: new cache content 'libmongocrypt0_1.1.0-1_amd64.deb' added I: new cache content 'libboost-serialization1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'libzstd-dev_1.4.8+dfsg-2.1_amd64.deb' added I: new cache content 'libsnmp40_5.9+dfsg-4+deb11u1_amd64.deb' added I: new cache content 'libsctp-dev_1.0.18+dfsg-1_amd64.deb' added I: new cache content 'libhashkit-dev_1.0.18-4.2_amd64.deb' added I: new cache content 'libcap-dev_1%3a2.44-1_amd64.deb' added I: new cache content 'libboost-date-time1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'xml-core_0.18+nmu1_all.deb' added I: new cache content 'libmpdec3_2.5.1-1_amd64.deb' added I: new cache content 'libsasl2-2_2.1.27+dfsg-2.1+deb11u1_amd64.deb' added I: new cache content 'libboost-system1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libperl-dev_5.32.1-4+deb11u4_amd64.deb' added I: new cache content 'ruby-rubygems_3.2.5-2_all.deb' added I: new cache content 'libevent-extra-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'ruby-minitest_5.13.0-1_all.deb' added I: new cache content 'libwrap0-dev_7.6.q-31_amd64.deb' added I: new cache content 'libexpat1_2.2.10-2+deb11u6_amd64.deb' added I: new cache content 'python2-dev_2.7.18-3_amd64.deb' added I: new cache content 'libboost-date-time1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'librdkafka++1_1.6.0-1_amd64.deb' added I: new cache content 'bsdextrautils_2.36.1-8+deb11u2_amd64.deb' added I: new cache content 'libmongocrypt-dev_1.1.0-1_amd64.deb' added I: new cache content 'python3-distutils_3.9.2-1_all.deb' added I: new cache content 'mariadb-common_1%3a10.5.26-0+deb11u2_all.deb' added I: new cache content 'libcurl4_7.74.0-1.3+deb11u14_amd64.deb' added I: new cache content 'libyaml-0-2_0.2.2-1_amd64.deb' added I: new cache content 'libgnutls-openssl27_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'libpython2.7-dev_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'rake_13.0.3-1_all.deb' added I: new cache content 'libunbound8_1.13.1-1+deb11u4_amd64.deb' added I: new cache content 'libboost-thread-dev_1.74.0.3_amd64.deb' added I: new cache content 'erlang-base_1%3a23.2.6+dfsg-1+deb11u1_amd64.deb' added I: new cache content 'libprocps8_2%3a3.3.17-5_amd64.deb' added I: new cache content 'libtool_2.4.6-15_all.deb' added I: new cache content 'python2.7_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'debhelper_13.3.4_all.deb' added I: new cache content 'libarchive-zip-perl_1.68-1_all.deb' added I: new cache content 'libnetsnmptrapd40_5.9+dfsg-4+deb11u1_amd64.deb' added I: new cache content 'libcap2_1%3a2.44-1_amd64.deb' added I: new cache content 'libwebsockets-dev_4.0.20-2_amd64.deb' added I: new cache content 'libunistring-dev_0.9.10-4_amd64.deb' added I: new cache content 'bison_2%3a3.7.5+dfsg-1_amd64.deb' added I: new cache content 'libevent-dev_2.1.12-stable-1_amd64.deb' added I: new cache content 'libpcre2-32-0_10.36-2+deb11u1_amd64.deb' added I: new cache content 'libmagic1_1%3a5.39-3+deb11u1_amd64.deb' added I: new cache content 'libwebsockets16_4.0.20-2_amd64.deb' added I: new cache content 'libphonenumber-dev_8.12.16-4_amd64.deb' added I: new cache content 'libdb5.3-dev_5.3.28+dfsg1-0.8_amd64.deb' added I: new cache content 'libprotobuf-lite23_3.12.4-1+deb11u1_amd64.deb' added I: new cache content 'libevent-openssl-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'libsasl2-dev_2.1.27+dfsg-2.1+deb11u1_amd64.deb' added I: new cache content 'libdb-dev_5.3.1+nmu1_amd64.deb' added I: new cache content 'python3.9_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'liblua5.1-0_5.1.5-8.1+b3_amd64.deb' added I: new cache content 'libhiredis-dev_0.14.1-1_amd64.deb' added I: new cache content 'libsctp1_1.0.18+dfsg-1_amd64.deb' added I: new cache content 'libmaxminddb-dev_1.5.2-1_amd64.deb' added I: new cache content 'python2-minimal_2.7.18-3_amd64.deb' added I: new cache content 'libbrotli1_1.0.9-2+b2_amd64.deb' added I: new cache content 'libnghttp2-14_1.43.0-1+deb11u2_amd64.deb' added I: new cache content 'libssl-dev_1.1.1w-0+deb11u2_amd64.deb' added I: new cache content 'libhashkit2_1.0.18-4.2_amd64.deb' added I: new cache content 'libsensors-dev_1%3a3.6.0-7_amd64.deb' added I: new cache content 'libidn2-dev_2.3.0-5_amd64.deb' added I: new cache content 'man-db_2.9.4-2_amd64.deb' added I: new cache content 'media-types_4.0.0_all.deb' added I: new cache content 'libboost-chrono1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'po-debconf_1.0.21+nmu1_all.deb' added I: new cache content 'mailcap_3.69_all.deb' added I: new cache content 'libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'libboost-thread1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'dh-autoreconf_20_all.deb' added I: new cache content 'openssl_1.1.1w-0+deb11u2_amd64.deb' added I: new cache content 'libboost1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'libboost-serialization1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libmosquitto-dev_2.0.11-1+deb11u1_amd64.deb' added I: new cache content 'groff-base_1.22.4-6_amd64.deb' added I: new cache content 'libsecsipid-dev_1.1.1~git20210601.d388d64-1+b2_amd64.deb' added I: new cache content 'libexpat1-dev_2.2.10-2+deb11u6_amd64.deb' added I: new cache content 'uuid-dev_2.36.1-8+deb11u2_amd64.deb' added I: new cache content 'unixodbc-dev_2.3.6-0.1+b1_amd64.deb' added I: new cache content 'libuchardet0_0.0.7-1_amd64.deb' added I: new cache content 'libsasl2-modules-db_2.1.27+dfsg-2.1+deb11u1_amd64.deb' added I: new cache content 'ca-certificates_20210119_all.deb' added I: new cache content 'libuv1_1.40.0-2+deb11u1_amd64.deb' added I: new cache content 'python3-minimal_3.9.2-3_amd64.deb' added I: new cache content 'python3.9-dev_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'pci.ids_0.0~2021.02.08-1_all.deb' added I: new cache content 'libgnutlsxx28_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'libpcre2-dev_10.36-2+deb11u1_amd64.deb' added I: new cache content 'libgnutls-dane0_3.7.1-5+deb11u6_amd64.deb' added I: new cache content 'xsltproc_1.1.34-4+deb11u1_amd64.deb' added I: new cache content 'libev-dev_1%3a4.33-1_amd64.deb' added I: new cache content 'libjson-c5_0.15-2+deb11u1_amd64.deb' added I: new cache content 'libmariadb3_1%3a10.5.26-0+deb11u2_amd64.deb' added I: new cache content 'libsensors-config_1%3a3.6.0-7_all.deb' added I: new cache content 'gettext-base_0.21-4_amd64.deb' added I: new cache content 'libncurses-dev_6.2+20201114-2+deb11u2_amd64.deb' added I: new cache content 'ruby-xmlrpc_0.3.0-2_all.deb' added I: new cache content 'autoconf_2.69-14_all.deb' added I: new cache content 'libboost-chrono1.74.0_1.74.0-9_amd64.deb' added I: new cache content 'libbson-1.0-0_1.17.6-1_amd64.deb' added I: new cache content 'mysql-common_5.8+1.0.7_all.deb' added I: new cache content 'libgeocoding8_8.12.16-4_amd64.deb' added I: new cache content 'libevent-2.1-7_2.1.12-stable-1_amd64.deb' added I: new cache content 'python2.7-dev_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'mime-support_3.66_all.deb' added I: new cache content 'libboost-thread1.74-dev_1.74.0-9_amd64.deb' added I: new cache content 'libpython2.7-stdlib_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'python3_3.9.2-3_amd64.deb' added I: new cache content 'libpython2-dev_2.7.18-3_amd64.deb' added I: new cache content 'libev4_1%3a4.33-1_amd64.deb' added I: new cache content 'odbcinst_2.3.6-0.1+b1_amd64.deb' added I: new cache content 'libmicrohttpd12_0.9.72-2+deb11u1_amd64.deb' added I: new cache content 'libtasn1-6-dev_4.16.0-2+deb11u1_amd64.deb' added I: new cache content 'libmnl-dev_1.0.4-3_amd64.deb' added I: new cache content 'libpython3.9_3.9.2-1+deb11u2_amd64.deb' added I: new cache content 'libglib2.0-0_2.66.8-1+deb11u5_amd64.deb' added I: new cache content 'file_1%3a5.39-3+deb11u1_amd64.deb' added I: new cache content 'libcurl4-openssl-dev_7.74.0-1.3+deb11u14_amd64.deb' added I: new cache content 'libmd0_1.0.3-3_amd64.deb' added I: new cache content 'erlang-dev_1%3a23.2.6+dfsg-1+deb11u1_amd64.deb' added I: new cache content 'libmemcached-dev_1.0.18-4.2_amd64.deb' added I: new cache content 'dh-strip-nondeterminism_1.12.0-1_all.deb' added I: new cache content 'libsnmp-base_5.9+dfsg-4+deb11u1_all.deb' added I: new cache content 'libmicrohttpd-dev_0.9.72-2+deb11u1_amd64.deb' added I: new cache content 'libfile-stripnondeterminism-perl_1.12.0-1_all.deb' added I: new cache content 'rubygems-integration_1.18_all.deb' added I: new cache content 'libhiredis0.14_0.14.1-1_amd64.deb' added I: new cache content 'libsnappy1v5_1.1.8-1_amd64.deb' added I: new cache content 'libpipeline1_1.5.3-1_amd64.deb' added I: new cache content 'libradcli-dev_1.2.11-1+b2_amd64.deb' added I: new cache content 'libicu-dev_67.1-7_amd64.deb' added I: new cache content 'libpci-dev_1%3a3.7.0-5_amd64.deb' added I: new cache content 'libxml2_2.9.10+dfsg-6.7+deb11u5_amd64.deb' added I: new cache content 'python2.7-minimal_2.7.18-8+deb11u1_amd64.deb' added I: new cache content 'librtmp1_2.4+20151223.gitfa8646d.1-2+b2_amd64.deb' added I: unmounting /tmp/apt-jdg_zAbmLl filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.3090 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/bullseye-amd64.building.2741 + '[' -r /run/lock/bullseye-amd64.update.2741 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.trnXYm9PmH ']' + rm -rf /tmp/tmp.trnXYm9PmH + '[' -n /tmp/apt-jdg_zAbmLl ']' + sudo rm -rf /tmp/apt-jdg_zAbmLl + '[' -n 179 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=12 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Sun Dec 15 01:01:23 UTC 2024 [running 12 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Sun Dec 15 01:01:23 UTC 2024 [running 12 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

git:master:27055d06: github: fix query fetching only success runs for nightly jobs [skip ci]
by Victor Seva 15 Dec '24

15 Dec '24

Module: kamailio Branch: master Commit: 27055d06b70c495313df34630f2ec612b2f73836 URL: https://github.com/kamailio/kamailio/commit/27055d06b70c495313df34630f2ec61… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-15T16:24:32+01:00 github: fix query fetching only success runs for nightly jobs [skip ci] --- Modified: .github/workflows/alpine.yml Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/27055d06b70c495313df34630f2ec61… Patch: https://github.com/kamailio/kamailio/commit/27055d06b70c495313df34630f2ec61… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 9ea7136e353..caaabfa3987 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -25,7 +25,7 @@ jobs: - uses: octokit/request-action(a)v2.x id: check_last_run with: - route: GET /repos/{owner}/{repo}/actions/workflows/alpine.yml/runs?per_page=1&status=completed + route: GET /repos/{owner}/{repo}/actions/workflows/alpine.yml/runs?per_page=1&status=success owner: ${{ github.repository_owner }} repo: kamailio env: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1c1938962eb..9c2d7f84024 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -16,7 +16,7 @@ jobs: - uses: octokit/request-action(a)v2.x id: check_last_run with: - route: GET /repos/{owner}/{repo}/actions/workflows/codeql.yml/runs?per_page=1&status=completed + route: GET /repos/{owner}/{repo}/actions/workflows/codeql.yml/runs?per_page=1&status=success owner: ${{ github.repository_owner }} repo: kamailio env:

1 0

[kamailio/kamailio] presence_dfks: (PR #4065)
by Victor Seva 14 Dec '24

14 Dec '24

#### 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) - [ ] 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 - [ ] Tested changes locally #### Description kamailio module for handling as-feature-event presence messages This module provide support for 'Device FeatureKey Synchronization', as described in http://community.polycom.com/polycom/attachments/polycom/VoIP/2233/1/Device… This 'protocol' was developed at Broadsoft, and is used in Linksys/Cisco and Polycom phones and probably some other too. It allows to set up features like dnd (No Not Disturb) and call forwarding using phone interface and have that status updated on aplication server/ proxy or otherway, set those features on aplication server using some gui, and have this data provisioned on phone. For Shared Line Appreance application this let You share status on all phones. [original source](https://github.com/majastanislawska/sip-router-presence_dfks-module… [sipwise](https://github.com/sipwise/kamailio/blob/master/debian/patches/sip… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4065 -- Commit Summary -- * presence_dfks: [WIP] * pua: support as-feature-event * Makefile.groups: add presence_dfks to mod_list_presence * cmake: add presence_dfks to MOD_LIST_PRESENCE -- File Changes -- M cmake/groups.cmake (1) M src/Makefile.groups (2) A src/modules/presence_dfks/CMakeLists.txt (6) A src/modules/presence_dfks/Makefile (27) A src/modules/presence_dfks/README.md (32) A src/modules/presence_dfks/add_events.c (316) A src/modules/presence_dfks/add_events.h (7) A src/modules/presence_dfks/presence_dfks.c (131) A src/modules/presence_dfks/presence_dfks.h (18) M src/modules/pua/add_events.c (13) M src/modules/pua/add_events.h (2) M src/modules/pua/hash.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4065.patch https://github.com/kamailio/kamailio/pull/4065.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4065 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4065(a)github.com>

2 6

git:master:95819e75: cmake: add presence_dfks to MOD_LIST_PRESENCE
by Victor Seva 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: 95819e750b844aef1723e38e8048de680fd4a69b URL: https://github.com/kamailio/kamailio/commit/95819e750b844aef1723e38e8048de6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-14T13:44:56+01:00 cmake: add presence_dfks to MOD_LIST_PRESENCE --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/95819e750b844aef1723e38e8048de6… Patch: https://github.com/kamailio/kamailio/commit/95819e750b844aef1723e38e8048de6… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index 14c99163726..d955581f66a 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -224,6 +224,7 @@ set(MOD_LIST_AUTHEPH auth_ephemeral) set(MOD_LIST_PRESENCE presence presence_conference + presence_dfks presence_dialoginfo presence_mwi presence_profile

1 0

git:master:f0802546: Makefile.groups: add presence_dfks to mod_list_presence
by Victor Seva 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: f0802546f05170607f468c21dea610fb1be4a8f1 URL: https://github.com/kamailio/kamailio/commit/f0802546f05170607f468c21dea610f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-14T13:44:56+01:00 Makefile.groups: add presence_dfks to mod_list_presence --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/f0802546f05170607f468c21dea610f… Patch: https://github.com/kamailio/kamailio/commit/f0802546f05170607f468c21dea610f… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index e5c94a7aa33..b6fed63d23e 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -112,7 +112,7 @@ mod_list_autheph=auth_ephemeral # - modules related to SIMPLE presence extensions mod_list_presence=presence presence_conference presence_dialoginfo \ presence_mwi presence_profile presence_reginfo \ - presence_xml \ + presence_xml presence_dfks \ pua pua_bla pua_dialoginfo pua_reginfo \ pua_rpc pua_usrloc pua_xmpp \ rls xcap_client xcap_server

1 0

git:master:1422dde3: pua: support as-feature-event
by Victor Seva 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: 1422dde30224398f47b3acdec1741b183386a3b8 URL: https://github.com/kamailio/kamailio/commit/1422dde30224398f47b3acdec1741b1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-14T13:44:56+01:00 pua: support as-feature-event --- Modified: src/modules/pua/add_events.c Modified: src/modules/pua/add_events.h Modified: src/modules/pua/hash.h --- Diff: https://github.com/kamailio/kamailio/commit/1422dde30224398f47b3acdec1741b1… Patch: https://github.com/kamailio/kamailio/commit/1422dde30224398f47b3acdec1741b1… --- diff --git a/src/modules/pua/add_events.c b/src/modules/pua/add_events.c index 97f4035b07d..5b94b44e707 100644 --- a/src/modules/pua/add_events.c +++ b/src/modules/pua/add_events.c @@ -109,6 +109,13 @@ int pua_add_events(void) return -1; } + if(add_pua_event(DFKS_EVENT, "as-feature-event", + "application/x-as-feature-event+xml", dfks_process_body) + < 0) { + LM_ERR("while adding event as-feature-event\n"); + return -1; + } + return 0; } @@ -382,3 +389,9 @@ int dlg_process_body(publ_info_t *publ, str **fin_body, int ver, str **tuple) *fin_body = publ->body; return 0; } + +int dfks_process_body(publ_info_t *publ, str **fin_body, int ver, str **tuple) +{ + *fin_body = publ->body; + return 0; +} diff --git a/src/modules/pua/add_events.h b/src/modules/pua/add_events.h index e766b950f1f..12733fe2c53 100644 --- a/src/modules/pua/add_events.h +++ b/src/modules/pua/add_events.h @@ -44,5 +44,7 @@ int dlg_process_body( struct publ_info *publ, str **fin_body, int ver, str **tuple); int reginfo_process_body( struct publ_info *publ, str **fin_body, int ver, str **tuple); +int dfks_process_body( + struct publ_info *publ, str **fin_body, int ver, str **tuple); #endif diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h index 370695c0664..36f0335cc79 100644 --- a/src/modules/pua/hash.h +++ b/src/modules/pua/hash.h @@ -43,6 +43,7 @@ #define DIALOG_EVENT 1 << 5 #define REGINFO_EVENT 1 << 6 #define XCAPDIFF_EVENT 1 << 7 +#define DFKS_EVENT 1 << 8 #define UL_PUBLISH 1 << 0 #define BLA_PUBLISH 1 << 1 @@ -60,6 +61,8 @@ #define REGINFO_SUBSCRIBE 1 << 13 #define XCAPDIFF_PUBLISH 1 << 14 #define XCAPDIFF_SUBSCRIBE 1 << 15 +#define DFKS_PUBLISH 1 << 16 +#define DFKS_SUBSCRIBE 1 << 17 #define NO_UPDATEDB_FLAG 1 << 0 #define UPDATEDB_FLAG 1 << 1 @@ -175,6 +178,9 @@ static inline int get_event_flag(str *event) case 15: if(strncmp(event->s, "message-summary", 15) == 0) return MSGSUM_EVENT; + case 16: + if(strncmp(event->s, "as-feature-event", 16) == 0) + return DFKS_EVENT; } LM_ERR("Unknown event string\n");

1 0

git:master:c7379e14: presence_dfks: documentation
by Victor Seva 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: c7379e146ebd35e218a861f4899c6596805869d8 URL: https://github.com/kamailio/kamailio/commit/c7379e146ebd35e218a861f4899c659… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-14T13:44:56+01:00 presence_dfks: documentation --- Added: src/modules/presence_dfks/doc/Makefile Added: src/modules/presence_dfks/doc/presence_dfks.xml Added: src/modules/presence_dfks/doc/presence_dfks_admin.xml Removed: src/modules/presence_dfks/README.md --- Diff: https://github.com/kamailio/kamailio/commit/c7379e146ebd35e218a861f4899c659… Patch: https://github.com/kamailio/kamailio/commit/c7379e146ebd35e218a861f4899c659…

1 0

git:master:2587e75b: presence_dfks: handling as-feature-event presence messages
by Victor Seva 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: 2587e75bebcb40af1780dbb725daa31bd472b757 URL: https://github.com/kamailio/kamailio/commit/2587e75bebcb40af1780dbb725daa31… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-14T13:44:56+01:00 presence_dfks: handling as-feature-event presence messages --- Added: src/modules/presence_dfks/CMakeLists.txt Added: src/modules/presence_dfks/Makefile Added: src/modules/presence_dfks/README.md Added: src/modules/presence_dfks/add_events.c Added: src/modules/presence_dfks/add_events.h Added: src/modules/presence_dfks/presence_dfks.c Added: src/modules/presence_dfks/presence_dfks.h --- Diff: https://github.com/kamailio/kamailio/commit/2587e75bebcb40af1780dbb725daa31… Patch: https://github.com/kamailio/kamailio/commit/2587e75bebcb40af1780dbb725daa31…

1 0

[kamailio/kamailio] ims_diameter_server: fix retrieval ``$diameter_response`` value (PR #4069)
by Victor Seva 14 Dec '24

14 Dec '24

#### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… #### Description ``current_msg_id_repl is only`` changed if ``$diameter_reponse`` is changed by via ``pv_set_response()``. The event_route is executed with a ``fake_msg`` so it will not match if is setted outside anyways. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4069 -- Commit Summary -- * ims_diameter_server: fix retrieval ``$diameter_response`` value -- File Changes -- M src/modules/ims_diameter_server/avp_helper.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4069.patch https://github.com/kamailio/kamailio/pull/4069.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4069 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4069(a)github.com>

3 4

git:master:7c365f76: ims_diameter_server: fix retrieval ``$diameter_response`` value
by Victor Seva 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: 7c365f76560b18aca49096121ea55791ce8f3623 URL: https://github.com/kamailio/kamailio/commit/7c365f76560b18aca49096121ea5579… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-14T13:44:13+01:00 ims_diameter_server: fix retrieval ``$diameter_response`` value ``current_msg_id_repl is only`` changed if ``$diameter_reponse`` is changed by via ``pv_set_response()``. The event_route is executed with a ``fake_msg`` so it will not match if is setted outside anyways. --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/7c365f76560b18aca49096121ea5579… Patch: https://github.com/kamailio/kamailio/commit/7c365f76560b18aca49096121ea5579… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 065a58c364d..7fa2ac66ce2 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -48,7 +48,6 @@ // ID of current message static unsigned int current_msg_id = 0; -static unsigned int current_msg_id_repl = 0; cJSON *avp2json(AAA_AVP *avp_t) { @@ -488,7 +487,7 @@ int pv_get_application(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) int pv_get_response(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - if((msg->id != current_msg_id_repl) || (responsejson.len < 0)) { + if(responsejson.len < 0) { return pv_get_null(msg, param, res); } return pv_get_strval(msg, param, res, &responsejson); @@ -504,7 +503,6 @@ int pv_set_response( val->rs.s); responsejson.s = val->rs.s; responsejson.len = val->rs.len; - current_msg_id_repl = msg->id; return 0; } return 0;

1 0

git:master:bb221de0: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: bb221de0bb49f978d238a8aa97004bda2a7fa456 URL: https://github.com/kamailio/kamailio/commit/bb221de0bb49f978d238a8aa97004bd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-12-14T12:01:10+01:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/bb221de0bb49f978d238a8aa97004bd… Patch: https://github.com/kamailio/kamailio/commit/bb221de0bb49f978d238a8aa97004bd… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 70af19ae47e..9c82ff026e1 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -212,6 +212,7 @@ Chapter 1. Admin Guide Type of storage, valid types are: * db - Database Backend * redis - Redis Backend + * htable - htable module Backend Default value is ��db��.

1 0

[kamailio/kamailio] ims_isc: bugfix: firstflag incorrect in isc_match_filter (PR #4018)
by Kilian Wöber 14 Dec '24

14 Dec '24

#### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] 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  The function isc_match_filter uses a local variable "firstflag", to handle the case of an HSS based terminating unregistered service. In that case, the S-CSCF exchanges SAR/SAA with the HSS in order to learn the subscription data and the iFC for an unregistered user or for a PSI. The firstflag is necessary to make a distiction between the FAILURE ROUTE that is used for this case and the FAILURE ROUTE that is used for transaction failure towards the AS. The error is, the firstflag is set for the latter case, too, which leads to a wrong handling of communication errors towards the AS. This PR introduces a new function that looks for the old ISCMARK in the lumps of the stored message and hence can make a distinction between the SAR/SAA case and the AS failure case. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4018 -- Commit Summary -- * ims_isc: bugfix: firstflag incorrect in isc_match_filter -- File Changes -- M src/modules/ims_isc/ims_isc_mod.c (24) M src/modules/ims_isc/mark.c (51) M src/modules/ims_isc/mark.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4018.patch https://github.com/kamailio/kamailio/pull/4018.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4018 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4018(a)github.com>

4 16

git:master:2bd70ed7: ims_isc: bugfix: firstflag incorrect in isc_match_filter
by Daniel-Constantin Mierla 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: 2bd70ed7ab8ec4cf59e12be3d561c735d84f2dea URL: https://github.com/kamailio/kamailio/commit/2bd70ed7ab8ec4cf59e12be3d561c73… Author: Kilian W��ber <Kilian.Woeber(a)kontron.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-14T11:53:49+01:00 ims_isc: bugfix: firstflag incorrect in isc_match_filter --- Modified: src/modules/ims_isc/ims_isc_mod.c Modified: src/modules/ims_isc/ims_isc_mod.h Modified: src/modules/ims_isc/isc.c Modified: src/modules/ims_isc/isc.h Modified: src/modules/ims_isc/mark.c Modified: src/modules/ims_isc/mark.h --- Diff: https://github.com/kamailio/kamailio/commit/2bd70ed7ab8ec4cf59e12be3d561c73… Patch: https://github.com/kamailio/kamailio/commit/2bd70ed7ab8ec4cf59e12be3d561c73…

1 0

[kamailio/kamailio] htable: export table create api functions (PR #4010)
by Stefan Mititelu 14 Dec '24

14 Dec '24

#### 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  Looks like htable module already exports API functions, but currently no other module uses them. Added 2 more API functions for table creation (so other modules can be able to create their own hash tables if they want to) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4010 -- Commit Summary -- * htable: export table create api functions -- File Changes -- M src/modules/htable/api.c (10) M src/modules/htable/api.h (4) M src/modules/htable/ht_api.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4010.patch https://github.com/kamailio/kamailio/pull/4010.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4010 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4010(a)github.com>

2 19

git:master:90d1485c: topos_htable: Small update to doc
by Daniel-Constantin Mierla 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: 90d1485c62bdfe509ff14b1b05baf0752b1a946e URL: https://github.com/kamailio/kamailio/commit/90d1485c62bdfe509ff14b1b05baf07… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-14T11:52:02+01:00 topos_htable: Small update to doc --- Modified: src/modules/topos_htable/doc/topos_htable.xml --- Diff: https://github.com/kamailio/kamailio/commit/90d1485c62bdfe509ff14b1b05baf07… Patch: https://github.com/kamailio/kamailio/commit/90d1485c62bdfe509ff14b1b05baf07… --- diff --git a/src/modules/topos_htable/doc/topos_htable.xml b/src/modules/topos_htable/doc/topos_htable.xml index 66344832065..d42066155a9 100644 --- a/src/modules/topos_htable/doc/topos_htable.xml +++ b/src/modules/topos_htable/doc/topos_htable.xml @@ -10,36 +10,22 @@ <book xmlns:xi="http://www.w3.org/2001/XInclude"> <bookinfo> - <title>TOPOS_REDIS Module</title> + <title>TOPOS_HTABLE Module</title> <productname class="trade">kamailio.org</productname> <authorgroup> - <author> - <firstname>Daniel-Constantin</firstname> - <surname>Mierla</surname> - <email>miconda(a)gmail.com</email> - </author> <editor> - <firstname>Daniel-Constantin</firstname> - <surname>Mierla</surname> - <email>miconda(a)gmail.com</email> - </editor> - <editor> - <firstname>Frederic</firstname> - <surname>Gaisnon</surname> - <email>frederic.gaisnon(a)gmail.com</email> + <firstname>Stefan</firstname> + <surname>Mititelu</surname> + <email>stefan.mititelu(a)net2phone.com</email> </editor> </authorgroup> <copyright> - <year>2017</year> + <year>2024</year> <holder>kamailio.org</holder> </copyright> <copyright> - <year>2017</year> - <holder>flowroute.com</holder> - </copyright> - <copyright> - <year>2021</year> - <holder>MomentTech</holder> + <year>2024</year> + <holder>net2phone.com</holder> </copyright> </bookinfo> <toc></toc>

1 0

git:master:df48b373: topos_htable: Initial commit
by Daniel-Constantin Mierla 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: df48b373c39d631f49cb3632f7547f65b58eda3e URL: https://github.com/kamailio/kamailio/commit/df48b373c39d631f49cb3632f7547f6… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-14T11:52:02+01:00 topos_htable: Initial commit --- Added: src/modules/topos_htable/Makefile Added: src/modules/topos_htable/doc/Makefile Added: src/modules/topos_htable/doc/topos_htable.xml Added: src/modules/topos_htable/doc/topos_htable_admin.xml Added: src/modules/topos_htable/topos_htable_mod.c Added: src/modules/topos_htable/topos_htable_storage.c Added: src/modules/topos_htable/topos_htable_storage.h Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/df48b373c39d631f49cb3632f7547f6… Patch: https://github.com/kamailio/kamailio/commit/df48b373c39d631f49cb3632f7547f6…

1 0

git:master:bd70a78c: topos: Updates for topos_htable module
by Daniel-Constantin Mierla 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: bd70a78ce22ab419a52e8733bc7ee27765d14cac URL: https://github.com/kamailio/kamailio/commit/bd70a78ce22ab419a52e8733bc7ee27… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-14T11:52:02+01:00 topos: Updates for topos_htable module Add htable storage modparam. End storage dialog on negative replies. --- Modified: src/modules/topos/doc/topos_admin.xml Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/bd70a78ce22ab419a52e8733bc7ee27… Patch: https://github.com/kamailio/kamailio/commit/bd70a78ce22ab419a52e8733bc7ee27… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 4ccc4b7790f..f4fa47556e2 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -99,6 +99,11 @@ <emphasis>redis</emphasis> - Redis Backend </para> </listitem> + <listitem> + <para> + <emphasis>htable</emphasis> - htable module Backend + </para> + </listitem> </itemizedlist> <para> <emphasis> diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 3214bdeb66d..c0db6ec72ec 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -288,6 +288,9 @@ static int mod_init(void) _tpsdbf.close(topos_db_con); topos_db_con = NULL; } + } else if(_tps_storage.len == 6 + && strncmp(_tps_storage.s, "htable", 6) == 0) { + // use htable module api } else { if(_tps_storage.len != 7 && strncmp(_tps_storage.s, "redis", 5) != 0) { LM_ERR("unknown storage type: %.*s\n", _tps_storage.len, diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index e0e1c211923..7fff763fe26 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1081,6 +1081,14 @@ int tps_response_received(sip_msg_t *msg) tps_reappend_rr(msg, &btsd, &btsd.x_rr); tps_append_xbranch(msg, &mtsd.x_vbranch1); + if(msg->first_line.u.reply.statuscode > 299 + && (get_cseq(msg)->method_id + & (METHOD_INVITE | METHOD_SUBSCRIBE))) { + LM_DBG("%d reply end dialog storage\n", + msg->first_line.u.reply.statuscode); + tps_storage_end_dialog(msg, &mtsd, &stsd); + } + return 0; error:

1 0

git:master:69db5823: htable: Updates for topos_htable module
by Daniel-Constantin Mierla 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: 69db5823fc9b8ee98c59d591517a1ecef91b16db URL: https://github.com/kamailio/kamailio/commit/69db5823fc9b8ee98c59d591517a1ec… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-14T11:52:02+01:00 htable: Updates for topos_htable module Export table create api functions Fix ht_cell_pkg_copy str pointers. Otherwise, pkg cell str pointers will still point to shm memory. Set the pkg cell str pointers similar to how ht_cell_new sets the str pointers. --- Modified: src/modules/htable/api.c Modified: src/modules/htable/api.h Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/69db5823fc9b8ee98c59d591517a1ec… Patch: https://github.com/kamailio/kamailio/commit/69db5823fc9b8ee98c59d591517a1ec… --- diff --git a/src/modules/htable/api.c b/src/modules/htable/api.c index 57b2b4e75f1..94095d3d5d4 100644 --- a/src/modules/htable/api.c +++ b/src/modules/htable/api.c @@ -147,6 +147,16 @@ int ht_api_count_cells_re(str *hname, str *sre, int mode) return 0; } +int ht_api_table_spec(char *spec) +{ + return ht_table_spec(spec); +} + +int ht_api_init_tables(void) +{ + return ht_init_tables(); +} + /** * */ @@ -156,6 +166,8 @@ int bind_htable(htable_api_t *api) ERR("Invalid parameter value\n"); return -1; } + api->table_spec = ht_api_table_spec; + api->init_tables = ht_api_init_tables; api->set = ht_api_set_cell; api->get_clone = ht_api_get_cell_clone; api->rm = ht_api_del_cell; diff --git a/src/modules/htable/api.h b/src/modules/htable/api.h index 15e5207f1b2..8f67e5ca71a 100644 --- a/src/modules/htable/api.h +++ b/src/modules/htable/api.h @@ -25,6 +25,8 @@ #include "../../core/sr_module.h" #include "../../core/usr_avp.h" +typedef int (*ht_api_table_spec_f)(char *spec); +typedef int (*ht_api_init_tables_f)(void); typedef int (*ht_api_set_cell_f)( str *hname, str *name, int type, int_str *val, int mode); typedef ht_cell_t *(*ht_api_get_cell_clone_f)(str *hname, str *name); @@ -40,6 +42,8 @@ typedef int (*ht_api_count_cells_re_f)(str *hname, str *sre, int mode); typedef struct htable_api { + ht_api_table_spec_f table_spec; + ht_api_init_tables_f init_tables; ht_api_set_cell_f set; ht_api_get_cell_clone_f get_clone; ht_api_del_cell_f rm; diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index ecc49b547d6..8655c2bf443 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -359,6 +359,11 @@ int ht_init_tables(void) ht = _ht_root; while(ht) { + if(ht->entries != NULL) { + ht = ht->next; + continue; + } + LM_DBG("initializing htable [%.*s] with nr. of slots: %d\n", ht->name.len, ht->name.s, ht->htsize); if(ht->name.len + sizeof("htable:expired:") < HT_EVEX_NAME_SIZE) { @@ -860,8 +865,14 @@ ht_cell_t *ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old) } } cell = (ht_cell_t *)pkg_malloc(it->msize); - if(cell != NULL) + if(cell != NULL) { memcpy(cell, it, it->msize); + + cell->name.s = (char *)cell + sizeof(ht_cell_t); + if(cell->flags & AVP_VAL_STR) { + cell->value.s.s = (char *)cell->name.s + cell->name.len + 1; + } + } ht_slot_unlock(ht, idx); return cell; }

1 0

git:master:fbf2fef1: lwsc: add fixup_free* to exported functions
by Victor Seva 13 Dec '24

13 Dec '24

Module: kamailio Branch: master Commit: fbf2fef1ff0f3289cb4734f66b86f0a4f82f2407 URL: https://github.com/kamailio/kamailio/commit/fbf2fef1ff0f3289cb4734f66b86f0a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-13T20:12:07+01:00 lwsc: add fixup_free* to exported functions --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fbf2fef1ff0f3289cb4734f66b86f0a… Patch: https://github.com/kamailio/kamailio/commit/fbf2fef1ff0f3289cb4734f66b86f0a… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index b1645448276..c38779ad712 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -51,6 +51,8 @@ static int w_lwsc_request_proto( static int w_lwsc_notify(sip_msg_t *msg, char *pwsurl, char *pdata); static int w_lwsc_notify_proto( sip_msg_t *msg, char *pwsurl, char *pwsproto, char *pdata); +static int lwsc_pv_get(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int lwsc_pv_parse_name(pv_spec_t *sp, str *in); static int _lwsc_timeout_connect = 0; static int _lwsc_timeout_send = 0; @@ -60,16 +62,17 @@ static str _lwsc_protocol = str_init("kmsg"); static int _lwsc_verbosity = 0; /* clang-format off */ -static cmd_export_t cmds[] = {{"lwsc_request", (cmd_function)w_lwsc_request, 2, - fixup_spve_all, 0, ANY_ROUTE}, +static cmd_export_t cmds[] = { + {"lwsc_request", (cmd_function)w_lwsc_request, 2, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"lwsc_request_proto", (cmd_function)w_lwsc_request_proto, 3, - fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, - {"lwsc_notify", (cmd_function)w_lwsc_notify, 2, fixup_spve_all, fixup_free_spve_all, - ANY_ROUTE}, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"lwsc_notify", (cmd_function)w_lwsc_notify, 2, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"lwsc_notify_proto", (cmd_function)w_lwsc_notify_proto, 3, - fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"bind_lwsc", (cmd_function)bind_lwsc, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0} + {0, 0, 0, 0, 0, 0} }; static param_export_t params[] = { @@ -82,9 +85,6 @@ static param_export_t params[] = { {0, 0, 0} }; -static int lwsc_pv_get(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); -static int lwsc_pv_parse_name(pv_spec_t *sp, str *in); - static pv_export_t mod_pvs[] = { {{"lwsc", sizeof("lwsc") - 1}, PVT_OTHER, lwsc_pv_get, 0, lwsc_pv_parse_name, 0, 0, 0},

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev