sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
242 discussions

git:master:a03dd2fd: dmq: improve debug logs related to locks

by Victor Seva

Module: kamailio Branch: master Commit: a03dd2fdb6ac30937f29fe63cabbe09902ad8300 URL: https://github.com/kamailio/kamailio/commit/a03dd2fdb6ac30937f29fe63cabbe09… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T01:13:39+01:00 dmq: improve debug logs related to locks * dmq_node_list->lock * dmq_worker->lock unreleased and some info inside worker_loop() --- Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/a03dd2fdb6ac30937f29fe63cabbe09… Patch: https://github.com/kamailio/kamailio/commit/a03dd2fdb6ac30937f29fe63cabbe09…

9 months

git:5.5:fa08fabe: dmq: fix inter-lock on error

by Victor Seva

Module: kamailio Branch: 5.5 Commit: fa08fabebb0640d4fe6907b06c78f5154321e5c5 URL: https://github.com/kamailio/kamailio/commit/fa08fabebb0640d4fe6907b06c78f51… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:12:51+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) (cherry picked from commit 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea) (cherry picked from commit 0a96c9f4fb3bf179d417b0188d619afd7d9096ef) (cherry picked from commit 3ad3a61a901192290344bd4fadd724f61b8a4444) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/fa08fabebb0640d4fe6907b06c78f51… Patch: https://github.com/kamailio/kamailio/commit/fa08fabebb0640d4fe6907b06c78f51… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index d40fd2cac2e..b04d0fa6d30 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -402,8 +402,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) { LM_DBG("found new node %.*s\n", STR_FMT(&tmp_uri));

9 months

git:5.6:3ad3a61a: dmq: fix inter-lock on error

by Victor Seva

Module: kamailio Branch: 5.6 Commit: 3ad3a61a901192290344bd4fadd724f61b8a4444 URL: https://github.com/kamailio/kamailio/commit/3ad3a61a901192290344bd4fadd724f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:11:40+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) (cherry picked from commit 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea) (cherry picked from commit 0a96c9f4fb3bf179d417b0188d619afd7d9096ef) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/3ad3a61a901192290344bd4fadd724f… Patch: https://github.com/kamailio/kamailio/commit/3ad3a61a901192290344bd4fadd724f… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index b2470d5ff86..c62eefb1855 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) { LM_DBG("found new node %.*s\n", STR_FMT(&tmp_uri));

9 months

git:5.7:0a96c9f4: dmq: fix inter-lock on error

by Victor Seva

Module: kamailio Branch: 5.7 Commit: 0a96c9f4fb3bf179d417b0188d619afd7d9096ef URL: https://github.com/kamailio/kamailio/commit/0a96c9f4fb3bf179d417b0188d619af… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:10:01+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) (cherry picked from commit 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/0a96c9f4fb3bf179d417b0188d619af… Patch: https://github.com/kamailio/kamailio/commit/0a96c9f4fb3bf179d417b0188d619af… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index b2470d5ff86..c62eefb1855 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) { LM_DBG("found new node %.*s\n", STR_FMT(&tmp_uri));

9 months

git:5.8:814f5bdc: dmq: fix inter-lock on error

by Victor Seva

