sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
474 discussions

git:master:8cbef62a: presence: add delete_same_subs modparam
by Stefan Mititelu 17 Mar '20

17 Mar '20

Module: kamailio Branch: master Commit: 8cbef62a0b9e654dda934edaf3e0f6e9c4a5c9a4 URL: https://github.com/kamailio/kamailio/commit/8cbef62a0b9e654dda934edaf3e0f6e… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-03-17T15:45:05+02:00 presence: add delete_same_subs modparam --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/8cbef62a0b9e654dda934edaf3e0f6e… Patch: https://github.com/kamailio/kamailio/commit/8cbef62a0b9e654dda934edaf3e0f6e… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 3eb1c1e942..32ffd3a2e6 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -951,6 +951,26 @@ modparam("presence", "pres_subs_mode", 0) </example> </section> +<section id="presence.p.delete_same_subs"> + <title><varname>delete_same_subs</varname> (integer)</title> + <para> + Enable deleting of subscriptions with the same presence uri and callid. + </para> + <para> + <emphasis> + Default value is 0 (disabled behavior). + </emphasis> + </para> + <example> + <title>Set <varname>delete_same_subs</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence", "delete_same_subs", 1) +... +</programlisting> + </example> +</section> + </section> <section> diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index bf6bc839fb..50d4d9948c 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -258,6 +258,40 @@ int insert_shtable(shtable_t htable, unsigned int hash_code, subs_t *subs) { subs_t *new_rec = NULL; + if (pres_delete_same_subs) { + subs_t* rec = NULL, *prev_rec = NULL; + + lock_get(&htable[hash_code].lock); + /* search if there is another record with the same pres_uri & callid */ + rec = htable[hash_code].entries->next; + while (rec) { + if (subs->pres_uri.len == rec->pres_uri.len && subs->callid.len == rec->callid.len && + memcmp(subs->pres_uri.s, rec->pres_uri.s, subs->pres_uri.len) == 0 && + memcmp(subs->callid.s, rec->callid.s, subs->callid.len) == 0) { + LM_NOTICE("Found another record with the same pres_uri[%.*s] and callid[%.*s]\n", + subs->pres_uri.len, subs->pres_uri.s, subs->callid.len, subs->callid.s); + /* delete this record */ + + if (prev_rec) + prev_rec->next = rec->next; + else + htable[hash_code].entries->next = rec->next; + + if (subs_dbmode != NO_DB) + delete_db_subs(&rec->to_tag, &rec->from_tag, &rec->callid); + + if (rec->contact.s!=NULL) + shm_free(rec->contact.s); + + shm_free(rec); + break; + } + prev_rec = rec; + rec = rec->next; + } + lock_release(&htable[hash_code].lock); + } + new_rec = mem_copy_subs_noc(subs); if(new_rec == NULL) { LM_ERR("copying in share memory a subs_t structure\n"); diff --git a/src/modules/presence/hash.h b/src/modules/presence/hash.h index 7f1276d9ad..676e6b4cff 100644 --- a/src/modules/presence/hash.h +++ b/src/modules/presence/hash.h @@ -56,6 +56,8 @@ struct presentity; #define PKG_MEM_TYPE 1 << 1 #define SHM_MEM_TYPE 1 << 2 +extern int pres_delete_same_subs; + /* subscribe hash entry */ struct subscription; @@ -136,4 +138,6 @@ int delete_phtable(str *pres_uri, int event); void destroy_phtable(void); +int delete_db_subs(str* to_tag, str* from_tag, str* callid); + #endif diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index a8f781c4be..0155cf286f 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -169,6 +169,7 @@ str pres_xavp_cfg = {0}; int pres_retrieve_order = 0; str pres_retrieve_order_by = str_init("priority"); int pres_enable_dmq = 0; +int pres_delete_same_subs = 0; int db_table_lock_type = 1; db_locking_t db_table_lock = DB_LOCKING_WRITE; @@ -245,6 +246,7 @@ static param_export_t params[]={ { "cseq_offset", PARAM_INT, &pres_cseq_offset}, { "enable_dmq", PARAM_INT, &pres_enable_dmq}, { "pres_subs_mode", PARAM_INT, &_pres_subs_mode}, + { "delete_same_subs", PARAM_INT, &pres_delete_same_subs}, {0,0,0} }; /* clang-format on */

1 0

minor issues building on NetBSD
by Greg Troxel 17 Mar '20

17 Mar '20

