sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
269 discussions

[kamailio/kamailio] dialog: fix missing else (PR #2973)

by Bastian Triller

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2973 -- Commit Summary -- * dialog: fix missing else -- File Changes -- M src/modules/dialog/dialog.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2973.patch https://github.com/kamailio/kamailio/pull/2973.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/2973

2 years, 5 months

git:master:8f23548c: Merge pull request #2973 from btriller/dialog-fix-missing-else

by GitHub

Module: kamailio Branch: master Commit: 8f23548c4d201445e29e73cd0f2efab6a7dc5c04 URL: https://github.com/kamailio/kamailio/commit/8f23548c4d201445e29e73cd0f2efab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-12-13T13:27:36+01:00 Merge pull request #2973 from btriller/dialog-fix-missing-else dialog: fix missing else --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/8f23548c4d201445e29e73cd0f2efab… Patch: https://github.com/kamailio/kamailio/commit/8f23548c4d201445e29e73cd0f2efab… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 16abec9e88..da3ce7cbfd 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2330,9 +2330,9 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, if (rpc->add(c, "{", &h) < 0) goto error; tnow = time(NULL); - if(dlg->end_ts) { + if (dlg->end_ts) { tdur = (int)(dlg->end_ts - dlg->start_ts); - } if(dlg->start_ts) { + } else if (dlg->start_ts) { tdur = (int)(tnow - dlg->start_ts); } else { tdur = 0;

2 years, 5 months

git:master:1d0b7f22: dialog: fix missing else

by Bastian Triller

Module: kamailio Branch: master Commit: 1d0b7f22b3321cf9b2a4866b0a8a6001538aba42 URL: https://github.com/kamailio/kamailio/commit/1d0b7f22b3321cf9b2a4866b0a8a600… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2021-12-13T13:11:26+01:00 dialog: fix missing else --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/1d0b7f22b3321cf9b2a4866b0a8a600… Patch: https://github.com/kamailio/kamailio/commit/1d0b7f22b3321cf9b2a4866b0a8a600… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 16abec9e88..da3ce7cbfd 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2330,9 +2330,9 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, if (rpc->add(c, "{", &h) < 0) goto error; tnow = time(NULL); - if(dlg->end_ts) { + if (dlg->end_ts) { tdur = (int)(dlg->end_ts - dlg->start_ts); - } if(dlg->start_ts) { + } else if (dlg->start_ts) { tdur = (int)(tnow - dlg->start_ts); } else { tdur = 0;

2 years, 5 months

git:master:ba773d2a: dialog: added duration field in dialog rpc output

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ba773d2a2bf64e01f1724e61acad765fb311a0a6 URL: https://github.com/kamailio/kamailio/commit/ba773d2a2bf64e01f1724e61acad765… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T09:54:29+01:00 dialog: added duration field in dialog rpc output --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/ba773d2a2bf64e01f1724e61acad765… Patch: https://github.com/kamailio/kamailio/commit/ba773d2a2bf64e01f1724e61acad765… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 7361887fe5..16abec9e88 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2324,10 +2324,20 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, void *h, *sh, *ssh; dlg_profile_link_t *pl; dlg_var_t *var; + time_t tnow; + int tdur; if (rpc->add(c, "{", &h) < 0) goto error; - rpc->struct_add(h, "dddSSSddddddddd", + tnow = time(NULL); + if(dlg->end_ts) { + tdur = (int)(dlg->end_ts - dlg->start_ts); + } if(dlg->start_ts) { + tdur = (int)(tnow - dlg->start_ts); + } else { + tdur = 0; + } + rpc->struct_add(h, "dddSSSdddddddddd", "h_entry", dlg->h_entry, "h_id", dlg->h_id, "ref", dlg->ref, @@ -2338,7 +2348,8 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, "start_ts", dlg->start_ts, "init_ts", dlg->init_ts, "end_ts", dlg->end_ts, - "timeout", dlg->tl.timeout ? time(0) + dlg->tl.timeout - get_ticks() : 0, + "duration", tdur, + "timeout", dlg->tl.timeout ? tnow + dlg->tl.timeout - get_ticks() : 0, "lifetime", dlg->lifetime, "dflags", dlg->dflags, "sflags", dlg->sflags,

2 years, 5 months

git:master:3816bcb2: modules: readme files regenerated - dialog ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3816bcb2375baef9451025ed906ebf36e8c32ec3 URL: https://github.com/kamailio/kamailio/commit/3816bcb2375baef9451025ed906ebf3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-13T09:31:25+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README Modified: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/3816bcb2375baef9451025ed906ebf3… Patch: https://github.com/kamailio/kamailio/commit/3816bcb2375baef9451025ed906ebf3… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index cb6413f981..8b85f1f05e 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -2198,7 +2198,10 @@ kamcmd dlg.bridge_dlg _from_ _to_ _op_ Name: dlg.stats_active - Parameters: none. + Parameters: + * local_only (optional) - if not 0 then filter out non local dialogs + (the receiving socket is not found locally, from C code point of + view, the bind_addr info is not set). Returned fields * starting - initial INVITE has been processed, no ringing or 1xx has diff --git a/src/modules/ims_usrloc_scscf/README b/src/modules/ims_usrloc_scscf/README index eaf9b5cc87..d6de6ab3d7 100644 --- a/src/modules/ims_usrloc_scscf/README +++ b/src/modules/ims_usrloc_scscf/README @@ -47,6 +47,8 @@ Yasin Caner 3.19. support_wildcardPSI (int) 3.20. unreg_validity (int) 3.21. user_data_xsd (string) + 3.22. realm (string) + 3.23. skip_realm (int) 4. RPC Commands @@ -79,6 +81,8 @@ Yasin Caner 1.19. Set support_wildcardPSI parameter 1.20. Set unreg_validity parameter 1.21. Set unreg_validity parameter + 1.22. Set realm parameter + 1.23. Set skip_realm parameter Chapter 1. Admin Guide @@ -112,6 +116,8 @@ Chapter 1. Admin Guide 3.19. support_wildcardPSI (int) 3.20. unreg_validity (int) 3.21. user_data_xsd (string) + 3.22. realm (string) + 3.23. skip_realm (int) 4. RPC Commands @@ -159,6 +165,8 @@ Chapter 1. Admin Guide 3.19. support_wildcardPSI (int) 3.20. unreg_validity (int) 3.21. user_data_xsd (string) + 3.22. realm (string) + 3.23. skip_realm (int) 3.1. db_url (string) @@ -385,6 +393,23 @@ st/scscf") modparam("ims_usrloc_scscf", "user_data_xsd", "/usr/local/etc/kamailio/C xDataType_Rel6.xsd") +3.22. realm (string) + + Default value is NULL + + Example 1.22. Set realm parameter + modparam("ims_usrloc_scscf", "realm", "kamailio-ims.org") + +3.23. skip_realm (int) + + Skipping defined network name in the realm for NOTIFY's Message body + reginfo tag. + + Default value is 0 + + Example 1.23. Set skip_realm parameter + modparam("ims_usrloc_scscf", "skip_realm", 1) + 4. RPC Commands 4.1. ulscscf.status

2 years, 5 months

[kamailio/kamailio] failed master build on centos 6 (Issue #2921)

by sergey-safarov

``` flex -o core/lex.yy.c core/cfg.lex CC (gcc) [kamailio] core/lex.yy.o LD (gcc) [kamailio] kamailio core/ut.o: In function `ksr_clock_gettime': /root/rpmbuild/BUILD/kamailio-5.6.0-dev2/src/core/ut.c:175: undefined reference to `clock_gettime' collect2: ld returned 1 exit status make[1]: *** [kamailio] Error 1 make[1]: Leaving directory `/root/rpmbuild/BUILD/kamailio-5.6.0-dev2/src' make: *** [default] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.RFyzKs (%build) ``` Should we continue support CentOS 6? -- 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/2921

2 years, 5 months

git:master:225a5947: Makefile.defs: use sed instead of awk for detecting glibc version

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 225a59475c91e154ce0a7f0ec252be841a5a8ce5 URL: https://github.com/kamailio/kamailio/commit/225a59475c91e154ce0a7f0ec252be8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T09:29:06+01:00 Makefile.defs: use sed instead of awk for detecting glibc version --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/225a59475c91e154ce0a7f0ec252be8… Patch: https://github.com/kamailio/kamailio/commit/225a59475c91e154ce0a7f0ec252be8… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 8fab3fd812..57bccfe725 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1890,7 +1890,7 @@ ifeq ($(OS), linux) endif ifeq ($(CC_NAME), gcc) # link librt for glibc <= 2.17 - GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' ) + GLIBCVER=$(shell ldd --version | head -1 | sed -e 's/^.* //' -e 's/\.//' ) ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt) LIBS+=-lrt endif

2 years, 5 months

[kamailio/kamailio] Using undefined environmental variables with #!defenv (Issue #2967)

by Ben Kaufman

### Description Currently, an undefined environmental variable with `#!defenv` results in Kamailio failing to start. The proposal here that if the environmental variable is not defined, then the macro value would be undefined as well. For example: ``` !#KAMAILIO loadmodule "xlog" loadmodule "pv" #!defenv FOO request_route { #!ifdef FOO xlog("L_INFO","Environmental variable $$FOO is set\n"); #!else xlog("L_WARN","Environmental variable $$FOO is NOT set\n"); #!endif forward(); } ``` Currently this configuration will fail to load if environmental variable is not set. My proposal is to either allow `#!envdef` to accept an undefined environmental variable and have the preprocessor macro undefined, or to add a new keyword (`#!envdefn` perhaps?) to allow this behavior. -- 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/2967

2 years, 5 months

[kamailio/kamailio] dialog: add local_only paramter to RPC dlg.stats_active (PR #2935)

by Victor Seva

#### 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 - [ x] Related to issue #2920 #### Description allows to filter out non local dialogs from stats using a new argument fix #2920 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2935 -- Commit Summary -- * dialog: add local_only paramter to RPC dlg.stats_active -- File Changes -- M src/modules/dialog/dialog.c (5) M src/modules/dialog/doc/dialog_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2935.patch https://github.com/kamailio/kamailio/pull/2935.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/2935

2 years, 5 months

git:master:f639dfb5: dialog: docs - typo and clarification about local socket bind address

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f639dfb5f5b74d77026bec7b8bb493b40ce6d47c URL: https://github.com/kamailio/kamailio/commit/f639dfb5f5b74d77026bec7b8bb493b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T09:22:39+01:00 dialog: docs - typo and clarification about local socket bind address --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f639dfb5f5b74d77026bec7b8bb493b… Patch: https://github.com/kamailio/kamailio/commit/f639dfb5f5b74d77026bec7b8bb493b… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 745efb51f0..d456d545ef 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2805,7 +2805,8 @@ dlg_reset_property("timeout-noreset"); <itemizedlist> <listitem><para> <emphasis>local_only</emphasis> (optional) - if not 0 then filter out - non local dialogues. No bind_addr info in memory. + non local dialogs (the receiving socket is not found locally, + from C code point of view, the bind_addr info is not set). </para></listitem> </itemizedlist> <para>Returned fields</para>

2 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021