- sr-dev - kamailio.org

git:master:b09d4852: cfg_rpc: clang format
by Daniel-Constantin Mierla 17 May '21

17 May '21

Module: kamailio Branch: master Commit: b09d485274a06a62264649b9fb20df84c0d6cff9 URL: https://github.com/kamailio/kamailio/commit/b09d485274a06a62264649b9fb20df8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-15T09:19:55+02:00 cfg_rpc: clang format --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/b09d485274a06a62264649b9fb20df8… Patch: https://github.com/kamailio/kamailio/commit/b09d485274a06a62264649b9fb20df8…

1 0

git:master:5d0f147b: pv: added function to set the value for $ccp(key)
by Daniel-Constantin Mierla 17 May '21

17 May '21

Module: kamailio Branch: master Commit: 5d0f147be45495cd836da4656ece5549f9859815 URL: https://github.com/kamailio/kamailio/commit/5d0f147be45495cd836da4656ece554… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-16T12:23:02+02:00 pv: added function to set the value for $ccp(key) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/5d0f147be45495cd836da4656ece554… Patch: https://github.com/kamailio/kamailio/commit/5d0f147be45495cd836da4656ece554… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 16460f9bb3..ea6dab4940 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -540,7 +540,7 @@ static pv_export_t mod_pvs[] = { pv_parse_ksr_attrs_name, 0, 0, 0 }, {{"rpl", (sizeof("rpl")-1)}, PVT_OTHER, pv_get_rpl_attrs, 0, pv_parse_rpl_attrs_name, 0, 0, 0}, - {{"ccp", (sizeof("ccp")-1)}, PVT_OTHER, pv_get_ccp_attrs, 0, + {{"ccp", (sizeof("ccp")-1)}, PVT_OTHER, pv_get_ccp_attrs, pv_set_ccp_attrs, pv_parse_ccp_attrs_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 15ab3acb48..2c4692fecc 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4057,3 +4057,54 @@ int pv_get_ccp_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("unknown type for variable [%.*s]\n", s.len, s.s); return pv_get_null(msg, param, res); } + +/** + * + */ +int pv_set_ccp_attrs(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + str gname = STR_NULL; + str vname = STR_NULL; + unsigned int *grpid = NULL; + str s = STR_NULL; + char *sep = NULL; + + if(val == NULL || (val->flags&PV_VAL_NULL)) { + LM_WARN("ignoring null asignment\n"); + return 0; + } + + s = param->pvn.u.isname.name.s; + + sep = q_memrchr(s.s, '.', s.len); + if(sep==NULL) { + LM_ERR("invalid pv name [%.*s]\n", s.len, s.s); + return -1; + } + gname.s = s.s; + gname.len = sep - s.s; + vname.s = sep + 1; + vname.len = s.s + s.len - sep - 1; + + if (cfg_get_group_id(&gname, &grpid)) { + LM_ERR("wrong group syntax. Use either 'group', or 'group[id]'\n"); + return -1; + } + + LM_DBG("setting value for variable: %.*s.%.*s\n", gname.len, gname.s, + vname.len, vname.s); + + if(val->flags&PV_TYPE_INT) { + if(cfg_set_now_int(_pv_ccp_ctx, &gname, grpid, &vname, val->ri)) { + LM_ERR("failed to set int to the variable: [%.*s]\n", s.len, s.s); + return -1; + } + } else { + if(cfg_set_now_str(_pv_ccp_ctx, &gname, grpid, &vname, &val->rs)) { + LM_ERR("failed to set str to the variable: [%.*s]\n", s.len, s.s); + return -1; + } + } + return 0; +} diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 70ef3f155c..359fabf850 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -402,6 +402,8 @@ int pv_ccp_ctx_init(void); int pv_parse_ccp_attrs_name(pv_spec_p sp, str *in); int pv_get_ccp_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_set_ccp_attrs(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); #endif

1 0

git:master:4752ad43: secsipid: clod dlopen handle on mod destroy
by Daniel-Constantin Mierla 17 May '21

17 May '21