Module: kamailio Branch: 5.8 Commit: 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea URL: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:09:22+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… Patch: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 6189acf5359..5e9452a51f3 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) {

9 months

git:master:0d240e4e: dmq: fix inter-lock on error

by Victor Seva

Module: kamailio Branch: master Commit: 0d240e4e0dc3184ef37d338ba6872d295d6b16f2 URL: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:00:44+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… Patch: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 6189acf5359..5e9452a51f3 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) {

9 months

[kamailio/kamailio] kamcmd keepalive.list the last up and down time reversed (Issue #3790)

by suiyuemanbu

kamailio 5.7.0 kamcmd keepalive.list { uri: sip:192.168.10.12:8877 owner: drouting last checked: Mon Mar 18 17:45:39 2024 last up: Mon Mar 18 17:45:59 2024 //err last down: Thu Jan 1 08:00:00 1970 //err state: 2 } { uri: sip:192.168.10.124:5080 owner: drouting last checked: Tue Mar 19 10:34:39 2024 last up: Thu Jan 1 08:00:00 1970 //err last down: Tue Mar 19 10:34:39 2024 //err state: 1 } -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3790 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3790(a)github.com>

9 months

git:master:4ada8180: file_out: Cast to correct type of str

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 4ada818099b5b7cb7deff1b1ce93b5aacaa1b84e URL: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-22T10:30:30Z file_out: Cast to correct type of str --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… Patch: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 7e035f13359..886f01f944f 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -344,7 +344,7 @@ static int fo_add_filename(modparam_t type, void *val) LM_ERR("modparam value is null\n"); return -1; } - if(strlen((char *)val) == 0) { + if(strlen(((str *)val)->s) == 0) { LM_ERR("modparam value is empty\n"); return -1; }

9 months

git:master:5f901c35: core: socket info - parse advertise ip part to get address family

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5f901c3557f9f875545d82a7ab00f6d0c5c1fe52 URL: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T10:25:48+01:00 core: socket info - parse advertise ip part to get address family --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… Patch: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index e048e0e2c4b..ab59df73dd6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -338,6 +338,11 @@ static inline struct socket_info *new_sock_info(char *name, p = si->useinfo.name.s + 1; si->useinfo.af = AF_INET6; } else { + ip_addr_t *ipv = NULL; + ipv = str2ipx(&si->useinfo.name); + if(ipv != NULL) { + si->useinfo.af = ipv->af; + } si->useinfo.address_str.len = si->useinfo.name.len; p = si->useinfo.name.s; }

9 months

git:master:919216d0: core: fixup helpers with option to check if variable is writable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 919216d051b8d459eb97f7ab0968d6bf0bead188 URL: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T10:18:23+01:00 core: fixup helpers with option to check if variable is writable --- Modified: src/core/mod_fix.c --- Diff: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… Patch: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 520ed44708c..0947f788461 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -730,12 +730,21 @@ int fixup_free_spve_spve_igp(void **param, int param_no) /** * */ -int fixup_spve_n_pvar(void **param, int n, int param_no) +int fixup_spve_n_pvar(void **param, int n, int param_no, int pvmode) { + int ret = 0; if(param_no >= 1 && param_no <= n) return fixup_spve_null(param, 1); - if(param_no == n + 1) - return fixup_pvar_null(param, 1); + if(param_no == n + 1) { + ret = fixup_pvar_null(param, 1); + if((ret == 0) && (pvmode == 1)) { + if(((pv_spec_t *)(*param))->setf == NULL) { + LM_ERR("pvar is not writeble\n"); + return E_UNSPEC; + } + } + return ret; + } return E_UNSPEC; } @@ -756,7 +765,7 @@ int fixup_free_spve_n_pvar(void **param, int n, int param_no) */ int fixup_spve_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 1, param_no); + return fixup_spve_n_pvar(param, 1, param_no, 0); } /** @@ -772,7 +781,7 @@ int fixup_free_spve_pvar(void **param, int param_no) */ int fixup_spve2_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 2, param_no); + return fixup_spve_n_pvar(param, 2, param_no, 1); } /** @@ -788,7 +797,7 @@ int fixup_free_spve2_pvar(void **param, int param_no) */ int fixup_spve3_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 3, param_no); + return fixup_spve_n_pvar(param, 3, param_no, 1); } /** @@ -804,7 +813,7 @@ int fixup_free_spve3_pvar(void **param, int param_no) */ int fixup_spve4_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 4, param_no); + return fixup_spve_n_pvar(param, 4, param_no, 1); } /**

9 months

← Newer
1
...
6
7
8
9
10
11
12
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024