I'm working on adding 5.3.3 to pkgsrc, and have run into a few minor things. I'm mentioning them here in the hopes of being steered towards the preferred way to fix. (I hope this belongs on -dev; let me know if not.) 1) -ldl In src/Makefile.defs, I had to do: -LD_PMUTEX_OPTS = -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions +LD_PMUTEX_OPTS = -pthread -rdynamic -Wl,-Bsymbolic-functions because on NetBSD there is no -ldl and dlopen is just in libc. My suggested fix is to define a LD_LIBDL per OS and use that variable instead when it would be needed. 2) lib64 I did -LIBDIR ?= -ifeq ($(LIBDIR),) -ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/') -ifeq ($(ARCHBSZ),64b) - LIBDIR = lib64 -else - LIBDIR = lib -endif -endif +LIBDIR = lib because on NetBSD native libs always go in lib, and we put emulated (other arch that can be run, so i386 on amd64 is considered emulated) in /emul/foo. As I understand it this is true on other BSDs, Solaris, and probably things like AIX and IRIX. So I would suggest that this be guarded with an "if linux". Perhaps there are other systems that also want lib64. 3) namespace visibility In src/lib/srdb1/db_ut.c there is some complicated namespace visibility macro use, to ensure strptime is vailable. Then after setting one, there are others to recover from that. On NetBSD, it didn't recover. I ripped it all out and +#define _NETBSD_SOURCE +#include <sys/types.h> which isn't right either of course. What I'd suggest is to avoid any namespace mucking except on a particular system and version of that system known to need it, as mostly things seem to go better with no visibility definitions. I also have found problems with changing the visibility defines, running into a situation where one header hid something but then later when it shouldn't have been some other header wanted to include the first header, but it had already been processed. And, the code as is doens't seem to undo the defines after including, even though it seems to try to. Thanks for any hints, Greg

2 1

pthread mutex and openssl 1.1
by Greg Troxel 17 Mar '20

17 Mar '20

My next issue in the NetBSD build is about mutexes. I gather this is very much about openssl 1.1, and all of this is only about non-Linux since there futexes are used. (pkgsrc has switched to openssl 1.1 basically the beginning of 2020.) I am guessing that the basic issue is that the pthread mutexes are placed in shared memory and used from multiple processes, and that regardless of setting attributes, the point is that these need to work in that environment, and if not, some other synchronization scheme needs to be chosen. And, I gather the problem is lack of a wakeup on release to blocked threads in other processes. Close? There is -DKSR_PTHREAD_MUTEX_SHARED defined: ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1) CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED LD_PMUTEX_OPTS = -pthread -rdynamic -Wl,-Bsymbolic-functions else CC_PMUTEX_OPTS = LD_PMUTEX_OPTS = endif and this seems to get turned on regardless of which mutex option an OS uses. Later, in the netbsd if chunk ifneq ($(found_lock_method), yes) C_DEFS+= -DUSE_SYSV_SEM # try pthread sems found_lock_method=yes but then -DKSR_PTHREAD_MUTEX_SHARED is still on, and the code that usss pthread_mutexattr_setpshared is compiled in. I am thinking it might not be used, because of SYSV_SEM. (Btw, the check for NetBSD > 2.0.0 and kqueue can be removed; we support only 8 and 9 now, and while I don't like to gratuitously desupport older versions, I really doubt current kamailo would build on anything earlier than 6 anyway. Similar for FreeBSD probably, but I don't want to speak for them.) Thanks, Greg

1 1

git:master:19c6f596: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 16 Mar '20

16 Mar '20

Module: kamailio Branch: master Commit: 19c6f596f1daf246c0f77236ecf0016bfc3c81a2 URL: https://github.com/kamailio/kamailio/commit/19c6f596f1daf246c0f77236ecf0016… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-16T16:01:17+01:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/19c6f596f1daf246c0f77236ecf0016… Patch: https://github.com/kamailio/kamailio/commit/19c6f596f1daf246c0f77236ecf0016… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index c04e890fdf..84a7c37eba 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -619,18 +619,19 @@ modparam("p_usrloc", "default_db_type", "cluster") 3.25. db_ops_ruid (int) - If set to 1, database queries for update or delete are done using ruid - value. If it is set to 0, the old style using aor, contact and call-id - is done. + Defines how database queries are done: + * 0 uses the old style using aor, contact and call-id + * 1 uses ruid value + * 2 uses the new style using aor, contact and call-id - Default value is “0”. + Default value is 0 Can be set at runtime, e.g.: $ kamcmd cfg.set_now_int p_usrloc db_ops_ruid 1 Example 1.25. Set db_ops_ruid parameter ... -modparam("p_usrloc", "db_ops_ruid", 0) +modparam("p_usrloc", "db_ops_ruid", 2) ... 3.26. db_update_as_insert (string)

1 0

Kamailio v5.3.3 Released
by Daniel-Constantin Mierla 16 Mar '20

16 Mar '20

Hello, Kamailio SIP Server v5.3.3 stable release is out. This is a maintenance release of the latest stable branch, 5.3, that includes fixes since the release of v5.3.2. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.3.x. Deployments running previous v5.3.x versions are strongly recommended to be upgraded to v5.3.3. For more details about version 5.3.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2020/03/kamailio-v5-3-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Special circumstances are now everywhere word wide, impacting all of us, therefore we wish a smooth time during this crisis and to stay healthy to all our developers, supporters and community members along with their beloved ones! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

[kamailio/kamailio] p_usrloc: add new update function (#2253)
by Stefan Mititelu 16 Mar '20

16 Mar '20

Add also new "uniq" column. The new update function will use this new column.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2253 -- Commit Summary -- * p_usrloc: add new update function -- File Changes -- M src/modules/p_usrloc/config.c (2) M src/modules/p_usrloc/doc/p_usrloc_admin.xml (27) M src/modules/p_usrloc/p_usrloc_mod.c (4) M src/modules/p_usrloc/p_usrloc_mod.h (1) M src/modules/p_usrloc/ucontact.c (265) M src/modules/usrloc/usrloc.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2253.patch https://github.com/kamailio/kamailio/pull/2253.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/2253

2 9

git:master:d1f525c9: p_usrloc: add new update function
by Stefan Mititelu 16 Mar '20

16 Mar '20

Module: kamailio Branch: master Commit: d1f525c972447e28b21df6bb8a698c682873f26d URL: https://github.com/kamailio/kamailio/commit/d1f525c972447e28b21df6bb8a698c6… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-03-16T16:51:10+02:00 p_usrloc: add new update function Add also new "uniq" column. The new update function will use this new column. --- Modified: src/modules/p_usrloc/config.c Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/location.sql Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ucontact.c Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/d1f525c972447e28b21df6bb8a698c6… Patch: https://github.com/kamailio/kamailio/commit/d1f525c972447e28b21df6bb8a698c6…

1 0

git:5.3:c918a3fc: ChangeLog: content updated for v5.3.2
by Daniel-Constantin Mierla 16 Mar '20

16 Mar '20

Module: kamailio Branch: 5.3 Commit: c918a3fcbf9dd7e697737a54f2b3b95a73b582a9 URL: https://github.com/kamailio/kamailio/commit/c918a3fcbf9dd7e697737a54f2b3b95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-16T14:22:28+01:00 ChangeLog: content updated for v5.3.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/c918a3fcbf9dd7e697737a54f2b3b95… Patch: https://github.com/kamailio/kamailio/commit/c918a3fcbf9dd7e697737a54f2b3b95…

1 0

git:5.3:b3e0db66: Makefile.defs: version set to 5.3.3
by Daniel-Constantin Mierla 16 Mar '20

16 Mar '20

Module: kamailio Branch: 5.3 Commit: b3e0db66d5bee1baccb2343eb891fc28ea8d2dde URL: https://github.com/kamailio/kamailio/commit/b3e0db66d5bee1baccb2343eb891fc2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-16T14:14:28+01:00 Makefile.defs: version set to 5.3.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b3e0db66d5bee1baccb2343eb891fc2… Patch: https://github.com/kamailio/kamailio/commit/b3e0db66d5bee1baccb2343eb891fc2… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index e712e729b5..a4ecc20248 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 3 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

git:5.3:64a9592c: pkg: version set to 5.3.3 for rpm and alpine specs
by Daniel-Constantin Mierla 16 Mar '20

16 Mar '20

Module: kamailio Branch: 5.3 Commit: 64a9592c13fb736078cdb3e3e5979621cbd50151 URL: https://github.com/kamailio/kamailio/commit/64a9592c13fb736078cdb3e3e597962… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-16T13:55:36+01:00 pkg: version set to 5.3.3 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/64a9592c13fb736078cdb3e3e597962… Patch: https://github.com/kamailio/kamailio/commit/64a9592c13fb736078cdb3e3e597962… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 86559d7df7..4f2b286946 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.3.2 +pkgver=5.3.3 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 2e62bc0549..92729b8e82 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.3.2 +%define ver 5.3.3 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020