Module: kamailio Branch: master Commit: 4752ad434c087ac3b11968e5241c61e9e1f903aa URL: https://github.com/kamailio/kamailio/commit/4752ad434c087ac3b11968e5241c61e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-17T08:08:20+02:00 secsipid: clod dlopen handle on mod destroy --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4752ad434c087ac3b11968e5241c61e… Patch: https://github.com/kamailio/kamailio/commit/4752ad434c087ac3b11968e5241c61e… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 7553e8ede7..30357a235e 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -38,6 +38,8 @@ MODULE_VERSION +static void *_secsipid_dlhandle = NULL; + static int secsipid_expire = 300; static int secsipid_timeout = 5; @@ -107,6 +109,10 @@ struct module_exports exports = { */ static int mod_init(void) { + if(_secsipid_dlhandle!=0) { + dlclose(_secsipid_dlhandle); + _secsipid_dlhandle = NULL; + } return 0; } @@ -115,7 +121,6 @@ static int mod_init(void) */ static int child_init(int rank) { - void *handle = NULL; char *errstr = NULL; char *modpath = NULL; secsipid_proc_bind_f bind_f = NULL; @@ -135,16 +140,16 @@ static int child_init(int rank) /* for openbsd */ #define RTLD_NOW DL_LAZY #endif - handle = dlopen(modpath, RTLD_NOW); /* resolve all symbols now */ - if (handle==0) { + _secsipid_dlhandle = dlopen(modpath, RTLD_NOW); /* resolve all symbols now */ + if (_secsipid_dlhandle==0) { LM_ERR("could not open module <%s>: %s\n", modpath, dlerror()); goto error; } /* launch register */ - bind_f = (secsipid_proc_bind_f)dlsym(handle, "secsipid_proc_bind"); + bind_f = (secsipid_proc_bind_f)dlsym(_secsipid_dlhandle, "secsipid_proc_bind"); if (((errstr=(char*)dlerror())==NULL) && bind_f!=NULL) { /* version control */ - if (!ksr_version_control(handle, modpath)) { + if (!ksr_version_control(_secsipid_dlhandle, modpath)) { goto error; } /* no error - call it */

1 0

git:master:061a66f8: cfg_rpc: removed history and svn id
by Daniel-Constantin Mierla 17 May '21

17 May '21

Module: kamailio Branch: master Commit: 061a66f88a91bc3e05224ef95043ebe4fec16dd1 URL: https://github.com/kamailio/kamailio/commit/061a66f88a91bc3e05224ef95043ebe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-15T08:58:27+02:00 cfg_rpc: removed history and svn id --- Modified: src/modules/cfg_rpc/Makefile Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/061a66f88a91bc3e05224ef95043ebe… Patch: https://github.com/kamailio/kamailio/commit/061a66f88a91bc3e05224ef95043ebe… --- diff --git a/src/modules/cfg_rpc/Makefile b/src/modules/cfg_rpc/Makefile index a7a980d873..d4e58b4c92 100644 --- a/src/modules/cfg_rpc/Makefile +++ b/src/modules/cfg_rpc/Makefile @@ -1,5 +1,5 @@ # cfg_rpc module makefile -# +# # WARNING: do not run this directly, it should be run by the main Makefile include ../../Makefile.defs diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index e31429f713..30c72e6083 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2007 iptelorg GmbH * * This file is part of ser, a free SIP server. @@ -24,9 +22,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History - * ------- - * 2007-12-03 Initial version (Miklos) */ #include "../../core/sr_module.h"

1 0

git:master:696d5b90: pv: added $ccp(gname.vname) variable
by Daniel-Constantin Mierla 14 May '21

14 May '21

Module: kamailio Branch: master Commit: 696d5b909f02fa34ccdc0b388dcaac7381eb32ca URL: https://github.com/kamailio/kamailio/commit/696d5b909f02fa34ccdc0b388dcaac7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-14T10:41:29+02:00 pv: added $ccp(gname.vname) variable - get the config custom parameter value - direct access without running through select variable --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/696d5b909f02fa34ccdc0b388dcaac7… Patch: https://github.com/kamailio/kamailio/commit/696d5b909f02fa34ccdc0b388dcaac7…

1 0

git:master:899a1048: core: cfg - added cfg_get_group_id to the config var framework api
by Daniel-Constantin Mierla 14 May '21

14 May '21

Module: kamailio Branch: master Commit: 899a10489e14a834267fcfbba36cc5aacdf45633 URL: https://github.com/kamailio/kamailio/commit/899a10489e14a834267fcfbba36cc5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-14T10:32:31+02:00 core: cfg - added cfg_get_group_id to the config var framework api --- Modified: src/core/cfg/cfg.c Modified: src/core/cfg/cfg.h --- Diff: https://github.com/kamailio/kamailio/commit/899a10489e14a834267fcfbba36cc5a… Patch: https://github.com/kamailio/kamailio/commit/899a10489e14a834267fcfbba36cc5a… --- diff --git a/src/core/cfg/cfg.c b/src/core/cfg/cfg.c index 488d72f35a..80e3fe3e55 100644 --- a/src/core/cfg/cfg.c +++ b/src/core/cfg/cfg.c @@ -285,3 +285,39 @@ void **cfg_get_handle(char *gname) return group->handle; } + + +/* Set the group_id pointer based on the group string. + * The string is either "group_name", or "group_name[group_id]" + * *group_id is set to null in the former case. + * Warning: changes the group string + */ +int cfg_get_group_id(str *group, unsigned int **group_id) +{ + static unsigned int id; + str s; + + if (!group->s || (group->s[group->len-1] != ']')) { + *group_id = NULL; + return 0; + } + + s.s = group->s + group->len - 2; + s.len = 0; + while ((s.s > group->s) && (*s.s != '[')) { + s.s--; + s.len++; + } + if (s.s == group->s) /* '[' not found */ + return -1; + group->len = s.s - group->s; + s.s++; + if (!group->len || !s.len) + return -1; + if (str2int(&s, &id)) + return -1; + + *group_id = &id; + return 0; +} + diff --git a/src/core/cfg/cfg.h b/src/core/cfg/cfg.h index b3c5a1ba29..19cb824055 100644 --- a/src/core/cfg/cfg.h +++ b/src/core/cfg/cfg.h @@ -102,4 +102,7 @@ int cfg_new_ginst(char *group_name, unsigned int group_id); /*! \brief returns the handle of a cfg group */ void **cfg_get_handle(char *gname); +/*! \brief get the id of a cfg group */ +int cfg_get_group_id(str *group, unsigned int **group_id); + #endif /* _CFG_H */

