sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
324 discussions

git:5.1:37ffe9bc: core: pv - function to get the size of the value for strings with vars
by Daniel-Constantin Mierla 10 Feb '20

10 Feb '20

Module: kamailio Branch: 5.1 Commit: 37ffe9bcb52751f6f2aed76074784872af3f94c5 URL: https://github.com/kamailio/kamailio/commit/37ffe9bcb52751f6f2aed7607478487… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-10T13:28:04+01:00 core: pv - function to get the size of the value for strings with vars - added silent mode for printing strings with vars (cherry picked from commit 6ee9e9c9dc2d818a5ce6c6cf7828a68a1c8cb291) --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/37ffe9bcb52751f6f2aed7607478487… Patch: https://github.com/kamailio/kamailio/commit/37ffe9bcb52751f6f2aed7607478487… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index ebc66ef148..6e09bb406b 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -1402,18 +1402,22 @@ int pv_set_spec_value(struct sip_msg* msg, pv_spec_p sp, int op, /** * */ -int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) +int pv_printf_mode(sip_msg_t* msg, pv_elem_t *list, int mode, char *buf, int *len) { int n; pv_value_t tok; pv_elem_p it; char *cur; - if(msg==NULL || list==NULL || buf==NULL || len==NULL) + if(msg==NULL || list==NULL || buf==NULL || len==NULL) { + LM_DBG("invalid parameters\n"); return -1; + } - if(*len <= 0) + if(*len <= 0) { + LM_DBG("invalid value for output buffer size\n"); return -1; + } *buf = '\0'; cur = buf; @@ -1430,8 +1434,10 @@ int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) n += it->text.len; cur += it->text.len; } else { - LM_ERR("no more space for text value - printed:%d token:%d buffer:%d\n", + if(likely(mode)) { + LM_ERR("no more space for text value - printed:%d token:%d buffer:%d\n", n, it->text.len, *len); + } goto overflow; } } @@ -1450,8 +1456,10 @@ int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) cur += tok.rs.len; } } else { - LM_ERR("no more space for spec value - printed:%d token:%d buffer:%d\n", + if(likely(mode)) { + LM_ERR("no more space for spec value - printed:%d token:%d buffer:%d\n", n, tok.rs.len, *len); + } goto overflow; } } @@ -1460,8 +1468,10 @@ int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) goto done; overflow: - LM_ERR("buffer overflow -- increase the buffer size...\n"); - return -1; + if(likely(mode)) { + LM_ERR("buffer overflow -- increase the buffer size...\n"); + } + return -2; done: #ifdef EXTRA_DEBUG @@ -1472,6 +1482,47 @@ int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) return 0; } +/** + * + */ +int pv_printf(sip_msg_t* msg, pv_elem_t *list, char *buf, int *len) +{ + return pv_printf_mode(msg, list, 1, buf, len); +} + +/** + * + */ +int pv_printf_size(sip_msg_t* msg, pv_elem_t *list) +{ + int n; + pv_value_t tok; + pv_elem_t *it; + + if(msg==NULL || list==NULL) { + return -1; + } + + n = 0; + for (it=list; it; it=it->next) { + /* count the static text */ + if(it->text.s && it->text.len>0) { + n += it->text.len; + } + /* count the value of the specifier */ + if(it->spec!=NULL && it->spec->type!=PVT_NONE + && pv_get_spec_value(msg, it->spec, &tok)==0) + { + if(tok.flags&PV_VAL_NULL) { + tok.rs = pv_str_null; + } + n += tok.rs.len; + } + } + + return n; +} + /** * */ diff --git a/src/core/pvar.h b/src/core/pvar.h index ce275cd4b4..d46b544ebc 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -173,7 +173,9 @@ char* pv_parse_spec2(str *in, pv_spec_p sp, int silent); int pv_get_spec_value(struct sip_msg* msg, pv_spec_p sp, pv_value_t *value); int pv_set_spec_value(struct sip_msg* msg, pv_spec_p sp, int op, pv_value_t *value); -int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len); +int pv_printf_mode(sip_msg_t* msg, pv_elem_t* list, int mode, char *buf, int *len); +int pv_printf(sip_msg_t* msg, pv_elem_t* list, char *buf, int *len); +int pv_printf_size(sip_msg_t* msg, pv_elem_t *list); int pv_elem_free_all(pv_elem_p log); void pv_value_destroy(pv_value_t *val); void pv_spec_destroy(pv_spec_t *spec);

