sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:5.3:f31542bb: ims_usrloc_pcscf: fix warning: this âifâ clause does not guard...

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: f31542bb188d69eb4d4e88a54060efc82d1a0bf0 URL: https://github.com/kamailio/kamailio/commit/f31542bb188d69eb4d4e88a54060efc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T11:19:52+01:00 ims_usrloc_pcscf: fix warning: this âifâ clause does not guard... --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/f31542bb188d69eb4d4e88a54060efc… Patch: https://github.com/kamailio/kamailio/commit/f31542bb188d69eb4d4e88a54060efc… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 0d156d39c4..1ac55734d7 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -119,11 +119,12 @@ void free_ppublic(ppublic_t* _p) // Keep them in sync! void free_security(security_t* _p) { - if (!_p) + if (!_p) { return; + } - if(_p->sec_header.s) - shm_free(_p->sec_header.s); + if(_p->sec_header.s) + shm_free(_p->sec_header.s); switch (_p->type) {

4 years, 9 months

git:5.3:c1cc4a07: kamcmd: use pkg-config to get compile flags for lib readline

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: c1cc4a07d11c829f89ea62206689fba92eb91ea2 URL: https://github.com/kamailio/kamailio/commit/c1cc4a07d11c829f89ea62206689fba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-19T19:19:58+01:00 kamcmd: use pkg-config to get compile flags for lib readline (cherry picked from commit 0e6e05f8bec1fb451375d71a6b929a6908c5689d) --- Modified: utils/kamcmd/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/c1cc4a07d11c829f89ea62206689fba… Patch: https://github.com/kamailio/kamailio/commit/c1cc4a07d11c829f89ea62206689fba… --- diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index aae4f1394c..c8a7e6807e 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -18,6 +18,17 @@ readline_localpath=$(LOCALBASE)/include/readline/readline.h readline_locations= /usr/include/readline/readline.h \ $(readline_localpath) +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGREADLINE = $(shell $(BUILDER) --exists readline > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGREADLINE),0) + BUILDER = +endif +endif +endif + + use_readline ?= ifneq (,$(MAKECMDGOALS)) ifeq (,$(filter-out $(nodep_targets),$(MAKECMDGOALS))) @@ -66,6 +77,12 @@ ifneq (,$(findstring cygwin, $(OS))) LIBS:= -lresolv endif +# detect libreadline +ifneq ($(BUILDER),) + DEFS += $(shell $(BUILDER) --cflags readline) + LIBS += $(shell $(BUILDER) --libs readline) + use_readline := 1 +else ifeq ($(use_readline),) readline_path := $(shell \ for r in $(readline_locations) ""; do \ @@ -93,14 +110,20 @@ endif LIBS+=-lreadline -lncurses endif -endif +endif # ifeq ($(use_readline),1) + +endif # ifneq ($(BUILDER),) include $(COREPATH)/Makefile.utils ifeq (,$(quiet)) ifeq ($(use_readline),1) +ifneq ($(BUILDER),) +$(info readline detected via pkg-config) +else $(info readline detected ($(readline_path)) ) +endif $(info command completion enabled) else $(info "no readline include files detected, disabling readline support")

4 years, 9 months

git:master:c53423a7: modules: readme files regenerated - corex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: c53423a755a0766d27137d1483edb05178d1a44d URL: https://github.com/kamailio/kamailio/commit/c53423a755a0766d27137d1483edb05… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-23T09:31:19+01:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/c53423a755a0766d27137d1483edb05… Patch: https://github.com/kamailio/kamailio/commit/c53423a755a0766d27137d1483edb05… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index a67289bdb5..e9f8045f3a 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -10,8 +10,6 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> -Edited by - Muhammad Shahzad Shafi <shahzad(a)voip-demos.com> @@ -574,7 +572,15 @@ via_add_srv("1"); Example 1.23. via_add_xavp_params usage ... -via_add_xavp_params("1"); +xavp_via_params="xvia" +... +request_route { + ... + $xavp(xvia=>srvid) = "1"; + $xavp(xvia[0]=>myval) = "xyz"; + via_add_xavp_params("1"); + ... +} ... 4.20. via_use_xavp_fields(flags) @@ -589,7 +595,15 @@ via_add_xavp_params("1"); Example 1.24. via_use_xavp_fields usage ... -via_use_xavp_fields("1"); +xavp_via_fields="mvia" +... +request_route { + ... + $xavp(mvia=>address) = "10.10.10.10"; + $xavp(mvia[0]=>port) = "5060"; + via_use_xavp_fields("1"); + ... +} ... 5. RPC Commands

