sr-dev February 2021

sr-dev@lists.kamailio.org

20 participants
249 discussions

[kamailio/kamailio] usrloc Stats are not compatible with Prometheus (xhttp_prom module) (#2644)

by Sebastian Damm

### Description We tried to use the `xhttp_prom` module, but our Prometheus couldn't read it, because of metrics conflicting with Prometheus data model. For us, the problem lies in the usrloc module. It exports the following metrics: ``` usrloc:location-contacts = 0 usrloc:location-expires = 0 usrloc:location-users = 0 usrloc:registered_users = 0 ``` However, Prometheus allows only ascii characters and digits, as well as underscores and colons. See: https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels The metrics names should not contain `-`, so they should get converted to `_`. #### Reproduction Setup Kamailio with `usrloc`, `xhttp` and `xhttp_prom` module and let Prometheus query it. It will stumble upon the first entry of `usrloc` module stats. ### Possible Solutions Either the `usrloc` module could export its stats with the dash replaced by underscores, or the xhttp_prom module could sanitize the output. The first one would be a breaking change, I guess, making this a change for a major release. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ifens5:/# kamailio -v version: kamailio 5.3.8 (x86_64/linux) 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, 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, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 7.5.0``` * **Operating System**: ``` Ubuntu 18.04 ``` -- 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/2644

3 years, 10 months

Broken: kamailio/kamailio#9899 (master - c48e409)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #9899 Status: Broken Duration: 5 mins and 30 secs Commit: c48e409 (master) Author: Daniel-Constantin Mierla Message: jsonrpcs: use json null value for c null char* or str* View the changeset: https://github.com/kamailio/kamailio/compare/d40fbc877aa6...c48e409b7418 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/759983787?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 years, 10 months

git:master:c48e409b: jsonrpcs: use json null value for c null char* or str*

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c48e409b741821fa470788b3bca0ead32e4d6efc URL: https://github.com/kamailio/kamailio/commit/c48e409b741821fa470788b3bca0ead… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-22T11:29:39+01:00 jsonrpcs: use json null value for c null char* or str* --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c48e409b741821fa470788b3bca0ead… Patch: https://github.com/kamailio/kamailio/commit/c48e409b741821fa470788b3bca0ead… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index c3b8003046..a5a92e1537 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -472,6 +472,7 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) time_t dt; struct tm t; str *sp; + char *cp; switch(fmt) { case 'd': @@ -497,11 +498,20 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) nj = srjson_CreateString(ctx->jrpl, buf); break; case 's': - nj = srjson_CreateString(ctx->jrpl, va_arg(*ap, char*)); + cp = va_arg(*ap, char*); + if(cp!=NULL) { + nj = srjson_CreateString(ctx->jrpl, cp); + } else { + nj = srjson_CreateNull(ctx->jrpl); + } break; case 'S': sp = va_arg(*ap, str*); - nj = srjson_CreateStr(ctx->jrpl, sp->s, sp->len); + if(sp!=NULL && sp->s!=NULL) { + nj = srjson_CreateStr(ctx->jrpl, sp->s, sp->len); + } else { + nj = srjson_CreateNull(ctx->jrpl); + } break; default: LM_ERR("Invalid formatting character [%c]\n", fmt);

3 years, 10 months

[kamailio/kamailio] Added ; sn param check to loose.c is_myself() (#2643)

by juha-h

Added ;sn param check to loose.c is_myself() so that loose_route() would recognize such a Route URI denoting itself. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2643 -- Commit Summary -- * Added ;sn param check to loose.c is_myself() -- File Changes -- M src/modules/rr/loose.c (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2643.patch https://github.com/kamailio/kamailio/pull/2643.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/2643

3 years, 10 months

git:5.4:bdf4e004: kex: display proper values for pkg mem stats

by Ovidiu Sas

Module: kamailio Branch: 5.4 Commit: bdf4e004d8606f3228d794d55ce7a522b98129f4 URL: https://github.com/kamailio/kamailio/commit/bdf4e004d8606f3228d794d55ce7a52… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-02-20T19:24:36-05:00 kex: display proper values for pkg mem stats - large amounts of pkg memory were displayed as negative numbers (cherry picked from commit 220f9ca3c486b92797982a2333343fab463e9e5a) --- Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/bdf4e004d8606f3228d794d55ce7a52… Patch: https://github.com/kamailio/kamailio/commit/bdf4e004d8606f3228d794d55ce7a52… --- diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index 9a2f4a2d37..7f59130ba6 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -240,7 +240,7 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) _pkg_proc_stats_list[i].total_size = _pkg_proc_stats_list[0].total_size; _pkg_proc_stats_list[i].rank = PROC_NOCHLDINIT; } - if(rpc->struct_add(th, "dddddddds", + if(rpc->struct_add(th, "duduuuuus", "entry", i, "pid", _pkg_proc_stats_list[i].pid, "rank", _pkg_proc_stats_list[i].rank,

3 years, 10 months

git:master:d40fbc87: pkg/kamailio/deb: add secsipid package for supported releases [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: d40fbc877aa699d1fdde1df82892d444f5475d62 URL: https://github.com/kamailio/kamailio/commit/d40fbc877aa699d1fdde1df82892d44… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-02-19T15:05:26+01:00 pkg/kamailio/deb: add secsipid package for supported releases [skip ci] --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/d40fbc877aa699d1fdde1df82892d44… Patch: https://github.com/kamailio/kamailio/commit/d40fbc877aa699d1fdde1df82892d44…

3 years, 10 months

[kamailio/kamailio] add rport to uac register msg (#2639)

by Seven Du

### Description  Sometimes need to add rport on outbound uac reg, but seems it's not possible in the current uac module. Would be good to an an extra param to do it, or is it possible to trigger a KEMI event route so a script can add whatever it need before sending the register msg? Thanks. ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2639

3 years, 10 months

git:master:220f9ca3: kex: display proper values for pkg mem stats

by Ovidiu Sas

Module: kamailio Branch: master Commit: 220f9ca3c486b92797982a2333343fab463e9e5a URL: https://github.com/kamailio/kamailio/commit/220f9ca3c486b92797982a2333343fa… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-02-17T12:08:10-05:00 kex: display proper values for pkg mem stats - large amounts of pkg memory were displayed as negative numbers --- Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/220f9ca3c486b92797982a2333343fa… Patch: https://github.com/kamailio/kamailio/commit/220f9ca3c486b92797982a2333343fa… --- diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index ee6c637ace..102442f1e9 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -240,7 +240,7 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) _pkg_proc_stats_list[i].total_size = _pkg_proc_stats_list[0].total_size; _pkg_proc_stats_list[i].rank = PROC_NOCHLDINIT; } - if(rpc->struct_add(th, "dddddddds", + if(rpc->struct_add(th, "duduuuuus", "entry", i, "pid", _pkg_proc_stats_list[i].pid, "rank", _pkg_proc_stats_list[i].rank,

3 years, 10 months

[kamailio/kamailio] rtpengine: rebuild sockets if any skipped nodes (#2633)

by Stefan Mititelu

Retry build_rtpp_socks() if any DNS or create, bind, connect issues happened when kamailio started, and at least one node from list was skipped. This retry will happen automatically, when select_rtpp_node() is called and will avoid a need for a "kamcmd rtpengine.reload"   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Described above. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2633 -- Commit Summary -- * rtpengine: rebuild sockets if any skipped nodes -- File Changes -- M src/modules/rtpengine/rtpengine.c (28) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2633.patch https://github.com/kamailio/kamailio/pull/2633.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/2633

3 years, 10 months

git:master:c88e65ed: rtpengine: rebuild sockets if any skipped nodes

by Henning Westerholt

Module: kamailio Branch: master Commit: c88e65edf05f7e61826831a2f7528edbc184f68b URL: https://github.com/kamailio/kamailio/commit/c88e65edf05f7e61826831a2f7528ed… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-02-17T17:21:22+01:00 rtpengine: rebuild sockets if any skipped nodes Retry build_rtpp_socks() if any DNS or create, bind, connect issues happened when kamailio started, and at least one node from list was skipped. This retry will happen automatically, when select_rtpp_node() is called and will avoid a need for a "kamcmd rtpengine.reload" --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/c88e65edf05f7e61826831a2f7528ed… Patch: https://github.com/kamailio/kamailio/commit/c88e65edf05f7e61826831a2f7528ed… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 00b27be148..8b751eb48a 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1794,6 +1794,9 @@ static int build_rtpp_socks(int lmode, int rtest) { if(_rtpe_list_vernum_local == _rtpe_list_version->vernum) { /* same version for the list of rtpengines */ + LM_DBG("same rtpengines list version: %d (%u)\n", + _rtpe_list_version->vernum, + (unsigned int)_rtpe_list_version->vertime); return 0; } @@ -1840,6 +1843,11 @@ static int build_rtpp_socks(int lmode, int rtest) { if (hostname==NULL) { LM_ERR("no more pkg memory\n"); rtpp_socks[pnode->idx] = -1; + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } strcpy(hostname, pnode->rn_address); @@ -1860,6 +1868,11 @@ static int build_rtpp_socks(int lmode, int rtest) { LM_ERR("%s\n", gai_strerror(n)); pkg_free(hostname); rtpp_socks[pnode->idx] = -1; + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } pkg_free(hostname); @@ -1869,6 +1882,11 @@ static int build_rtpp_socks(int lmode, int rtest) { if (rtpp_socks[pnode->idx] == -1) { LM_ERR("can't create socket\n"); freeaddrinfo(res); + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } @@ -1899,6 +1917,11 @@ static int build_rtpp_socks(int lmode, int rtest) { close(rtpp_socks[pnode->idx]); rtpp_socks[pnode->idx] = -1; freeaddrinfo(res); + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } @@ -1907,6 +1930,11 @@ static int build_rtpp_socks(int lmode, int rtest) { close(rtpp_socks[pnode->idx]); rtpp_socks[pnode->idx] = -1; freeaddrinfo(res); + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; }

3 years, 10 months

← Newer
1
...
10
11
12
13
14
15
16
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2021