1 0

git:master:9fcb5710: cfg-rpc: get_group_id() pints to cfg_get_group_id()
by Daniel-Constantin Mierla 14 May '21

14 May '21

Module: kamailio Branch: master Commit: 9fcb5710e01b61c91df85bcf144cbda68b730ae0 URL: https://github.com/kamailio/kamailio/commit/9fcb5710e01b61c91df85bcf144cbda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-14T10:33:33+02:00 cfg-rpc: get_group_id() pints to cfg_get_group_id() --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/9fcb5710e01b61c91df85bcf144cbda… Patch: https://github.com/kamailio/kamailio/commit/9fcb5710e01b61c91df85bcf144cbda… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index 2cab2a47cd..e31429f713 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -54,34 +54,7 @@ static int mod_init(void) * *group_id is set to null in the former case. * Warning: changes the group string */ -static int get_group_id(str *group, unsigned int **group_id) -{ - static unsigned int id; - str s; - - if (!group->s || (group->s[group->len-1] != ']')) { - *group_id = NULL; - return 0; - } - - s.s = group->s + group->len - 2; - s.len = 0; - while ((s.s > group->s) && (*s.s != '[')) { - s.s--; - s.len++; - } - if (s.s == group->s) /* '[' not found */ - return -1; - group->len = s.s - group->s; - s.s++; - if (!group->len || !s.len) - return -1; - if (str2int(&s, &id)) - return -1; - - *group_id = &id; - return 0; -} +#define get_group_id(group, group_id) cfg_get_group_id(group, group_id) static const char* rpc_set_now_doc[2] = { "Set the value of a configuration variable and commit the change immediately",

1 0