4 years, 9 months

git:master:1e58a56c: corex: docs - examples with setting xavps for via functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1e58a56cb7f9d83ca0c943481d02c429d33e188a URL: https://github.com/kamailio/kamailio/commit/1e58a56cb7f9d83ca0c943481d02c42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-23T09:19:30+01:00 corex: docs - examples with setting xavps for via functions --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1e58a56cb7f9d83ca0c943481d02c42… Patch: https://github.com/kamailio/kamailio/commit/1e58a56cb7f9d83ca0c943481d02c42… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 6460d11913..0b1d587e7b 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -662,7 +662,15 @@ via_add_srv("1"); <title><function>via_add_xavp_params</function> usage</title> <programlisting format="linespecific"> ... -via_add_xavp_params("1"); +xavp_via_params="xvia" +... +request_route { + ... + $xavp(xvia=>srvid) = "1"; + $xavp(xvia[0]=>myval) = "xyz"; + via_add_xavp_params("1"); + ... +} ... </programlisting> </example> @@ -690,7 +698,15 @@ via_add_xavp_params("1"); <title><function>via_use_xavp_fields</function> usage</title> <programlisting format="linespecific"> ... -via_use_xavp_fields("1"); +xavp_via_fields="mvia" +... +request_route { + ... + $xavp(mvia=>address) = "10.10.10.10"; + $xavp(mvia[0]=>port) = "5060"; + via_use_xavp_fields("1"); + ... +} ... </programlisting> </example>

4 years, 9 months

git:master:56ed5c02: sst: debug message when setting timeout avp

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 56ed5c028bd97837c7a9e0017a2599f09554211f URL: https://github.com/kamailio/kamailio/commit/56ed5c028bd97837c7a9e0017a2599f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-22T15:27:46+01:00 sst: debug message when setting timeout avp --- Modified: src/modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/56ed5c028bd97837c7a9e0017a2599f… Patch: https://github.com/kamailio/kamailio/commit/56ed5c028bd97837c7a9e0017a2599f… --- diff --git a/src/modules/sst/sst_handlers.c b/src/modules/sst/sst_handlers.c index be55eb8883..aa39859c34 100644 --- a/src/modules/sst/sst_handlers.c +++ b/src/modules/sst/sst_handlers.c @@ -876,15 +876,14 @@ static int set_timeout_avp(struct sip_msg *msg, unsigned int value) if (timeout_avp->setf(msg,&timeout_avp->pvp,EQ_T,&pv_val)!=0) { LM_ERR("failed to set new dialog timeout value\n"); } else { + LM_DBG("Timeout avp value set to %d\n", value); rtn = 0; } } - } - else { + } else { LM_ERR("SST not reset. get avp result is %d\n", result); } - } - else { + } else { LM_ERR("SST needs to know the name of the dialog timeout AVP!\n"); } return(rtn);

4 years, 9 months

