sr-dev

sr-dev@lists.kamailio.org

22 participants
45189 discussions

Dialog-Module and CSeq tracking
by Carsten Bock 17 Mar '23

17 Mar '23

Hi, Quick question: Looking at the Dialog module and CSeq tracking functionality, I've noticed the following: - on the one hand, we are storing the current CSeq for each direction in the Dialog structure - on the other hand, we are storing a "Delta" of the received vs. updated CSeq as a Dialog Variable Does replacing the Delta with the CSeq already stored with the Dialog structure make sense? I am asking because of my latest changes, where there may be more sources for an updated CSeq (e.g., when sending a Request from script within the Dialog) and more use cases for an updated CSeq (Up and Downstream). I've updated the dialog module for my use already accordingly https://github.com/kamailio/kamailio/compare/master...carstenbock/dialog_cs… I wanted to hear other opinions and possible pitfalls as well... Thanks, Carsten -- Carsten Bock I CTO & Founder ng-voice GmbH Trostbrücke 1 I 20457 Hamburg I Germany T +49 179 2021244 I www.ng-voice.com Registry Office at Local Court Hamburg, HRB 120189 Managing Directors: Dr. David Bachmann, Carsten Bock

3 3

git:master:e8520177: auth_identity: add missing error handling for allocation errors, convert to memory log macros
by Henning Westerholt 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: e8520177f6fd70676251cfd2307c0ab40701a701 URL: https://github.com/kamailio/kamailio/commit/e8520177f6fd70676251cfd2307c0ab… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T21:14:20Z auth_identity: add missing error handling for allocation errors, convert to memory log macros --- Modified: src/modules/auth_identity/auth_dynstr.c Modified: src/modules/auth_identity/auth_hdrs.c Modified: src/modules/auth_identity/auth_http.c Modified: src/modules/auth_identity/auth_identity.c Modified: src/modules/auth_identity/auth_tables.c --- Diff: https://github.com/kamailio/kamailio/commit/e8520177f6fd70676251cfd2307c0ab… Patch: https://github.com/kamailio/kamailio/commit/e8520177f6fd70676251cfd2307c0ab…

1 0

git:master:7e617ab8: dmq: add missing memory allocation checks, convert to memory log macros
by Henning Westerholt 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: 7e617ab89f5275f1b269382ae2c1fee508854cf1 URL: https://github.com/kamailio/kamailio/commit/7e617ab89f5275f1b269382ae2c1fee… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T21:10:04Z dmq: add missing memory allocation checks, convert to memory log macros --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/message.c Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/peer.c Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/7e617ab89f5275f1b269382ae2c1fee… Patch: https://github.com/kamailio/kamailio/commit/7e617ab89f5275f1b269382ae2c1fee…

1 0

git:master:aa4d015a: dispatcher: small formatting adaption related to 6aee3bd7c
by Henning Westerholt 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: aa4d015a58bb24ba5bda6e6133b0e9f314e2318e URL: https://github.com/kamailio/kamailio/commit/aa4d015a58bb24ba5bda6e6133b0e9f… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T17:20:14Z dispatcher: small formatting adaption related to 6aee3bd7c --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/aa4d015a58bb24ba5bda6e6133b0e9f… Patch: https://github.com/kamailio/kamailio/commit/aa4d015a58bb24ba5bda6e6133b0e9f… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 50ad98dc0f..d79fb7a6d3 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -4039,8 +4039,7 @@ ds_set_t *ds_avl_insert(ds_set_t **root, int id, int *setn) } if(!node) { node = shm_malloc(sizeof(ds_set_t)); - if(!(node)) - { + if(!(node)) { SHM_MEM_ERROR; return NULL; } diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 8ccc86fedc..5cb3d7aba2 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -360,15 +360,13 @@ static int mod_init(void) /* Initialize the counter */ ds_ping_reply_codes = (int **)shm_malloc(sizeof(unsigned int *)); - if(!(ds_ping_reply_codes)) - { + if(!(ds_ping_reply_codes)) { SHM_MEM_ERROR; return -1; } *ds_ping_reply_codes = 0; ds_ping_reply_codes_cnt = (int *)shm_malloc(sizeof(int)); - if(!(ds_ping_reply_codes_cnt)) - { + if(!(ds_ping_reply_codes_cnt)) { shm_free(ds_ping_reply_codes); SHM_MEM_ERROR; return -1;

1 0

git:master:6aee3bd7: dispatcher: add missing memory allocation checks, convert to memory log macros
by Henning Westerholt 14 Mar '23

14 Mar '23

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 0

Re: [kamailio/kamailio] nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c (6e03201)
by Victor Seva 14 Mar '23

14 Mar '23

@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 0

git:master:ef0427ea: nat_traversal:
by Victor Seva 14 Mar '23

14 Mar '23

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 0

git:master:88412576: core: use PRIu64 macro to find out what format is needed for uint64_t
by Victor Seva 14 Mar '23

14 Mar '23

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 0

Re: [kamailio/kamailio] nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c (6e03201)
by Richard Fuchs 14 Mar '23

14 Mar '23

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 0

[kamailio/kamailio] Statistic counters for LCR module (Issue #3372)
by Alessio Garzi 14 Mar '23

14 Mar '23

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

3 6

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev