sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
289 discussions

[kamailio/kamailio] tm: t_suspend.c - t_continue_helper() - do not continue processing a reply if it's suspended again (#2721)
by Giacomo Vacca 17 May '21

17 May '21

#### 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) - [ ] New feature (non-breaking change which adds new functionality) - [x] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2721 -- Commit Summary -- * tm: t_suspend.c - do not t_continue with reply if suspended -- File Changes -- M src/modules/tm/t_suspend.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2721.patch https://github.com/kamailio/kamailio/pull/2721.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/2721

2 10

git:master:82096e8f: tm: t_suspend.c - t_continue_helper() - do not continue processing a reply if it's suspended again (#2721)
by GitHub 17 May '21

17 May '21

Module: kamailio Branch: master Commit: 82096e8f0af7a0bc75fc76749f3a7fdb6e1b028d URL: https://github.com/kamailio/kamailio/commit/82096e8f0af7a0bc75fc76749f3a7fd… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-05-17T11:56:05+02:00 tm: t_suspend.c - t_continue_helper() - do not continue processing a reply if it's suspended again (#2721) * tm: t_suspend.c - do not t_continue with reply if suspended * tm: t_suspend.c - unlock t_continue and reset flag if suspended again * tm: t_reply.c - received_reply() done if suspended after route --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/82096e8f0af7a0bc75fc76749f3a7fd… Patch: https://github.com/kamailio/kamailio/commit/82096e8f0af7a0bc75fc76749f3a7fd… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index a46921cbfd..306ed8f872 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2653,6 +2653,11 @@ int reply_received( struct sip_msg *p_msg ) } #endif + if (t->flags & T_ASYNC_SUSPENDED) { + LM_DBG("Reply for suspended transaction, done.\n"); + goto done; + } + if (unlikely(p_msg->msg_flags&FL_RPL_SUSPENDED)) { /* suspended the reply (async) - no error */ goto done; diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 4c8de42ce6..04f906f53c 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -404,6 +404,14 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, LM_DBG("restoring previous environment\n"); faked_env( t, 0, 1); + if (t->flags & T_ASYNC_SUSPENDED) { + LM_DBG("The transaction is suspended, so not continuing\n"); + t->flags &= ~T_ASYNC_CONTINUE; + UNLOCK_ASYNC_CONTINUE(t); + set_t(backup_T, backup_T_branch); + return 0; + } + /*lock transaction replies - will be unlocked when reply is relayed*/ LOCK_REPLIES( t ); if ( is_local(t) ) {

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: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: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: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: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

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

[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

← Newer
1
...
15
16
17
18
19
20
21
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2021