git:master:20013e4e: dialog: detailed debug messages when resolving the timeout

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 20013e4e2bf1a5d5ce8535e07320dca034639286 URL: https://github.com/kamailio/kamailio/commit/20013e4e2bf1a5d5ce8535e07320dca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-22T15:05:17+01:00 dialog: detailed debug messages when resolving the timeout --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/20013e4e2bf1a5d5ce8535e07320dca… Patch: https://github.com/kamailio/kamailio/commit/20013e4e2bf1a5d5ce8535e07320dca… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 48899e3215..43e01eece7 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -674,11 +674,20 @@ inline static int get_dlg_timeout(struct sip_msg *req) pv_value_t pv_val; if( timeout_avp ) { - if ( pv_get_spec_value( req, timeout_avp, &pv_val)==0 && - pv_val.flags&PV_VAL_INT && pv_val.ri>0 ) { - return pv_val.ri; + if ( pv_get_spec_value( req, timeout_avp, &pv_val)==0) { + if(pv_val.flags&PV_VAL_INT) { + if(pv_val.ri>0 ) { + return pv_val.ri; + } else { + LM_DBG("invalid AVP value\n"); + } + } else { + LM_DBG("invalid AVP type\n"); + } } - LM_DBG("invalid AVP value, using default timeout\n"); + LM_DBG("unable to get valid AVP value, using default timeout\n"); + } else { + LM_DBG("using default timeout\n"); } return default_timeout; }

4 years, 9 months