1 0

git:5.1:b2702ac3: ChangeLog: content updated for v5.1.10
by Daniel-Constantin Mierla 10 Feb '20

10 Feb '20

Module: kamailio Branch: 5.1 Commit: b2702ac38dbda23d08b8a139de9fb032df4329ec URL: https://github.com/kamailio/kamailio/commit/b2702ac38dbda23d08b8a139de9fb03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-10T11:21:55+01:00 ChangeLog: content updated for v5.1.10 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/b2702ac38dbda23d08b8a139de9fb03… Patch: https://github.com/kamailio/kamailio/commit/b2702ac38dbda23d08b8a139de9fb03…

1 0

git:5.1:44866018: Makefile.defs: version set to 5.1.10
by Daniel-Constantin Mierla 10 Feb '20

10 Feb '20

Module: kamailio Branch: 5.1 Commit: 44866018a2e3dfb07a97397b4eb950e9c3162037 URL: https://github.com/kamailio/kamailio/commit/44866018a2e3dfb07a97397b4eb950e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-10T11:15:36+01:00 Makefile.defs: version set to 5.1.10 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/44866018a2e3dfb07a97397b4eb950e… Patch: https://github.com/kamailio/kamailio/commit/44866018a2e3dfb07a97397b4eb950e… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 813a8d5344..b709c98735 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 9 +SUBLEVEL = 10 EXTRAVERSION = # memory manager switcher

1 0

git:5.1:89a49501: pkg/kamailio/deb: version set 5.1.10
by Victor Seva 10 Feb '20

10 Feb '20

Module: kamailio Branch: 5.1 Commit: 89a495012de85983a0dcb8cb10d205bf1e0f86d5 URL: https://github.com/kamailio/kamailio/commit/89a495012de85983a0dcb8cb10d205b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-02-10T11:07:12+01:00 pkg/kamailio/deb: version set 5.1.10 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/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/89a495012de85983a0dcb8cb10d205b… Patch: https://github.com/kamailio/kamailio/commit/89a495012de85983a0dcb8cb10d205b… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index 38f1309714..5b1a07c93c 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.10) unstable; urgency=medium + + * version set 5.1.10 + + -- Victor Seva <vseva(a)debian.org> Mon, 10 Feb 2020 11:06:23 +0100 + kamailio (5.1.9) unstable; urgency=medium * version set 5.1.9 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 38f1309714..5b1a07c93c 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.10) unstable; urgency=medium + + * version set 5.1.10 + + -- Victor Seva <vseva(a)debian.org> Mon, 10 Feb 2020 11:06:23 +0100 + kamailio (5.1.9) unstable; urgency=medium * version set 5.1.9 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 38f1309714..5b1a07c93c 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.10) unstable; urgency=medium + + * version set 5.1.10 + + -- Victor Seva <vseva(a)debian.org> Mon, 10 Feb 2020 11:06:23 +0100 + kamailio (5.1.9) unstable; urgency=medium * version set 5.1.9 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 38f1309714..5b1a07c93c 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.10) unstable; urgency=medium + + * version set 5.1.10 + + -- Victor Seva <vseva(a)debian.org> Mon, 10 Feb 2020 11:06:23 +0100 + kamailio (5.1.9) unstable; urgency=medium * version set 5.1.9 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 38f1309714..5b1a07c93c 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.10) unstable; urgency=medium + + * version set 5.1.10 + + -- Victor Seva <vseva(a)debian.org> Mon, 10 Feb 2020 11:06:23 +0100 + kamailio (5.1.9) unstable; urgency=medium * version set 5.1.9 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 38f1309714..5b1a07c93c 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.10) unstable; urgency=medium + + * version set 5.1.10 + + -- Victor Seva <vseva(a)debian.org> Mon, 10 Feb 2020 11:06:23 +0100 + kamailio (5.1.9) unstable; urgency=medium * version set 5.1.9 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 38f1309714..5b1a07c93c 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.10) unstable; urgency=medium + + * version set 5.1.10 + + -- Victor Seva <vseva(a)debian.org> Mon, 10 Feb 2020 11:06:23 +0100 + kamailio (5.1.9) unstable; urgency=medium * version set 5.1.9 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 38f1309714..5b1a07c93c 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.10) unstable; urgency=medium + + * version set 5.1.10 + + -- Victor Seva <vseva(a)debian.org> Mon, 10 Feb 2020 11:06:23 +0100 + kamailio (5.1.9) unstable; urgency=medium * version set 5.1.9 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 38f1309714..5b1a07c93c 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.10) unstable; urgency=medium + + * version set 5.1.10 + + -- Victor Seva <vseva(a)debian.org> Mon, 10 Feb 2020 11:06:23 +0100 + kamailio (5.1.9) unstable; urgency=medium * version set 5.1.9

1 0

git:5.1:d681f31a: pkg: rpm/specs updated for v5.1.10
by Daniel-Constantin Mierla 10 Feb '20

10 Feb '20

Module: kamailio Branch: 5.1 Commit: d681f31a49b2b5efef7bc20ab60cd129cc5b9265 URL: https://github.com/kamailio/kamailio/commit/d681f31a49b2b5efef7bc20ab60cd12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-10T10:21:07+01:00 pkg: rpm/specs updated for v5.1.10 --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/freebsd/Makefile Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/d681f31a49b2b5efef7bc20ab60cd12… Patch: https://github.com/kamailio/kamailio/commit/d681f31a49b2b5efef7bc20ab60cd12… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 155dce82bc..950ec71184 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.1.9 +pkgver=5.1.10 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 23082ec857..9f3dd9298e 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.9 +%define ver 5.1.10 %define rel 0%{dist} diff --git a/pkg/kamailio/freebsd/Makefile b/pkg/kamailio/freebsd/Makefile index d77e70e00b..848b4e6d34 100644 --- a/pkg/kamailio/freebsd/Makefile +++ b/pkg/kamailio/freebsd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kamailio -PORTVERSION= 5.1.9 +PORTVERSION= 5.1.10 CATEGORIES= net MASTER_SITES= http://kamailio.org/pub/kamailio/${PORTVERSION}/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-tls_src diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7fda4debeb..2430965f84 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.9 +%define ver 5.1.10 %define rel 0%{dist} %if 0%{?fedora} diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 52b507fbd4..52c2cb1eb1 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.9 +%define ver 5.1.10 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 26721beb90..83689574fd 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.9 +%define ver 5.1.10 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 659f196e68..99b1702fb3 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.9 +%define ver 5.1.10 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 49bd4258b1..af5560c43d 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.9 +%define ver 5.1.10 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index cdcd445401..b80ca0e08e 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.9 +%define ver 5.1.10 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:5.1:a59f72f3: tm: use WARN log level for status rewrite by UAS (were decreased before SER tm integration)
by Daniel-Constantin Mierla 10 Feb '20

10 Feb '20

Module: kamailio Branch: 5.1 Commit: a59f72f36463761bf47e6d98faaf624749644140 URL: https://github.com/kamailio/kamailio/commit/a59f72f36463761bf47e6d98faaf624… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-10T08:28:10+01:00 tm: use WARN log level for status rewrite by UAS (were decreased before SER tm integration) - use WARN log level for status rewrite by UAS (log level decreased before SER tm integration, e.g. v1.5.x) - for bad interconnection or gateways this might be reported frequently (cherry picked from commit e1a01699af450292859e4f2cd69b6a6d85246e5e) (cherry picked from commit b370041ccfd86e15812e1a06ad803569654eac07) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/a59f72f36463761bf47e6d98faaf624… Patch: https://github.com/kamailio/kamailio/commit/a59f72f36463761bf47e6d98faaf624… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 8e986e2fab..b4cba92fa1 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1302,7 +1302,7 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, } /* this looks however how a very strange status rewrite attempt; * report on it */ - LM_ERR("status rewrite by UAS: stored: %d, received: %d\n", + LM_WARN("status rewrite by UAS: stored: %d, received: %d\n", Trans->uac[branch].last_received, new_code); goto discard; }

1 0

Planning the release of v5.1.10
by Daniel-Constantin Mierla 10 Feb '20

10 Feb '20

Hello, I am considering to release Kamailio v5.1.10 on Thursday, Jan 30, 2020, to mark the end of official packaging from branch 5.1. At this moment the last two stable branches are 5.2 and 5.3. If anyone is aware of some commits for fixes that should be backported to branch 5.1, write to sr-dev. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 9-11, 2020, Berlin - www.asipto.com Kamailio World Conference - April 27-29, 2020, in Berlin -- www.kamailioworld.com

