sr-dev October 2021

sr-dev@lists.kamailio.org

19 participants
243 discussions

git:master:1a30e472: ims_charging: include kemi.h to fix compile warning

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1a30e472321c338987575bcc9feb73ad0150afd6 URL: https://github.com/kamailio/kamailio/commit/1a30e472321c338987575bcc9feb73a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-28T20:25:48+02:00 ims_charging: include kemi.h to fix compile warning --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/1a30e472321c338987575bcc9feb73a… Patch: https://github.com/kamailio/kamailio/commit/1a30e472321c338987575bcc9feb73a… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 6458a8070f..0a8c53f9d9 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -7,6 +7,7 @@ #include "../../core/socket_info.h" #include "../../core/timer.h" #include "../../core/locking.h" +#include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" #include "../../modules/ims_dialog/dlg_hash.h"

2 years, 6 months

[kamailio/kamailio] cannot start on aarch64 with Google ASAN (Issue #2897)

by sergey-safarov

### Description I have compiled Kamailio on aarch64 hosts with Google ASAN. Also used system memory manager ("make MEMPKG=sys cfg"). During compilation used flags ``` -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment ``` When Kamailio is started with the default config file I get an error ``` core/script_cb.c:85:31: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' ``` As used 64 bit CPU, looks like a strange this error ### Additional Information compiled commit 102d5dab4f45cab238ffeb72e7ddf378c8daa17d * **Operating System**: ``` [root@logger-west kamailio]# uname -a Linux example.com 4.18.0-305.7.1.el8_4.aarch64 #1 SMP Tue Jun 29 21:32:00 UTC 2021 aarch64 aarch64 aarch64 GNU/Linux [root@logger-west kamailio]# lsb_release -a LSB Version: :core-4.1-aarch64:core-4.1-noarch Distributor ID: CentOS Description: CentOS Linux release 8.4.2105 Release: 8.4.2105 Codename: n/a ``` -- 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/2897

2 years, 6 months

git:master:f7f9ea0f: core: hashes - cast to unsigned int for left shifting

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f7f9ea0f3cfb8e61a4f2f47a214cb4e89d713da4 URL: https://github.com/kamailio/kamailio/commit/f7f9ea0f3cfb8e61a4f2f47a214cb4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-28T17:54:19+02:00 core: hashes - cast to unsigned int for left shifting --- Modified: src/core/hashes.h --- Diff: https://github.com/kamailio/kamailio/commit/f7f9ea0f3cfb8e61a4f2f47a214cb4e… Patch: https://github.com/kamailio/kamailio/commit/f7f9ea0f3cfb8e61a4f2f47a214cb4e… --- diff --git a/src/core/hashes.h b/src/core/hashes.h index 2afb8361c8..62708bdb35 100644 --- a/src/core/hashes.h +++ b/src/core/hashes.h @@ -273,7 +273,7 @@ static inline unsigned int core_hash(const str *s1, const str *s2, end=s1->s+s1->len; for ( p=s1->s ; p<=(end-4) ; p+=4 ){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; @@ -283,11 +283,11 @@ static inline unsigned int core_hash(const str *s1, const str *s2, if (s2) { end=s2->s+s2->len; for (p=s2->s; p<=(end-4); p+=4){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; - for (; p<end ; p++){ v<<=8; v+=*p;} + for (; p<end ; p++){ v<<=8; v+=p[0];} ch_h_inc; } h=((h)+(h>>11))+((h>>13)+(h>>23));

2 years, 6 months

[kamailio/kamailio] msrp: fix some tcpconn where memory was never cleaned up (PR #2890)

by Nacho G.

Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880   #### 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 #2880 (replace XXXX with an open issue number) #### Description  Just do some missing `tcpconn_put` calls on MSRP module after a tcpconn_get. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2890 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2890/commits/19714ebaa0f653f65d83…">msrp: fix some tcpconn where memory was never cleaned up</a> -- File Changes -- M src/modules/msrp/msrp_netio.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2890.patch https://github.com/kamailio/kamailio/pull/2890.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/2890

2 years, 6 months

git:master:bf371ccb: msrp: fix some tcpconn where memory was never cleaned up

by Nacho Garcia Segovia

Module: kamailio Branch: master Commit: bf371ccbfa1c89fefcd9d9322ae75189d97fc862 URL: https://github.com/kamailio/kamailio/commit/bf371ccbfa1c89fefcd9d9322ae7518… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2021-10-22T10:38:48+02:00 msrp: fix some tcpconn where memory was never cleaned up Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880 --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/bf371ccbfa1c89fefcd9d9322ae7518… Patch: https://github.com/kamailio/kamailio/commit/bf371ccbfa1c89fefcd9d9322ae7518… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b..859432aa6d 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

2 years, 6 months

git:master:77bc4c6c: Merge pull request #2890 from NGSegovia/msrp_tcp_mem_leak

by GitHub

Module: kamailio Branch: master Commit: 77bc4c6c96cfb2ce5b7086ccfffd19750b085d74 URL: https://github.com/kamailio/kamailio/commit/77bc4c6c96cfb2ce5b7086ccfffd197… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-27T15:18:49+02:00 Merge pull request #2890 from NGSegovia/msrp_tcp_mem_leak msrp: fix some tcpconn where memory was never cleaned up --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/77bc4c6c96cfb2ce5b7086ccfffd197… Patch: https://github.com/kamailio/kamailio/commit/77bc4c6c96cfb2ce5b7086ccfffd197… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b..859432aa6d 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

2 years, 6 months

git:master:f8c484d4: modules: readme files regenerated - db_cluster ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f8c484d464fd1de074da334eff5165c38d4c8ebd URL: https://github.com/kamailio/kamailio/commit/f8c484d464fd1de074da334eff5165c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-27T15:01:17+02:00 modules: readme files regenerated - db_cluster ... [skip ci] --- Modified: src/modules/db_cluster/README --- Diff: https://github.com/kamailio/kamailio/commit/f8c484d464fd1de074da334eff5165c… Patch: https://github.com/kamailio/kamailio/commit/f8c484d464fd1de074da334eff5165c… --- diff --git a/src/modules/db_cluster/README b/src/modules/db_cluster/README index 4e52d0ab24..7260f0f1aa 100644 --- a/src/modules/db_cluster/README +++ b/src/modules/db_cluster/README @@ -10,6 +10,10 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> +Frits Wiersma + + <frits.wiersma(a)isp.solcon.nl> + Copyright © 2012 asipto.com __________________________________________________________________ @@ -31,6 +35,12 @@ Daniel-Constantin Mierla 3.4. max_query_length (int) 4. Usage + 5. RPC Commands + + 5.1. dbcl.list_clusters + 5.2. dbcl.list_connections + 5.3. dbcl.disable_connection + 5.4. dbcl.enable_connection List of Examples @@ -58,6 +68,12 @@ Chapter 1. Admin Guide 3.4. max_query_length (int) 4. Usage + 5. RPC Commands + + 5.1. dbcl.list_clusters + 5.2. dbcl.list_connections + 5.3. dbcl.disable_connection + 5.4. dbcl.enable_connection 1. Overview @@ -204,3 +220,58 @@ modparam("acc", "db_url", "cluster://k1") modparam("sqlops", "sqlcon", "ca=>cluster://k1") ... + +5. RPC Commands + + 5.1. dbcl.list_clusters + 5.2. dbcl.list_connections + 5.3. dbcl.disable_connection + 5.4. dbcl.enable_connection + +5.1. dbcl.list_clusters + + Lists all database clusters. + + Name: dbcl.list_clusters + + RPC Command Format: +... +kamcmd dbcl.list_clusters +... + +5.2. dbcl.list_connections + + Lists all database connections of a specific cluster. + + Name: dbcl.list_connections + + RPC Command Format: +... +kamcmd dbcl.list_connections clustername +... + +5.3. dbcl.disable_connection + + Disable a database connection of a specific cluster for a period. The + database connection remains open but will not be used for the specified + period (seconds). The command does not allow to close all database + connections of the specific cluster. If the database connection is + already disabled than the new period will overwrite the old period. + + Name: dbcl.disable_connection + + RPC Command Format: +... +kamcmd dbcl.disable_connection clustername connectionname period +... + +5.4. dbcl.enable_connection + + Enable a database connection of a specific cluster. + + Name: dbcl.enable_connection + + RPC Command Format: +... +kamcmd dbcl.enable_connection clustername connectionname +...

2 years, 6 months

[kamailio/kamailio] db_cluster: RPC commands to control database connections (PR #2893)

by Frits Wiersma

#### 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  The database cluster modules (db_cluster) does not allow manual controle over database connections in the cluster. This change adds some rpc commands to allow this. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2893 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2893/commits/a58e7a235c1300cfbdaf…">db_cluster: RPC commands to control database connections</a> -- File Changes -- M src/modules/db_cluster/db_cluster_mod.c (249) M src/modules/db_cluster/dbcl_data.c (33) M src/modules/db_cluster/dbcl_data.h (5) M src/modules/db_cluster/doc/db_cluster.xml (5) M src/modules/db_cluster/doc/db_cluster_admin.xml (61) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2893.patch https://github.com/kamailio/kamailio/pull/2893.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/2893

2 years, 6 months

git:master:2c2dbcb1: Merge pull request #2893 from CFrits/master

by GitHub

Module: kamailio Branch: master Commit: 2c2dbcb1336b447322bb74fcbd5303d9acde842c URL: https://github.com/kamailio/kamailio/commit/2c2dbcb1336b447322bb74fcbd5303d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-27T14:52:20+02:00 Merge pull request #2893 from CFrits/master db_cluster: RPC commands to control database connections --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h Modified: src/modules/db_cluster/doc/db_cluster.xml Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2c2dbcb1336b447322bb74fcbd5303d… Patch: https://github.com/kamailio/kamailio/commit/2c2dbcb1336b447322bb74fcbd5303d…

2 years, 6 months

git:master:a58e7a23: db_cluster: RPC commands to control database connections

by CFrits

Module: kamailio Branch: master Commit: a58e7a235c1300cfbdafe22e5c3c830a678d3d26 URL: https://github.com/kamailio/kamailio/commit/a58e7a235c1300cfbdafe22e5c3c830… Author: CFrits <frits.wiersma(a)isp.solcon.nl> Committer: CFrits <frits.wiersma(a)isp.solcon.nl> Date: 2021-10-21T19:44:18+02:00 db_cluster: RPC commands to control database connections - Add rpc commands to list, enable or disable database connections of a cluster. --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h Modified: src/modules/db_cluster/doc/db_cluster.xml Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a58e7a235c1300cfbdafe22e5c3c830… Patch: https://github.com/kamailio/kamailio/commit/a58e7a235c1300cfbdafe22e5c3c830…

2 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2021