[kamailio/kamailio] need to create docker registry for rpm images (#2259)

by sergey-safarov

As embedded [Codefresh registry is deprecated](https://codefresh.io/codefresh-news/deprecation-of-the-codefresh-private-registry/) need move all RPM build artifacts to other registry. I suggest create `kamailio/kamailio-store` on Docker hub. Could you create new docker registry for rpm artifacts build on codefresh. -- 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/2259

4 years, 9 months

git:master:21bdbff0: dmq: init worker structure in chid_init for PROC_INIT rank

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 21bdbff049571ca22f1205a041c8b1162005d319 URL: https://github.com/kamailio/kamailio/commit/21bdbff049571ca22f1205a041c8b11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-20T17:10:05+01:00 dmq: init worker structure in chid_init for PROC_INIT rank - have it ready when other processes are started --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/worker.c Modified: src/modules/dmq/worker.h --- Diff: https://github.com/kamailio/kamailio/commit/21bdbff049571ca22f1205a041c8b11… Patch: https://github.com/kamailio/kamailio/commit/21bdbff049571ca22f1205a041c8b11… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 2b64d0e907..4fa61d947b 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -230,11 +230,12 @@ static int mod_init(void) } /* allocate workers array */ - workers = shm_malloc(num_workers * sizeof(*workers)); + workers = shm_malloc(num_workers * sizeof(dmq_worker_t)); if(workers == NULL) { LM_ERR("error in shm_malloc\n"); return -1; } + memset(workers, 0, num_workers * sizeof(dmq_worker_t)); dmq_init_callback_done = shm_malloc(sizeof(int)); if(!dmq_init_callback_done) { @@ -275,14 +276,24 @@ static int mod_init(void) static int child_init(int rank) { int i, newpid; + + if(rank == PROC_INIT) { + for(i = 0; i < num_workers; i++) { + if (init_worker(&workers[i]) < 0) { + LM_ERR("failed to init struct for worker[%d]\n", i); + return -1; + } + } + return 0; + } + if(rank == PROC_MAIN) { /* fork worker processes */ for(i = 0; i < num_workers; i++) { - init_worker(&workers[i]); LM_DBG("starting worker process %d\n", i); newpid = fork_process(PROC_RPC, "DMQ WORKER", 0); if(newpid < 0) { - LM_ERR("failed to fork process\n"); + LM_ERR("failed to fork worker process %d\n", i); return -1; } else if(newpid == 0) { /* child - this will loop forever */ @@ -307,7 +318,7 @@ static int child_init(int rank) } return 0; } - if(rank == PROC_INIT || rank == PROC_TCP_MAIN) { + if(rank == PROC_TCP_MAIN) { /* do nothing for the main process */ return 0; } diff --git a/src/modules/dmq/worker.c b/src/modules/dmq/worker.c index 14aadfc998..38b49e4512 100644 --- a/src/modules/dmq/worker.c +++ b/src/modules/dmq/worker.c @@ -224,7 +224,7 @@ int add_dmq_job(struct sip_msg *msg, dmq_peer_t *peer) /** * @brief init dmq worker */ -void init_worker(dmq_worker_t *worker) +int init_worker(dmq_worker_t *worker) { memset(worker, 0, sizeof(*worker)); if(worker_usleep <= 0) { @@ -233,6 +233,11 @@ void init_worker(dmq_worker_t *worker) lock_get(&worker->lock); } worker->queue = alloc_job_queue(); + if(worker->queue==NULL) { + LM_ERR("queue could not be initialized\n"); + return -1; + } + return 0; } /** diff --git a/src/modules/dmq/worker.h b/src/modules/dmq/worker.h index 9f5fed71cf..cb4fce8ccf 100644 --- a/src/modules/dmq/worker.h +++ b/src/modules/dmq/worker.h @@ -56,7 +56,7 @@ struct dmq_worker typedef struct dmq_worker dmq_worker_t; -void init_worker(dmq_worker_t *worker); +int init_worker(dmq_worker_t *worker); int add_dmq_job(struct sip_msg *, dmq_peer_t *); void worker_loop(int id);

4 years, 9 months

git:master:0e6e05f8: kamcmd: use pkg-config to get compile flags for lib readline

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0e6e05f8bec1fb451375d71a6b929a6908c5689d URL: https://github.com/kamailio/kamailio/commit/0e6e05f8bec1fb451375d71a6b929a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-18T17:39:49+01:00 kamcmd: use pkg-config to get compile flags for lib readline --- Modified: utils/kamcmd/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/0e6e05f8bec1fb451375d71a6b929a6… Patch: https://github.com/kamailio/kamailio/commit/0e6e05f8bec1fb451375d71a6b929a6… --- diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index aae4f1394c..c8a7e6807e 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -18,6 +18,17 @@ readline_localpath=$(LOCALBASE)/include/readline/readline.h readline_locations= /usr/include/readline/readline.h \ $(readline_localpath) +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGREADLINE = $(shell $(BUILDER) --exists readline > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGREADLINE),0) + BUILDER = +endif +endif +endif + + use_readline ?= ifneq (,$(MAKECMDGOALS)) ifeq (,$(filter-out $(nodep_targets),$(MAKECMDGOALS))) @@ -66,6 +77,12 @@ ifneq (,$(findstring cygwin, $(OS))) LIBS:= -lresolv endif +# detect libreadline +ifneq ($(BUILDER),) + DEFS += $(shell $(BUILDER) --cflags readline) + LIBS += $(shell $(BUILDER) --libs readline) + use_readline := 1 +else ifeq ($(use_readline),) readline_path := $(shell \ for r in $(readline_locations) ""; do \ @@ -93,14 +110,20 @@ endif LIBS+=-lreadline -lncurses endif -endif +endif # ifeq ($(use_readline),1) + +endif # ifneq ($(BUILDER),) include $(COREPATH)/Makefile.utils ifeq (,$(quiet)) ifeq ($(use_readline),1) +ifneq ($(BUILDER),) +$(info readline detected via pkg-config) +else $(info readline detected ($(readline_path)) ) +endif $(info command completion enabled) else $(info "no readline include files detected, disabling readline support")

4 years, 9 months

[kamailio/kamailio] ratelimit: increase default number of queues (#2257)

by Stefan Mititelu

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  In our setup, we need one more ratelimit queue (in addition to the default of 10). In this pull request, I am increasing the default number of ratelimit queus to 16. Please let me know if this pull request is ok, or if I should do it via a modparam and dynamic allocation of ```static rl_queue_t queues```. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2257 -- Commit Summary -- * ratelimit: increase default number of queues -- File Changes -- M src/modules/ratelimit/ratelimit.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2257.patch https://github.com/kamailio/kamailio/pull/2257.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/2257

4 years, 9 months

← Newer
1
...
19
20
21
22
23
24
25
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020