1 2

[kamailio/kamailio] rtpengine: Remove unused struct fields (#2216)
by Peter Lemenkov 09 Feb '20

09 Feb '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 - [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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  These two variables were copied directly from rtpproxy module but never used by this module. Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2216 -- Commit Summary -- * rtpengine: Remove unused struct fields -- File Changes -- M src/modules/rtpengine/rtpengine.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2216.patch https://github.com/kamailio/kamailio/pull/2216.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2216

2 3

git:5.1:ebf8af80: rtpengine: Remove unused struct fields
by Henning Westerholt 09 Feb '20

09 Feb '20

Module: kamailio Branch: 5.1 Commit: ebf8af806d5ad5f44d119f12131a446c0eea4019 URL: https://github.com/kamailio/kamailio/commit/ebf8af806d5ad5f44d119f12131a446… Author: Peter Lemenkov <lemenkov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-09T17:26:37+01:00 rtpengine: Remove unused struct fields These two were copied directly from rtpproxy module but never used by this module. Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> (cherry picked from commit 35b82c4acb4559fd14faa86fe1c58caf763d5fd0) --- Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/ebf8af806d5ad5f44d119f12131a446… Patch: https://github.com/kamailio/kamailio/commit/ebf8af806d5ad5f44d119f12131a446… --- diff --git a/src/modules/rtpengine/rtpengine.h b/src/modules/rtpengine/rtpengine.h index 07d8acdb00..d7b605057e 100644 --- a/src/modules/rtpengine/rtpengine.h +++ b/src/modules/rtpengine/rtpengine.h @@ -49,8 +49,6 @@ struct rtpp_node { unsigned int rn_weight; /* for load balancing */ unsigned int rn_displayed; /* for delete at db reload */ unsigned int rn_recheck_ticks; - int rn_rep_supported; - int rn_ptl_supported; struct rtpp_node *rn_next; };

1 0

git:5.2:55e0eef3: ims_reqistrar_scscf: Fix bug with multi-notifications
by Henning Westerholt 09 Feb '20

09 Feb '20

Module: kamailio Branch: 5.2 Commit: 55e0eef3f554b5cb6e8cec73c4a482ac03b3c99d URL: https://github.com/kamailio/kamailio/commit/55e0eef3f554b5cb6e8cec73c4a482a… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-09T17:18:30+01:00 ims_reqistrar_scscf: Fix bug with multi-notifications - Added more accurate contact comparison when sending NOTIFY to a subscriber. (cherry picked from commit c275110a07fdad8963a08f5ca210f0d5fb717986) --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/55e0eef3f554b5cb6e8cec73c4a482a… Patch: https://github.com/kamailio/kamailio/commit/55e0eef3f554b5cb6e8cec73c4a482a… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index fd7116e855..175eb72cc2 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -1349,6 +1349,21 @@ int aor_to_contact(str* aor, str* contact) { return ret; } +/*! + * \brief Match two contacts with full string - ips, ports and aliases + * \param c1 contact string 1 + * \param c2 contact string 2 + * \return 1 when they match, 0 when they not match + */ +static int contact_match(str* c1, str* c2) { + LM_DBG("Matching full contact string - comparing [%.*s] and [%.*s]\n", c1->len, c1->s, c2->len, c2->s); + if ((c1->len == c2->len) && !memcmp(c1->s, c2->s, c1->len)) { + return 1; + } + + return 0; +} + /*! * \brief Match a contact record to a contact string but only compare the ip port portion * \param ptr contact record @@ -1435,7 +1450,7 @@ void create_notifications(udomain_t* _t, impurecord_t* r_passed, str *presentity //This is a fix to ensure that when a user subscribes a full reg info is only sent to that UE if (event_type == IMS_REGISTRAR_SUBSCRIBE) { - if (contact_port_ip_match(watcher_contact, &s->watcher_contact) && + if (contact_match(watcher_contact, &s->watcher_contact) && (presentity_uri->len == s->presentity_uri.len) && (memcmp(s->presentity_uri.s, presentity_uri->s, presentity_uri->len) == 0)) { LM_DBG("This is a fix to ensure that we only send full reg info XML to the UE that just subscribed. About to make new notification! We always increment the local cseq and version before we send a new notification\n");

1 0

← Newer
1
...
26
27
28
29
30
31
32
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2020