[kamailio/kamailio] is_first_hop() not processing FQDN in RR header in a case of reply (#2732)
by Igor Olhovskiy 13 May '21

13 May '21

### Description In the case of using FQDN in `listen = ... advertise ... ` FQDN is populated in the `Record-Route` header. In this case `is_first_hop()` function is not returning true even if `FQDN == myself` in replies. #### Reproduction Add FQND in advertise and check `is_first_hop()` result in a case of reply #### Log Messages ``` siputils [sipops.c:185]: is_first_hop(): uri host is not an ip address ``` ### Possible Solutions Not use `is_first_hop()` in the case of reply/FQDN in advertising. ### Additional Information version: kamailio 5.4.4 (x86_64/linux) e16352 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: e16352 compiled on 09:50:10 May 7 2021 with gcc 4.8.5 * **Operating System**: ``` # uname -a Linux fe-0513-2-dev 3.10.0-1160.21.1.el7.x86_64 #1 SMP Tue Mar 16 18:28:22 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ``` https://github.com/kamailio/kamailio/blob/02240711239149e2f5c4890a70ab158d1… -- 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/issues/2732

2 4

[kamailio/kamailio] Topos: critical error after upgrade to 5.5 (#2734)
by Boris Korzun 13 May '21

13 May '21

### Description I've faced a critical error in the log after upgrade to 5.5 on _topos_ module. ### Troubleshooting It looks like _ki_tps_set_context()_ tries to free incorrectly defined variable __tps_context_value_. #### Reproduction ``` loadmodule "topos.so" modparam("topos", "storage", "db") modparam("topos", "db_url", DBURL_PRIMARY) modparam("topos", "sanity_checks", 1) modparam("topos", "branch_expire", 300) modparam("topos", "dialog_expire", 7200) modparam("topos", "clean_interval", 120) ``` #### Log Messages ``` 20:59:43.951476 kamailio 81412 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 20:59:58.925224 kamailio 81413 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:13.930896 kamailio 81414 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:28.929303 kamailio 81415 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:43.925256 kamailio 81416 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:00:58.925535 kamailio 81417 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:01:13.925081 kamailio 81418 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring 21:01:28.925306 kamailio 81419 CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x82310fbdc (out of memory block!) called from topos: topos_mod.c: ki_tps_set_context(315) - ignoring ``` ### Additional Information ``` version: kamailio 5.5.0 (x86_64/freebsd) d4c1a1 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: d4c1a1 compiled on 13:02:36 May 13 2021 with cc FreeBSD clang version 10.0.1 (git@github.com:llvm/llvm-project.git llvmorg-10.0.1-0-gef32c611aa2) ``` * **Operating System**: FreeBSD 13 -- 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/issues/2734

2 2

git:5.5:6a5a61bf: core: xavp - safety checks for name len
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: 5.5 Commit: 6a5a61bfab80116338f6a9c91ed7ec5f7b98923b URL: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:55:06+02:00 core: xavp - safety checks for name len (cherry picked from commit d22d812da1c3b2a2f65f142ef5ed5fa07e8ab072) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… Patch: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index b11b99929d..036a5ffbe1 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -106,7 +106,7 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_raw(name->s, name->len); @@ -427,7 +427,7 @@ static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_raw(name->s, name->len); @@ -498,7 +498,7 @@ int xavp_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_raw(name->s, name->len); @@ -865,7 +865,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avp = *list; if(avp!=NULL) { @@ -1157,7 +1157,7 @@ static sr_xavp_t *xavu_get_internal(str *name, sr_xavp_t **list, sr_xavp_t **prv sr_xavp_t *avu; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return NULL; } @@ -1235,7 +1235,7 @@ int xavu_rm_by_name(str *name, sr_xavp_t **head) unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return -1; } @@ -1579,7 +1579,7 @@ static sr_xavp_t *xavi_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1812,7 +1812,7 @@ static sr_xavp_t *xavi_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1939,7 +1939,7 @@ static int xavi_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_case_raw(name->s, name->len); @@ -2022,7 +2022,7 @@ int xavi_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_case_raw(name->s, name->len); @@ -2315,7 +2315,7 @@ sr_xavp_t *xavi_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avi = *list; if(avi!=NULL) {

1 0

git:5.5:d2fd064a: topos: init xavp and context modparams to str null
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: 5.5 Commit: d2fd064af771df2ffe6c7a78c05d75facdfa50bf URL: https://github.com/kamailio/kamailio/commit/d2fd064af771df2ffe6c7a78c05d75f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:55:14+02:00 topos: init xavp and context modparams to str null (cherry picked from commit 5e3f7e1557d90a3e6f40eff41cc0b0bb317ab544) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d2fd064af771df2ffe6c7a78c05d75f… Patch: https://github.com/kamailio/kamailio/commit/d2fd064af771df2ffe6c7a78c05d75f… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index ba58920a6c..498cc8defe 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -107,13 +107,13 @@ str _tps_contact_host = str_init(""); int _tps_contact_mode = 0; str _tps_cparam_name = str_init("tps"); -str _tps_xavu_cfg = str_init(""); -str _tps_xavu_field_acontact = str_init(""); -str _tps_xavu_field_bcontact = str_init(""); -str _tps_xavu_field_contact_host = str_init(""); +str _tps_xavu_cfg = STR_NULL; +str _tps_xavu_field_acontact = STR_NULL; +str _tps_xavu_field_bcontact = STR_NULL; +str _tps_xavu_field_contact_host = STR_NULL; -str _tps_context_param = str_init(""); -str _tps_context_value = str_init(""); +str _tps_context_param = STR_NULL; +str _tps_context_value = STR_NULL; sanity_api_t scb; @@ -247,7 +247,8 @@ static int mod_init(void) if(sruid_init(&_tps_sruid, '-', "tpsh", SRUID_INC)<0) return -1; - if (_tps_contact_mode == 2 && (_tps_xavu_field_acontact.len <= 0 + if (_tps_contact_mode == 2 && (_tps_xavu_cfg.len <= 0 + || _tps_xavu_field_acontact.len <= 0 || _tps_xavu_field_bcontact.len <= 0)) { LM_ERR("contact_mode parameter is 2," " but a_contact or b_contact xavu fields not defined\n");

1 0

git:5.5:5bc7e1d6: presence: set correct type for local_log_facility modparam
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: 5.5 Commit: 5bc7e1d636b617839f697838e326347b19cb0fcc URL: https://github.com/kamailio/kamailio/commit/5bc7e1d636b617839f697838e326347… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:54:57+02:00 presence: set correct type for local_log_facility modparam (cherry picked from commit 5f4662a95a97d5224bf03745a9a354a41925706c) --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5bc7e1d636b617839f697838e326347… Patch: https://github.com/kamailio/kamailio/commit/5bc7e1d636b617839f697838e326347… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 301113aa03..09751bbc15 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -232,7 +232,7 @@ static param_export_t params[]={ { "fetch_rows", INT_PARAM, &pres_fetch_rows}, { "db_table_lock_type", INT_PARAM, &pres_db_table_lock_type}, { "local_log_level", PARAM_INT, &pres_local_log_level}, - { "local_log_facility", PARAM_STR, &pres_log_facility_str}, + { "local_log_facility", PARAM_STRING, &pres_log_facility_str}, { "subs_remove_match", PARAM_INT, &pres_subs_remove_match}, { "xavp_cfg", PARAM_STR, &pres_xavp_cfg}, { "retrieve_order", PARAM_INT, &pres_retrieve_order},

1 0

git:master:5e3f7e15: topos: init xavp and context modparams to str null
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: master Commit: 5e3f7e1557d90a3e6f40eff41cc0b0bb317ab544 URL: https://github.com/kamailio/kamailio/commit/5e3f7e1557d90a3e6f40eff41cc0b0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:53:18+02:00 topos: init xavp and context modparams to str null --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5e3f7e1557d90a3e6f40eff41cc0b0b… Patch: https://github.com/kamailio/kamailio/commit/5e3f7e1557d90a3e6f40eff41cc0b0b… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index ba58920a6c..498cc8defe 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -107,13 +107,13 @@ str _tps_contact_host = str_init(""); int _tps_contact_mode = 0; str _tps_cparam_name = str_init("tps"); -str _tps_xavu_cfg = str_init(""); -str _tps_xavu_field_acontact = str_init(""); -str _tps_xavu_field_bcontact = str_init(""); -str _tps_xavu_field_contact_host = str_init(""); +str _tps_xavu_cfg = STR_NULL; +str _tps_xavu_field_acontact = STR_NULL; +str _tps_xavu_field_bcontact = STR_NULL; +str _tps_xavu_field_contact_host = STR_NULL; -str _tps_context_param = str_init(""); -str _tps_context_value = str_init(""); +str _tps_context_param = STR_NULL; +str _tps_context_value = STR_NULL; sanity_api_t scb; @@ -247,7 +247,8 @@ static int mod_init(void) if(sruid_init(&_tps_sruid, '-', "tpsh", SRUID_INC)<0) return -1; - if (_tps_contact_mode == 2 && (_tps_xavu_field_acontact.len <= 0 + if (_tps_contact_mode == 2 && (_tps_xavu_cfg.len <= 0 + || _tps_xavu_field_acontact.len <= 0 || _tps_xavu_field_bcontact.len <= 0)) { LM_ERR("contact_mode parameter is 2," " but a_contact or b_contact xavu fields not defined\n");

1 0

git:master:46080a1f: pv: added $rpl(cntrr) - count record-route headers in reply
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: master Commit: 46080a1f2c8aca4e9b187d62f0c3e74e0e29f3ad URL: https://github.com/kamailio/kamailio/commit/46080a1f2c8aca4e9b187d62f0c3e74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T10:49:19+02:00 pv: added $rpl(cntrr) - count record-route headers in reply --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/46080a1f2c8aca4e9b187d62f0c3e74… Patch: https://github.com/kamailio/kamailio/commit/46080a1f2c8aca4e9b187d62f0c3e74… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 472c63f205..0493c23c08 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -41,6 +41,7 @@ #include "../../core/parser/parse_hname2.h" #include "../../core/parser/parse_content.h" #include "../../core/parser/parse_refer_to.h" +#include "../../core/parser/parse_rr.h" #include "../../core/parser/parse_rpid.h" #include "../../core/parser/parse_diversion.h" #include "../../core/parser/parse_ppi_pai.h" @@ -3773,6 +3774,8 @@ int pv_parse_rpl_attrs_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 1; else if(strncmp(in->s, "dport", 5)==0) sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "cntrr", 5)==0) + sp->pvp.pvn.u.isname.name.n = 21; else goto error; break; case 6: @@ -3813,6 +3816,7 @@ int pv_get_rpl_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) str sproto = STR_NULL; unsigned int port = 0; hdr_field_t *hf = NULL; + unsigned int hcnt = 0; if(param==NULL) { return pv_get_null(msg, param, res); @@ -3877,18 +3881,37 @@ int pv_get_rpl_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 20: /* count of via */ if (parse_headers(msg, HDR_EOH_F, 0)<0) { LM_DBG("failed to parse sip headers\n"); - return pv_get_uintval(msg, param, res, 0); + return pv_get_null(msg, param, res); } - port = 0; + hcnt = 0; for(hf=msg->h_via1; hf!=NULL; hf=hf->next) { if(hf->type==HDR_VIA_T) { via_body_t *vb; for(vb=(via_body_t*)hf->parsed; vb!=NULL; vb=vb->next) { - port++; + hcnt++; } } } - return pv_get_uintval(msg, param, res, port); + return pv_get_uintval(msg, param, res, hcnt); + case 21: /* count of record-route */ + if (parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_DBG("failed to parse sip headers\n"); + return pv_get_null(msg, param, res); + } + hcnt = 0; + for(hf=msg->h_via1; hf!=NULL; hf=hf->next) { + if(hf->type == HDR_RECORDROUTE_T) { + rr_t *rrb; + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + for(rrb=(rr_t*)hf->parsed; rrb!=NULL; rrb=rrb->next) { + hcnt++; + } + } + } + return pv_get_uintval(msg, param, res, hcnt); default: return pv_get_null(msg, param, res);

1 0

git:master:d22d812d: core: xavp - safety checks for name len
by Daniel-Constantin Mierla 13 May '21

13 May '21

Module: kamailio Branch: master Commit: d22d812da1c3b2a2f65f142ef5ed5fa07e8ab072 URL: https://github.com/kamailio/kamailio/commit/d22d812da1c3b2a2f65f142ef5ed5fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:41:40+02:00 core: xavp - safety checks for name len --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/d22d812da1c3b2a2f65f142ef5ed5fa… Patch: https://github.com/kamailio/kamailio/commit/d22d812da1c3b2a2f65f142ef5ed5fa… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index b11b99929d..036a5ffbe1 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -106,7 +106,7 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_raw(name->s, name->len); @@ -427,7 +427,7 @@ static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_raw(name->s, name->len); @@ -498,7 +498,7 @@ int xavp_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_raw(name->s, name->len); @@ -865,7 +865,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avp = *list; if(avp!=NULL) { @@ -1157,7 +1157,7 @@ static sr_xavp_t *xavu_get_internal(str *name, sr_xavp_t **list, sr_xavp_t **prv sr_xavp_t *avu; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return NULL; } @@ -1235,7 +1235,7 @@ int xavu_rm_by_name(str *name, sr_xavp_t **head) unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return -1; } @@ -1579,7 +1579,7 @@ static sr_xavp_t *xavi_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1812,7 +1812,7 @@ static sr_xavp_t *xavi_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1939,7 +1939,7 @@ static int xavi_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_case_raw(name->s, name->len); @@ -2022,7 +2022,7 @@ int xavi_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_case_raw(name->s, name->len); @@ -2315,7 +2315,7 @@ sr_xavp_t *xavi_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avi = *list; if(avi!=NULL) {

1 0

git:master:5f4662a9: presence: set correct type for local_log_facility modparam
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: master Commit: 5f4662a95a97d5224bf03745a9a354a41925706c URL: https://github.com/kamailio/kamailio/commit/5f4662a95a97d5224bf03745a9a354a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T18:14:29+02:00 presence: set correct type for local_log_facility modparam --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5f4662a95a97d5224bf03745a9a354a… Patch: https://github.com/kamailio/kamailio/commit/5f4662a95a97d5224bf03745a9a354a… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 301113aa03..09751bbc15 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -232,7 +232,7 @@ static param_export_t params[]={ { "fetch_rows", INT_PARAM, &pres_fetch_rows}, { "db_table_lock_type", INT_PARAM, &pres_db_table_lock_type}, { "local_log_level", PARAM_INT, &pres_local_log_level}, - { "local_log_facility", PARAM_STR, &pres_log_facility_str}, + { "local_log_facility", PARAM_STRING, &pres_log_facility_str}, { "subs_remove_match", PARAM_INT, &pres_subs_remove_match}, { "xavp_cfg", PARAM_STR, &pres_xavp_cfg}, { "retrieve_order", PARAM_INT, &pres_retrieve_order},

1 0

git:5.5:9fe76d00: secsipid: docs - set GO111MODULE=off in installation example
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: 5.5 Commit: 9fe76d00f32aa3adfb0bfb2c7cbe325681089037 URL: https://github.com/kamailio/kamailio/commit/9fe76d00f32aa3adfb0bfb2c7cbe325… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:52+02:00 secsipid: docs - set GO111MODULE=off in installation example (cherry picked from commit ecc8a34dae44883b125ae7a3da59d4a332e0b48c) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9fe76d00f32aa3adfb0bfb2c7cbe325… Patch: https://github.com/kamailio/kamailio/commit/9fe76d00f32aa3adfb0bfb2c7cbe325… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index d9d622af17..1e22e371fb 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -318,7 +318,7 @@ request_route { <section id="secsipid.s.installation"> <title>Installation</title> <para> - The module needs "secsipdi_proc.so" module thatdepends on "libsecsipid", + The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is implemented in Go language, with generated C API and library. Until the @@ -334,6 +334,7 @@ request_route { <title>Libsecsipid Usage</title> <programlisting format="linespecific"> ... +export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba @@ -351,6 +352,10 @@ make install ... </programlisting> </example> + <para> + For more details about compilation and installation of libsecsipid, see: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> </section> </chapter>

1 0

git:5.5:b57ab055: usrloc: unnecessary periodic db queries cancelled
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: 5.5 Commit: b57ab05589b1982df456b39bf8f26359e73a63cc URL: https://github.com/kamailio/kamailio/commit/b57ab05589b1982df456b39bf8f2635… Author: korayvt <koray.vatansever(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:14+02:00 usrloc: unnecessary periodic db queries cancelled (cherry picked from commit 42bc79b3b617632b6f83e1352b5cb8266706d7c0) --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/b57ab05589b1982df456b39bf8f2635… Patch: https://github.com/kamailio/kamailio/commit/b57ab05589b1982df456b39bf8f2635… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 44ce3c6376..252bb8bde0 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -960,7 +960,9 @@ int synchronize_all_udomains(int istart, int istep) res |= db_timer_udomain(ptr->d); } } - ul_ka_db_records((unsigned int)istart); + if (ul_ka_mode != ULKA_NONE) { + ul_ka_db_records((unsigned int)istart); + } } else { for( ptr=_ksr_ul_root ; ptr ; ptr=ptr->next) { mem_timer_udomain(ptr->d, istart, istep); diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 9d96b2d7a6..204ddfd29f 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -1094,8 +1094,10 @@ int db_timer_udomain(udomain_t* _d) db_val_t vals[3]; int key_num = 2; - /* call contact expired call back for a domain before deleting database rows */ - udomain_contact_expired_cb(ul_dbh, _d); + /* If contact-expired callback exists, run it for a domain before deleting database rows */ + if (exists_ulcb_type(UL_CONTACT_EXPIRE)) { + udomain_contact_expired_cb(ul_dbh, _d); + } keys[0] = &ul_expires_col; ops[0] = "<";

1 0

git:5.5:c1fad6fd: tcpops: use fixup_igp_all() instead of fixup_igp_null()
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: 5.5 Commit: c1fad6fd1c05e86f974c3771ba246ee2e05abf45 URL: https://github.com/kamailio/kamailio/commit/c1fad6fd1c05e86f974c3771ba246ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:26+02:00 tcpops: use fixup_igp_all() instead of fixup_igp_null() - needed for functions with many parameters (cherry picked from commit 02240711239149e2f5c4890a70ab158d10fa8187) --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c1fad6fd1c05e86f974c3771ba246ee… Patch: https://github.com/kamailio/kamailio/commit/c1fad6fd1c05e86f974c3771ba246ee… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index b2d2fbe7dd..23036fd771 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -78,27 +78,27 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, - fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime2, 2, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime1, 1, - fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event1, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_conid_state", (cmd_function)w_tcp_conid_state, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_get_conid", (cmd_function)w_tcp_get_conid, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"tcp_conid_alive", (cmd_function)w_tcp_conid_alive, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid", (cmd_function)w_tcp_set_otcpid, 1, fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1,

1 0

git:5.5:6d71c939: dialog: ignore 408 on keepalive with cseq 0
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: 5.5 Commit: 6d71c9399027f2ed41cd6eae576d862440bd4fd4 URL: https://github.com/kamailio/kamailio/commit/6d71c9399027f2ed41cd6eae576d862… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:05+02:00 dialog: ignore 408 on keepalive with cseq 0 - some UAs do not reply at all (cherry picked from commit 7aa8056a5e3a9804133cb9ff79640d8116be63da) --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/6d71c9399027f2ed41cd6eae576d862… Patch: https://github.com/kamailio/kamailio/commit/6d71c9399027f2ed41cd6eae576d862… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index d48d139965..809834527f 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -271,6 +271,12 @@ void dlg_ka_cb_all(struct cell* t, int type, struct tmcb_params* ps, int dir) LM_DBG("skip updating non-confirmed dialogs\n"); goto done; } + if(ps->code==408 && (dlg->cseq[dir].len==0 + || (dlg->cseq[dir].len==1 && dlg->cseq[dir].s[0]=='\0'))) { + LM_DBG("ignore 408 for %s cseq 0\n", + ((dir==DLG_CALLER_LEG)?"caller":"callee")); + goto done; + } tend = 0; if(dir==DLG_CALLER_LEG) { dlg->ka_src_counter++;

1 0

git:master:c441c922: pv: added $rpl(key) variable
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: master Commit: c441c9226635fb825096080029be7ba2d3ba8132 URL: https://github.com/kamailio/kamailio/commit/c441c9226635fb825096080029be7ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T13:14:12+02:00 pv: added $rpl(key) variable - return attributes of the sip reply that is processed at that moment - the key can be: - duri - SIP URI corresponding to the destination address where the reply is going to be sent based on 2nd via - dhost - host part of duri - dport - port part of duri - dproto - proto of duri - dprotoid - proto id of duri - cntvia - number of via header bodies --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/c441c9226635fb825096080029be7ba… Patch: https://github.com/kamailio/kamailio/commit/c441c9226635fb825096080029be7ba…

1 0

git:master:600c2cf5: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 12 May '21

12 May '21

Module: kamailio Branch: master Commit: 600c2cf5c7349fc924b53199280baba8bdd329e7 URL: https://github.com/kamailio/kamailio/commit/600c2cf5c7349fc924b53199280baba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-12T08:46:14+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/600c2cf5c7349fc924b53199280baba… Patch: https://github.com/kamailio/kamailio/commit/600c2cf5c7349fc924b53199280baba… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index c96b7830c6..b42915943b 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -299,7 +299,7 @@ request_route { 5. Installation - The module needs "secsipdi_proc.so" module thatdepends on + The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is implemented in Go language, with generated C API and library. Until the libsecsipid is @@ -313,6 +313,7 @@ request_route { Example 1.11. Libsecsipid Usage ... +export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba @@ -328,3 +329,6 @@ make install # make modules modules=src/modules/secsipid_proc # make modules modules=src/modules/secsipid ... + + For more details about compilation and installation of libsecsipid, + see: https://github.com/asipto/secsipidx.

1 0

git:master:ecc8a34d: secsipid: docs - set GO111MODULE=off in installation example
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: master Commit: ecc8a34dae44883b125ae7a3da59d4a332e0b48c URL: https://github.com/kamailio/kamailio/commit/ecc8a34dae44883b125ae7a3da59d4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T08:32:37+02:00 secsipid: docs - set GO111MODULE=off in installation example --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ecc8a34dae44883b125ae7a3da59d4a… Patch: https://github.com/kamailio/kamailio/commit/ecc8a34dae44883b125ae7a3da59d4a… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index d9d622af17..1e22e371fb 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -318,7 +318,7 @@ request_route { <section id="secsipid.s.installation"> <title>Installation</title> <para> - The module needs "secsipdi_proc.so" module thatdepends on "libsecsipid", + The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is implemented in Go language, with generated C API and library. Until the @@ -334,6 +334,7 @@ request_route { <title>Libsecsipid Usage</title> <programlisting format="linespecific"> ... +export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba @@ -351,6 +352,10 @@ make install ... </programlisting> </example> + <para> + For more details about compilation and installation of libsecsipid, see: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> </section> </chapter>

1 0

git:master:71d7d583: core: kemi - exported KSR.pv.geti("pv")
by Daniel-Constantin Mierla 12 May '21

12 May '21

Module: kamailio Branch: master Commit: 71d7d5835dd256201f50d14d7c7285f7d2881bb6 URL: https://github.com/kamailio/kamailio/commit/71d7d5835dd256201f50d14d7c7285f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T08:15:33+02:00 core: kemi - exported KSR.pv.geti("pv") - return integer value of the pv, trying to convert if its value is string --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/71d7d5835dd256201f50d14d7c7285f… Patch: https://github.com/kamailio/kamailio/commit/71d7d5835dd256201f50d14d7c7285f… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 0932339996..324e7cd6cf 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2855,6 +2855,47 @@ static sr_kemi_xval_t* sr_kemi_pv_getvn (sip_msg_t *msg, str *pvn, int xival) return sr_kemi_pv_get_valx (msg, pvn, NULL, xival, 1); } +/** + * + */ +static int sr_kemi_pv_geti (sip_msg_t *msg, str *pvn) +{ + pv_spec_t *pvs; + pv_value_t val; + int vi; + + LM_DBG("pv get: %.*s\n", pvn->len, pvn->s); + vi = pv_locate_name(pvn); + if(vi != pvn->len) { + LM_WARN("invalid pv [%.*s] (%d/%d)\n", pvn->len, pvn->s, vi, pvn->len); + return 0; + } + pvs = pv_cache_get(pvn); + if(pvs==NULL) { + LM_WARN("cannot get pv spec for [%.*s]\n", pvn->len, pvn->s); + return 0; + } + + memset(&val, 0, sizeof(pv_value_t)); + if(pv_get_spec_value(msg, pvs, &val) != 0) { + LM_WARN("unable to get pv value for [%.*s]\n", pvn->len, pvn->s); + return 0; + } + if(val.flags&PV_VAL_NULL) { + return 0; + } + if(val.flags&(PV_TYPE_INT|PV_VAL_INT)) { + return val.ri; + } + if(val.ri!=0) { + return val.ri; + } + vi = 0; + str2sint(&val.rs, &vi); + + return vi; +} + /** * */ @@ -3003,6 +3044,11 @@ static sr_kemi_t _sr_kemi_pv[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pv"), str_init("geti"), + SR_KEMIP_INT, sr_kemi_pv_geti, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pv"), str_init("getvn"), SR_KEMIP_XVAL, sr_kemi_pv_getvn, { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] Setting notifier_processes to 1 or more seems to cause memory leak (#2733)
by Amit Nir 11 May '21

11 May '21

Hello, We use Kamailio with KAZOO. We have set notifier_processes as follows: modparam("presence", "notifier_processes", 1) A value of 1 or greater seems to be required to avoid race conditions when multiple notify's need to be sent. We've noticed noticed what seems to be a memory leak in Kamailio process. After several days, Kamailio will crash after consuming all system memory. I have not found any other reports of this happening to others. Does this seem familiar to anyone? -- 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/issues/2733

2 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev