sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
236 discussions

git:master:2d00ce54: dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 2d00ce546bb0852dc1784d5bc2e794d06f919577 URL: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:06:12+01:00 dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3 - The dialogs that loaded at startup are not saved in DB on shutdown, and so not loaded at restart, fixes issue #3669 --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… Patch: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index ecfd872504f..b6fe1afda6f 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -509,6 +509,9 @@ int load_dialog_info_from_db( get_ticks()); dlg->dflags = 0; + if(mode == 0 && dlg_db_mode == DB_MODE_SHUTDOWN) { + dlg->dflags |= DLG_FLAG_NEW; + } if(mode != 0) { if(loaded_extra < DLG_MAX_DB_LOAD_EXTRA) {

1 0

[kamailio/kamailio] haproxy parser: wrong values (Issue #3683)
by sergey-safarov 28 Dec '23

28 Dec '23

### Description Found error in the haproxy protocol parser Does not properly parsed ``` $rcv(rcvip) $rcv(srcport) $rcv(rcvport) ``` #### Reproduction This can be tested suing config file ``` #!define IPV6_ADDR ::1 tcp_accept_haproxy=yes received_route_mode=1 listen=tcp:[IPV6_ADDR]:45060 loadmodule "xlog.so" loadmodule "pv.so" event_route[core:msg-received] { xerr("Source IP: $rcv(srcip)\n"); xerr("Received socket: $rcv(rcvip)\n"); xerr("Source port: $rcv(srcport)\n"); xerr("Received port: $rcv(rcvport)\n"); } request_route { drop; } ``` Then required send call via haproxy server ```sh sipp -l 1 -m 1 -t t1 -sn uac [2600::5] ``` #### Log Messages ``` 4(1749405) ERROR: <script>: Source IP: 2600:xxx:6d5:aa02::c3 4(1749405) ERROR: <script>: Received socket: 2600:xxx:6d5:aa02::c3 4(1749405) ERROR: <script>: Source port: 50707 4(1749405) ERROR: <script>: Received port: 50195 ``` Here is `received socket` contains "source ip" and porst parsed in the reverse order. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3683 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3683(a)github.com>

2 1

git:master:c5237830: core: fixed haproxy protocol parser
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: c5237830f3e7fbeec403a0190471a066081c1117 URL: https://github.com/kamailio/kamailio/commit/c5237830f3e7fbeec403a0190471a06… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:05:14+01:00 core: fixed haproxy protocol parser fixes GH #3683 --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/c5237830f3e7fbeec403a0190471a06… Patch: https://github.com/kamailio/kamailio/commit/c5237830f3e7fbeec403a0190471a06… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 4972b7d20af..35034d1baa8 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1018,12 +1018,12 @@ int tcpconn_read_haproxy(struct tcp_connection *c) src_ip->af = AF_INET; src_ip->len = 4; src_ip->u.addr32[0] = hdr.v2.addr.ip4.src_addr; - c->rcv.src_port = hdr.v2.addr.ip4.src_port; + c->rcv.src_port = htons(hdr.v2.addr.ip4.src_port); dst_ip->af = AF_INET; dst_ip->len = 4; dst_ip->u.addr32[0] = hdr.v2.addr.ip4.dst_addr; - c->rcv.dst_port = hdr.v2.addr.ip4.dst_port; + c->rcv.dst_port = htons(hdr.v2.addr.ip4.dst_port); goto done; @@ -1031,12 +1031,12 @@ int tcpconn_read_haproxy(struct tcp_connection *c) src_ip->af = AF_INET6; src_ip->len = 16; memcpy(src_ip->u.addr, hdr.v2.addr.ip6.src_addr, 16); - c->rcv.src_port = hdr.v2.addr.ip6.src_port; + c->rcv.src_port = htons(hdr.v2.addr.ip6.src_port); dst_ip->af = AF_INET6; dst_ip->len = 16; - memcpy(dst_ip->u.addr, hdr.v2.addr.ip6.src_addr, 16); - c->rcv.dst_port = hdr.v2.addr.ip6.dst_port; + memcpy(dst_ip->u.addr, hdr.v2.addr.ip6.dst_addr, 16); + c->rcv.dst_port = htons(hdr.v2.addr.ip6.dst_port); goto done;

1 0

[kamailio/kamailio] core: fixed haproxy protocol parser (PR #3685)
by sergey-safarov 28 Dec '23

28 Dec '23

#### 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 - [x] 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3683 (replace XXXX with an open issue number) #### Description fixes GH #3683 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3685 -- Commit Summary -- * core: fixed haproxy protocol parser -- File Changes -- M src/core/tcp_main.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3685.patch https://github.com/kamailio/kamailio/pull/3685.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3685 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3685(a)github.com>

2 2

git:master:23a1d067: dialog: rename function parameter to avoid shadowing of global variable
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 23a1d06737fa6d2509b6f88574ad171aa32cf275 URL: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T10:21:01+01:00 dialog: rename function parameter to avoid shadowing of global variable --- Modified: src/modules/dialog/dlg_profile.c --- Diff: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… Patch: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… --- diff --git a/src/modules/dialog/dlg_profile.c b/src/modules/dialog/dlg_profile.c index 5dd3b372d49..43aee6278e0 100644 --- a/src/modules/dialog/dlg_profile.c +++ b/src/modules/dialog/dlg_profile.c @@ -70,21 +70,21 @@ static sruid_t _dlg_profile_sruid; /*! * \brief Add profile definitions to the global list * \see new_dlg_profile - * \param profiles profile name + * \param profiledef profile name * \param has_value set to 0 for a profile without value, otherwise it has a value * \return 0 on success, -1 on failure */ -int add_profile_definitions(char *profiles, unsigned int has_value) +int add_profile_definitions(char *profiledef, unsigned int has_value) { char *p; char *d; str name; unsigned int i; - if(profiles == NULL || strlen(profiles) == 0) + if(profiledef == NULL || strlen(profiledef) == 0) return 0; - p = profiles; + p = profiledef; do { /* locate name of profile */ name.s = p;

1 0

git:master:4b862326: timer: rename local variable to avoid shadowing global
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 4b862326cce4b16154353d393d60c8f12762da86 URL: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T12:09:26+01:00 timer: rename local variable to avoid shadowing global --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… Patch: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index a7741496626..2f3f1b1bf34 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -88,12 +88,12 @@ static timer_action_t *timer_executed = 0; } static timer_action_t *find_action_by_name( - timer_action_t *timer_actions, char *name, int len) + timer_action_t *timer_actions_list, char *name, int len) { timer_action_t *a; if(len == -1) len = strlen(name); - for(a = timer_actions; a; a = a->next) { + for(a = timer_actions_list; a; a = a->next) { if(a->timer_name && strlen(a->timer_name) == len && strncmp(name, a->timer_name, len) == 0) return a;

1 0

[kamailio/kamailio] tm: Reset local_response_sent_lookup (PR #3687)
by Xenofon Karamanos 27 Dec '23

27 Dec '23

#### 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 - [x] 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 - [x] Tested changes locally - [x] Related to issue #3064 (replace XXXX with an open issue number) #### Description  This PR fixes #3064. It resets the check variable back to 0 after sending a tm:local-response reply. As of currently, event_route[tm:local-response] will be called only max `children` times (one for each) and then won't process any more. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3687 -- Commit Summary -- * tm: Reset local_response_sent_lookup -- File Changes -- M src/modules/tm/t_reply.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3687.patch https://github.com/kamailio/kamailio/pull/3687.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3687 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3687(a)github.com>

2 3

git:master:9c72487c: sipcature: rename global variable to avoid shadowing by function parameter
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 9c72487cc5a54d7599e2904251133fc8cc29ed84 URL: https://github.com/kamailio/kamailio/commit/9c72487cc5a54d7599e2904251133fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 sipcature: rename global variable to avoid shadowing by function parameter --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/9c72487cc5a54d7599e2904251133fc… Patch: https://github.com/kamailio/kamailio/commit/9c72487cc5a54d7599e2904251133fc… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 320e351a371..7dc3ae81f80 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -176,7 +176,7 @@ static int hep_version(struct sip_msg *msg); static str db_url = str_init(DEFAULT_DB_URL); -static str table_name = str_init("sip_capture"); +static str _sipcap_table_name = str_init("sip_capture"); static str hash_source = str_init("call_id"); static str mt_mode = str_init("rand"); static str date_column = str_init("date"); @@ -338,7 +338,7 @@ int capture_mode_param(modparam_t type, void *val); * Exported parameters */ static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"table_name", PARAM_STR, &table_name}, + {"table_name", PARAM_STR, &_sipcap_table_name}, {"hash_source", PARAM_STR, &hash_source}, {"mt_mode", PARAM_STR, &mt_mode}, {"date_column", PARAM_STR, &date_column}, @@ -818,9 +818,9 @@ static int mod_init(void) } } - /* Check the table name - if table_name is empty and no capture modes + /* Check the table name - if _sipcap_table_name is empty and no capture modes * are defined, then error*/ - if(!table_name.len && capture_modes_root == NULL) { + if(!_sipcap_table_name.len && capture_modes_root == NULL) { LM_ERR("ERROR: sipcapture: mod_init: table_name is not defined or " "empty\n"); return -1; @@ -831,14 +831,14 @@ static int mod_init(void) def_params = (char *)pkg_malloc( snprintf(NULL, 0, "db_url=%s;table_name=%s;mt_mode=%s;hash_source=%s", - db_url.s, table_name.s, mt_mode.s, hash_source.s) + db_url.s, _sipcap_table_name.s, mt_mode.s, hash_source.s) + 1); if(!def_params) { PKG_MEM_ERROR; return -1; } sprintf(def_params, "db_url=%s;table_name=%s;mt_mode=%s;hash_source=%s", - db_url.s, table_name.s, mt_mode.s, hash_source.s); + db_url.s, _sipcap_table_name.s, mt_mode.s, hash_source.s); str def_name, def_par; def_name.s = strdup("default"); @@ -1777,7 +1777,7 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, } table = &c->table_names[ii]; } else { - table = &table_name; + table = &_sipcap_table_name; } tvsec_ = (time_t)(sco->tmstamp / 1000000);

1 0

git:master:0186246f: statsd: use bool type for local variable to match return of function
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 0186246fce8f0e4bb46b30c05174983cd957a3ba URL: https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 statsd: use bool type for local variable to match return of function --- Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… Patch: https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… --- diff --git a/src/modules/statsd/statsd.c b/src/modules/statsd/statsd.c index 9724c9244e2..e9d3682bbd4 100644 --- a/src/modules/statsd/statsd.c +++ b/src/modules/statsd/statsd.c @@ -99,7 +99,7 @@ struct module_exports exports = { static int mod_init(void) { - int rc = 0; + bool rc = false; if(!statsd_params.ip) { LM_INFO("Statsd init ip value is null. use default 127.0.0.1\n"); } else { @@ -113,7 +113,7 @@ static int mod_init(void) } rc = statsd_init(statsd_params.ip, statsd_params.port); - if(rc < 0) { + if(rc == false) { LM_ERR("Statsd connection failed (ERROR_CODE: %i)\n", rc); return -1; } else {

1 0

git:master:934a5dd1: xhttp_prom: renamed global ctx variable
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 934a5dd1347c7b54a2d5e4437e1d3ab581f90596 URL: https://github.com/kamailio/kamailio/commit/934a5dd1347c7b54a2d5e4437e1d3ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 xhttp_prom: renamed global ctx variable - avoid short name code scanner warning and shadowing with function parameter --- Modified: src/modules/xhttp_prom/xhttp_prom.c --- Diff: https://github.com/kamailio/kamailio/commit/934a5dd1347c7b54a2d5e4437e1d3ab… Patch: https://github.com/kamailio/kamailio/commit/934a5dd1347c7b54a2d5e4437e1d3ab… --- diff --git a/src/modules/xhttp_prom/xhttp_prom.c b/src/modules/xhttp_prom/xhttp_prom.c index 198fea7d09d..ee5a5520f3c 100644 --- a/src/modules/xhttp_prom/xhttp_prom.c +++ b/src/modules/xhttp_prom/xhttp_prom.c @@ -114,7 +114,7 @@ int prom_histogram_param(modparam_t type, void *val); * being currently processed. * @sa prom_ctx */ -static prom_ctx_t ctx; +static prom_ctx_t _prom_ctx; static xhttp_api_t xhttp_api; @@ -251,6 +251,8 @@ static int mod_init(void) if(buf_size == 0) buf_size = pkg_mem_size / 3; + memset(&_prom_ctx, 0, sizeof(prom_ctx_t)); + /* Initialize Prometheus metrics. */ if(prom_metric_init()) { LM_ERR("Cannot initialize Prometheus metrics\n"); @@ -441,22 +443,22 @@ static int ki_xhttp_prom_dispatch(sip_msg_t *msg) } /* Init xhttp_prom context */ - if(ctx.reply.buf.s) { - LM_ERR("Unexpected buf value [%p][%d]\n", ctx.reply.buf.s, - ctx.reply.buf.len); + if(_prom_ctx.reply.buf.s) { + LM_ERR("Unexpected buf value [%p][%d]\n", _prom_ctx.reply.buf.s, + _prom_ctx.reply.buf.len); /* Something happened and this memory was not freed. */ - xhttp_prom_reply_free(&ctx); + xhttp_prom_reply_free(&_prom_ctx); } - memset(&ctx, 0, sizeof(prom_ctx_t)); - ctx.msg = msg; - if(init_xhttp_prom_reply(&ctx) < 0) { + memset(&_prom_ctx, 0, sizeof(prom_ctx_t)); + _prom_ctx.msg = msg; + if(init_xhttp_prom_reply(&_prom_ctx) < 0) { goto send_reply; } send_reply: - if(!ctx.reply_sent) { - ret = prom_send(&ctx); + if(!_prom_ctx.reply_sent) { + ret = prom_send(&_prom_ctx); } if(ret < 0) { return -1; @@ -2317,18 +2319,18 @@ static void rpc_prom_histogram_observe(rpc_t *rpc, void *ct) static void rpc_prom_metric_list_print(rpc_t *rpc, void *ct) { /* We reuse ctx->reply for the occasion. */ - if(init_xhttp_prom_reply(&ctx) < 0) { + if(init_xhttp_prom_reply(&_prom_ctx) < 0) { goto clean; } - if(prom_metric_list_print(&ctx)) { + if(prom_metric_list_print(&_prom_ctx)) { LM_ERR("Cannot print a list of metrics\n"); goto clean; } /* Convert to zero terminated string. */ struct xhttp_prom_reply *reply; - reply = &(ctx.reply); + reply = &(_prom_ctx.reply); reply->body.s[reply->body.len] = '\0'; /* Print content of reply buffer. */ @@ -2339,7 +2341,7 @@ static void rpc_prom_metric_list_print(rpc_t *rpc, void *ct) clean: - xhttp_prom_reply_free(&ctx); + xhttp_prom_reply_free(&_prom_ctx); return; }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2023