sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
228 discussions

git:master:24afb14c: carrierroute: use proper define for db_url
by Henning Westerholt 12 Jun '24

12 Jun '24

Module: kamailio Branch: master Commit: 24afb14cfaba28c4e5a7dfe9f352b02a551eed5c URL: https://github.com/kamailio/kamailio/commit/24afb14cfaba28c4e5a7dfe9f352b02… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-06-12T07:59:20Z carrierroute: use proper define for db_url --- Modified: src/modules/carrierroute/doc/carrierroute_db.xml --- Diff: https://github.com/kamailio/kamailio/commit/24afb14cfaba28c4e5a7dfe9f352b02… Patch: https://github.com/kamailio/kamailio/commit/24afb14cfaba28c4e5a7dfe9f352b02… --- diff --git a/src/modules/carrierroute/doc/carrierroute_db.xml b/src/modules/carrierroute/doc/carrierroute_db.xml index 87017a3d259..0e9d7b3fded 100644 --- a/src/modules/carrierroute/doc/carrierroute_db.xml +++ b/src/modules/carrierroute/doc/carrierroute_db.xml @@ -29,7 +29,7 @@ ALL CHANGES DONE HERE WILL BE LOST IF THE FILE IS REGENERATED <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("carrierroute", "db_url", "dbdriver://username:password@dbhost/dbname") +modparam("carrierroute", "db_url", "&exampledb;") ... </programlisting> </example>

1 0

git:5.8:2ce09cbd: pkg: deb specs updated for v5.8.2
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Module: kamailio Branch: 5.8 Commit: 2ce09cbd669753266bba8659073320af6f53664b URL: https://github.com/kamailio/kamailio/commit/2ce09cbd669753266bba8659073320a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-12T09:40:58+02:00 pkg: deb specs updated for v5.8.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/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/2ce09cbd669753266bba8659073320a… Patch: https://github.com/kamailio/kamailio/commit/2ce09cbd669753266bba8659073320a…

1 0

git:5.8:f3daac30: pkg/kamailio: version set 5.8.2 for rpms and alpine
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Module: kamailio Branch: 5.8 Commit: f3daac3024c6a623fa9021d92f77daf2cf866c8d URL: https://github.com/kamailio/kamailio/commit/f3daac3024c6a623fa9021d92f77daf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-12T08:57:25+02:00 pkg/kamailio: version set 5.8.2 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/f3daac3024c6a623fa9021d92f77daf… Patch: https://github.com/kamailio/kamailio/commit/f3daac3024c6a623fa9021d92f77daf… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 4b56df12b49..f68763c8c3a 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.8.1 +pkgver=5.8.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 ee339c02d99..53831a5d27b 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.8.1 +%define ver 5.8.2 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing v5.8.2
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Hello, I am considering to release Kamailio v5.8.2 (out of branch 5.8) on Wednesday, June 12, 2024. 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 (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

2 2

[kamailio/kamailio] ims_icscf: add missing documents for database params (PR #3873)
by H. Yavari 11 Jun '24

11 Jun '24

- Adding missing ims_icscf database parameters documents. - Change the default value for ims_icscf db_url to Kamailio db_url. - ims_usrloc_pcscf: fix the db_url type from into to string in document.   #### Pre-Submission Checklist    - [ :white_check_mark:] Commit message has the format required by CONTRIBUTING guide - [ :white_check_mark:] Commits are split per component (core, individual modules, libs, utils, ...) - [ :white_check_mark:] Each component has a single commit (if not, squash them into one commit) - [ :white_check_mark:] 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 - [ :white_check_mark: ] 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 - [ :white_check_mark:] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3873 -- Commit Summary -- * ims_icscf: add missing documents for database params -- File Changes -- M src/modules/ims_icscf/doc/ims_icscf_admin.xml (100) M src/modules/ims_icscf/ims_icscf_mod.c (3) M src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3873.patch https://github.com/kamailio/kamailio/pull/3873.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3873 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3873(a)github.com>

2 4

git:master:e047f35a: dispatcher: debug messages for setting oc attributes
by Daniel-Constantin Mierla 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: e047f35ad5e1d7b4984a9cce72ffb782fdae3bda URL: https://github.com/kamailio/kamailio/commit/e047f35ad5e1d7b4984a9cce72ffb78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-11T14:19:02+02:00 dispatcher: debug messages for setting oc attributes --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/e047f35ad5e1d7b4984a9cce72ffb78… Patch: https://github.com/kamailio/kamailio/commit/e047f35ad5e1d7b4984a9cce72ffb78… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 49e560a710b..84166540a37 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -466,8 +466,8 @@ int ds_oc_set_attrs( LM_ERR("destination set [%d] not found\n", setid); return -1; } - LM_DBG("update oc rate for %.*s in group %d to %d\n", duri->len, duri->s, - setid, irval); + LM_DBG("updating oc attrs for %d %.*s to rate %d validity %d seq %d\n", + setid, duri->len, duri->s, irval, itval, isval); gettimeofday(&tnow, NULL); timerclear(&tdiff); @@ -479,6 +479,7 @@ int ds_oc_set_attrs( if(idx->dlist[i].uri.len == duri->len && strncasecmp(idx->dlist[i].uri.s, duri->s, duri->len) == 0) { if(idx->dlist[i].ocseq >= isval) { + LM_DBG("skipping entry %d due to seq condition\n", i); continue; } idx->dlist[i].attrs.ocrate = irval; @@ -492,6 +493,7 @@ int ds_oc_set_attrs( timeradd(&tnow, &tdiff, &idx->dlist[i].octime); idx->dlist[i].ocseq = isval; ret = 1; + LM_DBG("updated entry %d\n", i); } } return ret;

1 0

git:master:842bb793: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: 842bb7936ea92a9785711b7e61392615bb541826 URL: https://github.com/kamailio/kamailio/commit/842bb7936ea92a9785711b7e6139261… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-11T13:46:10+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/842bb7936ea92a9785711b7e6139261… Patch: https://github.com/kamailio/kamailio/commit/842bb7936ea92a9785711b7e6139261… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 1e99229575a..fbac75c662d 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -122,7 +122,7 @@ Federico Cabiddu 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) 5. RPC Commands @@ -291,7 +291,7 @@ Chapter 1. Admin Guide 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) 5. RPC Commands @@ -1118,7 +1118,7 @@ modparam("dispatcher", "ds_interval_mode", 7200) 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) 4.1. ds_select_dst(set, alg[, limit]) @@ -1636,7 +1636,7 @@ onreply_route { xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); ... -4.17. ds_oc_set_attrs(setid, uri, rval, tval) +4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) Sets the overload control rate and time internval limit for the destination (setid, uri). @@ -1650,12 +1650,15 @@ onreply_route { * tval - time interval limit to apply the overload control rate (in milliseconds). If the value is 0 or negative, then the default value 500 is used. + * sval - the sequence number for overload control. + + The parameters can include variables. This function can be used from ANY_ROUTE. Example 1.60. ds_oc_set_attrs() usage ... - ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000", "1"); ... 5. RPC Commands

1 0

git:master:e92be0e1: docs: new parameter for ds_oc_set_attrs()
by Daniel-Constantin Mierla 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: e92be0e131193b4b0a294e71fb2cfb4f52f5ef6f URL: https://github.com/kamailio/kamailio/commit/e92be0e131193b4b0a294e71fb2cfb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-11T13:35:44+02:00 docs: new parameter for ds_oc_set_attrs() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e92be0e131193b4b0a294e71fb2cfb4… Patch: https://github.com/kamailio/kamailio/commit/e92be0e131193b4b0a294e71fb2cfb4… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 62e212f8744..70a30ed7f7e 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2016,7 +2016,7 @@ onreply_route { </section> <section id="dispatcher.f.ds_oc_set_attrs"> <title> - <function moreinfo="none">ds_oc_set_attrs(setid, uri, rval, tval)</function> + <function moreinfo="none">ds_oc_set_attrs(setid, uri, rval, tval, sval)</function> </title> <para> Sets the overload control rate and time internval limit @@ -2041,9 +2041,13 @@ onreply_route { <para><emphasis>tval</emphasis> - time interval limit to apply the overload control rate (in milliseconds). If the value is 0 or negative, then the default value 500 is used.</para> - </listitem> + </listitem> + <listitem> + <para><emphasis>sval</emphasis> - the sequence number for overload + control.</para> + </listitem> </itemizedlist> - + <para>The parameters can include variables.</para> <para> This function can be used from ANY_ROUTE. </para> @@ -2051,7 +2055,7 @@ onreply_route { <title><function>ds_oc_set_attrs()</function> usage</title> <programlisting format="linespecific"> ... - ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000", "1"); ... </programlisting> </example>

1 0

git:master:803e8442: dispatcher: track oc-seq values
by Daniel-Constantin Mierla 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: 803e8442a2278adc19eebfbb2ff0aba31c180539 URL: https://github.com/kamailio/kamailio/commit/803e8442a2278adc19eebfbb2ff0aba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-11T13:09:10+02:00 dispatcher: track oc-seq values --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/803e8442a2278adc19eebfbb2ff0aba… Patch: https://github.com/kamailio/kamailio/commit/803e8442a2278adc19eebfbb2ff0aba…

1 0

git:master:b3eefcd3: core: additional fixup functions for int-str-int-int-int parameters
by Daniel-Constantin Mierla 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: b3eefcd34fa16a13f233afcf285f3abbe4401394 URL: https://github.com/kamailio/kamailio/commit/b3eefcd34fa16a13f233afcf285f3ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-11T12:59:37+02:00 core: additional fixup functions for int-str-int-int-int parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/b3eefcd34fa16a13f233afcf285f3ab… Patch: https://github.com/kamailio/kamailio/commit/b3eefcd34fa16a13f233afcf285f3ab… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index fa7e2c4b47a..18785662936 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -1095,3 +1095,39 @@ int fixup_free_isii(void **param, int param_no) return E_UNSPEC; } } + +/** + * + */ +int fixup_isiii(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + case 4: + case 5: + return fixup_igp_null(param, 1); + case 2: + return fixup_spve_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_isiii(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + case 4: + case 5: + return fixup_free_igp_null(param, 1); + case 2: + return fixup_free_spve_null(param, 1); + default: + return E_UNSPEC; + } +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 76c57bc9bf6..092f65b93bc 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -190,4 +190,7 @@ int fixup_free_isi(void **param, int param_no); int fixup_isii(void **param, int param_no); int fixup_free_isii(void **param, int param_no); +int fixup_isiii(void **param, int param_no); +int fixup_free_isiii(void **param, int param_no); + #endif

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024