sr-dev March 2023

sr-dev@lists.kamailio.org

14 participants
250 discussions

git:master:6aee3bd7: dispatcher: add missing memory allocation checks, convert to memory log macros

by Henning Westerholt

Module: kamailio Branch: master Commit: 6aee3bd7c86a1874cc140a7874b740981f14f5f5 URL: https://github.com/kamailio/kamailio/commit/6aee3bd7c86a1874cc140a7874b7409… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T17:17:28Z dispatcher: add missing memory allocation checks, convert to memory log macros --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/ds_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/6aee3bd7c86a1874cc140a7874b7409… Patch: https://github.com/kamailio/kamailio/commit/6aee3bd7c86a1874cc140a7874b7409…

1 year, 9 months

Re: [kamailio/kamailio] nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c (6e03201)

by Victor Seva

@rfuchs Thanks! Pushed the PRIu64 macro versions -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/6e032019d992625abc2a3739423df9ea1c964356/104410654(a)github.com>

1 year, 9 months

git:master:ef0427ea: nat_traversal:

by Victor Seva

Module: kamailio Branch: master Commit: ef0427ead03bfb738b6214b91c1763913e70a52d URL: https://github.com/kamailio/kamailio/commit/ef0427ead03bfb738b6214b91c17639… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T17:08:46+01:00 nat_traversal: --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/ef0427ead03bfb738b6214b91c17639… Patch: https://github.com/kamailio/kamailio/commit/ef0427ead03bfb738b6214b91c17639… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index d21a8b7e01..28456c77d4 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -43,6 +43,7 @@ #include <ctype.h> #include <errno.h> #include <time.h> +#include <inttypes.h> #include <sys/types.h> #include <arpa/inet.h> @@ -923,7 +924,7 @@ static time_t get_register_expire( } } - LM_DBG("maximum expire for all contacts: %lu\n", (uint64_t)expire); + LM_DBG("maximum expire for all contacts: %" PRIu64 "\n", (uint64_t)expire); return (expire ? expire + now : 0); }

1 year, 9 months

git:master:88412576: core: use PRIu64 macro to find out what format is needed for uint64_t

by Victor Seva

Module: kamailio Branch: master Commit: 8841257671b6c5f3c4cfee3f1b7bb46d54faaf65 URL: https://github.com/kamailio/kamailio/commit/8841257671b6c5f3c4cfee3f1b7bb46… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T17:03:45+01:00 core: use PRIu64 macro to find out what format is needed for uint64_t since it depends on architecture --- Modified: src/core/utils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/8841257671b6c5f3c4cfee3f1b7bb46… Patch: https://github.com/kamailio/kamailio/commit/8841257671b6c5f3c4cfee3f1b7bb46… --- diff --git a/src/core/utils/tmrec.c b/src/core/utils/tmrec.c index 205866163f..14e9243914 100644 --- a/src/core/utils/tmrec.c +++ b/src/core/utils/tmrec.c @@ -32,6 +32,7 @@ #include <string.h> #include <time.h> #include <stdint.h> +#include <inttypes.h> #include "../../core/mem/mem.h" #include "tmrec.h" @@ -272,7 +273,7 @@ int ac_print(ac_tm_t *_atp) return -1; } - printf("\nSys time: %lu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, + printf("\nSys time: %" PRIu64 "\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year+1900, _atp->t.tm_mon+1, _atp->t.tm_mday); @@ -512,15 +513,15 @@ int tr_print(tmrec_t *_trp) return -1; } printf("Recurrence definition\n-- start time ---\n"); - printf("Sys time: %lu\n", (uint64_t)_trp->dtstart); + printf("Sys time: %" PRIu64 "\n", (uint64_t)_trp->dtstart); printf("Time: %02d:%02d:%02d\n", _trp->ts.tm_hour, _trp->ts.tm_min, _trp->ts.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_trp->ts.tm_wday], _trp->ts.tm_year+1900, _trp->ts.tm_mon+1, _trp->ts.tm_mday); printf("---\n"); - printf("End time: %lu\n", (uint64_t)_trp->dtend); - printf("Duration: %lu\n", (uint64_t)_trp->duration); - printf("Until: %lu\n", (uint64_t)_trp->until); + printf("End time: %" PRIu64 "\n", (uint64_t)_trp->dtend); + printf("Duration: %" PRIu64 "\n", (uint64_t)_trp->duration); + printf("Until: %" PRIu64 "\n", (uint64_t)_trp->until); printf("Freq: %d\n", (int)_trp->freq); printf("Interval: %d\n", (int)_trp->interval); if(_trp->byday)

1 year, 9 months

Re: [kamailio/kamailio] nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c (6e03201)

by Richard Fuchs

Eh, these are arch dependent. "long int" on 32-bit platforms is only 32 bits. Either use %llu and cast to "long long" or use the PRIu64 macro. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/6e032019d992625abc2a3739423df9ea1c964356/104404760(a)github.com>

1 year, 9 months

[kamailio/kamailio] Statistic counters for LCR module (Issue #3372)

by Alessio Garzi

### Description I am in need to get some statistic counters related to each lcr gw currently loaded in Kamailio. Kamailio already provides the counters I need inside the KEX module with the following command: ``` kamcmd> stats.get_statistics core: core:bad_URIs_rcvd = 69 core:bad_msg_hdr = 2 core:drop_replies = 0 core:drop_requests = 8499 core:err_replies = 0 core:err_requests = 0 core:fwd_replies = 4 core:fwd_requests = 65 core:rcv_replies = 502088 ... ``` Here kamailio doing exactly what i want, it's exposing the counter data via xmlrpc which is great for attaching an external tool to build statistics. Unfortunately Kamailio KEX module is counting every single request/reply hitting the proxy server, the idea is to have the above stats related to the gateways currently loaded by the lcr module. In this way, for example I can tell how many request/replies I got from gw id X or gw id Y and produce gw based stats. Unfortunately the KEX module has no "concept" of "GW" and "LCR", so the idea is to implement the same counting logic inside LCR module. The counting should not be persistent (counters must go to zero every time kamailio restarts). When adding or deleting a new gateway, the counting in memory must reflect the status of the internal state or lcr gatewas, so, for example, after adding a new gateway and reloading lcr tables, the new counters must be immediately available through xmlrpc without a new kamailio restart. The same concept applies when the gateway is removed from the list. ### Expected behavior A possible implementation should give the user to query counters in a way similar to this: ``` # kamcmd lcr.stats { gw: { { gw_id: <id of lcr mysql table here> gw_name: <description of lcr mysql table here> requests: 0 requests_invite: 0 requests_cancel: 0 ... } { gw_id: <id of lcr mysql table here> gw_name: <description of lcr mysql table here> requests: 0 requests_invite: 0 requests_cancel: 0 ... } } } ``` Additionally, it would be helpful to set a gw id as argument in order to filter, for example: ``` # kamcmd lcr.stats 95 { gw: { { gw_id: 95 gw_name: <description of gw id 95> requests: 222 requests_invite: 1 requests_cancel: 1 requests_ack: 1 ... } } } ``` #### Actual observed behavior To my knowledge, nothing related to this issue has been implemented in Kamailio so far -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3372 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3372(a)github.com>

1 year, 9 months

[kamailio/kamailio] lcr: add counters per gateway (PR #3391)

by Alessio Garzi

#### 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 #3372 #### Description Implementing the suggesting lcr counters per gateway You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3391 -- Commit Summary -- * lcr: add counters per gateway -- File Changes -- M src/modules/lcr/lcr_mod.c (306) M src/modules/lcr/lcr_mod.h (52) M src/modules/lcr/lcr_rpc.c (460) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3391.patch https://github.com/kamailio/kamailio/pull/3391.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3391 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3391(a)github.com>

1 year, 9 months

git:master:ebfacdb7: core: tmrec fix build warning introduced at dd6339f817822cd0590aec2a9a467330bde499dd

by Victor Seva

Module: kamailio Branch: master Commit: ebfacdb7d7c3dfceb68e9550eec72b89d695fd4b URL: https://github.com/kamailio/kamailio/commit/ebfacdb7d7c3dfceb68e9550eec72b8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T12:07:27+01:00 core: tmrec fix build warning introduced at dd6339f817822cd0590aec2a9a467330bde499dd > core/utils/tmrec.c: In function 'ac_print': > core/utils/tmrec.c:275:32: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] > 275 | printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, > | ~~~^ ~~~~~~~~~~~~~~~~~~~~ > | | | > | long long unsigned int long unsigned int > | %lu --- Modified: src/core/utils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/ebfacdb7d7c3dfceb68e9550eec72b8… Patch: https://github.com/kamailio/kamailio/commit/ebfacdb7d7c3dfceb68e9550eec72b8… --- diff --git a/src/core/utils/tmrec.c b/src/core/utils/tmrec.c index adae68edbf..205866163f 100644 --- a/src/core/utils/tmrec.c +++ b/src/core/utils/tmrec.c @@ -272,7 +272,7 @@ int ac_print(ac_tm_t *_atp) return -1; } - printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, + printf("\nSys time: %lu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year+1900, _atp->t.tm_mon+1, _atp->t.tm_mday); @@ -512,15 +512,15 @@ int tr_print(tmrec_t *_trp) return -1; } printf("Recurrence definition\n-- start time ---\n"); - printf("Sys time: %llu\n", (uint64_t)_trp->dtstart); + printf("Sys time: %lu\n", (uint64_t)_trp->dtstart); printf("Time: %02d:%02d:%02d\n", _trp->ts.tm_hour, _trp->ts.tm_min, _trp->ts.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_trp->ts.tm_wday], _trp->ts.tm_year+1900, _trp->ts.tm_mon+1, _trp->ts.tm_mday); printf("---\n"); - printf("End time: %llu\n", (uint64_t)_trp->dtend); - printf("Duration: %llu\n", (uint64_t)_trp->duration); - printf("Until: %llu\n", (uint64_t)_trp->until); + printf("End time: %lu\n", (uint64_t)_trp->dtend); + printf("Duration: %lu\n", (uint64_t)_trp->duration); + printf("Until: %lu\n", (uint64_t)_trp->until); printf("Freq: %d\n", (int)_trp->freq); printf("Interval: %d\n", (int)_trp->interval); if(_trp->byday)

1 year, 9 months

git:master:6e032019: nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c

by Victor Seva

Module: kamailio Branch: master Commit: 6e032019d992625abc2a3739423df9ea1c964356 URL: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T12:01:32+01:00 nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c > nat_traversal.c: In function 'get_register_expire': > ../../core/parser/../dprint.h:321:73: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 11 has type 'long unsigned int' [-Wformat=] > 321 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ > | ^~~~~~~~~~~~~~~~~~~~~~~~ --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… Patch: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index d659aced45..d21a8b7e01 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -923,7 +923,7 @@ static time_t get_register_expire( } } - LM_DBG("maximum expire for all contacts: %llu\n", (uint64_t)expire); + LM_DBG("maximum expire for all contacts: %lu\n", (uint64_t)expire); return (expire ? expire + now : 0); }

1 year, 9 months

git:master:781ee072: lcr: fix building warnings initializating values

by Victor Seva

Module: kamailio Branch: master Commit: 781ee072593f16a100ef00b5ef71fcfd6f8ded2b URL: https://github.com/kamailio/kamailio/commit/781ee072593f16a100ef00b5ef71fcf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T11:55:34+01:00 lcr: fix building warnings initializating values > https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=… > [...] > lcr_mod.c:2630:9: warning: 'tmp_tag.len' may be used uninitialized [-Wmaybe-uninitialized] --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/781ee072593f16a100ef00b5ef71fcf… Patch: https://github.com/kamailio/kamailio/commit/781ee072593f16a100ef00b5ef71fcf… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index b668160cb33..80b62f5d4c7 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2526,10 +2526,21 @@ static int generate_uris(struct sip_msg *_m, char *r_uri, str *r_uri_user, { int_str gw_uri_val; struct usr_avp *gu_avp; - str scheme, prefix, hostname, port, params, transport, addr_str, tmp_tag; + str scheme = STR_NULL; + str prefix = STR_NULL; + str hostname = STR_NULL; + str port = STR_NULL; + str params = STR_NULL; + str transport = STR_NULL; + str addr_str = STR_NULL; + str tmp_tag = STR_NULL; char *at; - unsigned int strip; + unsigned int strip = 0; + if(!tag) { + LM_ERR("tag parameter is empty\n"); + return -1; + } gu_avp = search_first_avp(gw_uri_avp_type, gw_uri_avp, &gw_uri_val, 0); if(!gu_avp)

1 year, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2023