sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
269 discussions

git:master:b0f4c835: kazoo: fix kemi export due to changed function prototype

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b0f4c835b91059f021c4e5be1b16a6493cc46fbe URL: https://github.com/kamailio/kamailio/commit/b0f4c835b91059f021c4e5be1b16a64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T20:42:02+01:00 kazoo: fix kemi export due to changed function prototype - change done in dcb8e1650204c9453457871515ab5c7ec2d497f1 --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/b0f4c835b91059f021c4e5be1b16a64… Patch: https://github.com/kamailio/kamailio/commit/b0f4c835b91059f021c4e5be1b16a64… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 7155c62d37..4d9e3dcd8a 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1262,10 +1262,10 @@ int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, c headers_s.s = ""; } - return ki_kz_amqp_publish(msg, &exchange_s, &routing_key_s, &pl_s, &headers_s); + return ki_kz_amqp_publish_hdrs(msg, &exchange_s, &routing_key_s, &pl_s, &headers_s); }; -int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload, str* headers) +int ki_kz_amqp_publish_hdrs(sip_msg_t* msg, str* exchange, str* routing_key, str* payload, str* headers) { char *pl = ((str*)payload)->s; struct json_object *j = json_tokener_parse(pl); @@ -1279,6 +1279,11 @@ int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* pay return kz_amqp_pipe_send(exchange, routing_key, payload, headers); } +int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload) +{ + return ki_kz_amqp_publish_hdrs(msg, exchange, routing_key, payload, NULL); +} + int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char* payload) { return kz_amqp_publish_ex(msg, exchange, routing_key, payload, NULL); diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h index 5903314139..46897f694b 100644 --- a/src/modules/kazoo/kz_amqp.h +++ b/src/modules/kazoo/kz_amqp.h @@ -276,6 +276,7 @@ int kz_amqp_add_connection(modparam_t type, void* val); int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char* payload); int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* headers); int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload, str* headers); +int ki_kz_amqp_publish_hdrs(sip_msg_t* msg, str* exchange, str* routing_key, str* payload); int kz_amqp_query(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* dst, char* headers); int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* headers); int kz_amqp_subscribe(struct sip_msg* msg, char* payload);

2 years, 5 months

git:master:2c239795: jwt: exported jwt_generate_hdrs() function to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2c239795d3d1a7e0ef9918006ff57da13dfedae1 URL: https://github.com/kamailio/kamailio/commit/2c239795d3d1a7e0ef9918006ff57da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T17:55:22+01:00 jwt: exported jwt_generate_hdrs() function to kemi --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2c239795d3d1a7e0ef9918006ff57da… Patch: https://github.com/kamailio/kamailio/commit/2c239795d3d1a7e0ef9918006ff57da… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 4424aee13d..233a0709e3 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -174,7 +174,8 @@ static int jwt_fcache_add(str *key, str *kdata) /** * */ -static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, str *headers) +static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, + str *headers) { str dupclaims = STR_NULL; str sparams = STR_NULL; @@ -187,7 +188,7 @@ static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, unsigned char keybuf[10240]; size_t keybuf_len = 0; param_t* params_list = NULL; - param_t* headers_list = NULL; + param_t* headers_list = NULL; param_hooks_t phooks; param_t *pit = NULL; param_t *header = NULL; @@ -323,7 +324,7 @@ static int ki_jwt_generate_hdrs(sip_msg_t* msg, str *key, str *alg, str *claims, free_params(params_list); pkg_free(dupclaims.s); free_params(headers_list); - pkg_free(dupheaders.s); + pkg_free(dupheaders.s); jwt_free(jwt); return 1; @@ -404,7 +405,7 @@ static int w_jwt_generate_4(sip_msg_t* msg, char* pkey, char* palg, char* pclaim LM_ERR("cannot get claims value\n"); return -1; } - + if (fixup_get_svalue(msg, (gparam_t*)pheaders, &sheaders) != 0) { LM_ERR("cannot get headers value\n"); return -1; @@ -617,6 +618,11 @@ static sr_kemi_t sr_kemi_jwt_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("jwt"), str_init("jwt_generate_hdrs"), + SR_KEMIP_INT, ki_jwt_generate_hdrs, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("jwt"), str_init("jwt_verify"), SR_KEMIP_INT, ki_jwt_verify, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

2 years, 5 months

git:master:c83b3eb8: modules: readme files regenerated - jwt ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: c83b3eb828efbe5370eab9ecdfdd10cb9ea11a87 URL: https://github.com/kamailio/kamailio/commit/c83b3eb828efbe5370eab9ecdfdd10c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-14T17:46:16+01:00 modules: readme files regenerated - jwt ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/c83b3eb828efbe5370eab9ecdfdd10c… Patch: https://github.com/kamailio/kamailio/commit/c83b3eb828efbe5370eab9ecdfdd10c…

2 years, 5 months

[kamailio/kamailio] jwt: possibility to add headers when generating jwt (PR #2971)

by Rodrigo Alves Silva

#### 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) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Adding an optional forth parameter to jwt module to add headers. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2971 -- Commit Summary -- * jwt: possibility to add headers when generating jwt -- File Changes -- M src/modules/jwt/doc/jwt_admin.xml (11) M src/modules/jwt/jwt_mod.c (85) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2971.patch https://github.com/kamailio/kamailio/pull/2971.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/2971

2 years, 5 months

git:master:aaa142d2: jwt: possibility to add headers when generating jwt

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aaa142d293105ef27f7e4b6143fc3fb18c9a5a75 URL: https://github.com/kamailio/kamailio/commit/aaa142d293105ef27f7e4b6143fc3fb… Author: rodrigo.alves <rodrigo.alves(a)messagebird.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T17:36:02+01:00 jwt: possibility to add headers when generating jwt --- Modified: src/modules/jwt/doc/jwt_admin.xml Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/aaa142d293105ef27f7e4b6143fc3fb… Patch: https://github.com/kamailio/kamailio/commit/aaa142d293105ef27f7e4b6143fc3fb…

2 years, 5 months

git:master:8df3752c: modules: readme files regenerated - tls ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 8df3752c2d7ea37b4acadf76283287744a56005a URL: https://github.com/kamailio/kamailio/commit/8df3752c2d7ea37b4acadf762832877… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-14T14:16:31+01:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/8df3752c2d7ea37b4acadf762832877… Patch: https://github.com/kamailio/kamailio/commit/8df3752c2d7ea37b4acadf762832877… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 127cfa7601..94c8cfc069 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -234,6 +234,14 @@ Chapter 1. Admin Guide module that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in Kamailio.cfg). + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require Kamailio to be started with --atexit=no + command line parameters to avoid calling C atexit callbacks inside the + process ending during daemonize procedure as well as during shut down, + which can lead to crashes because it destroys and then accesses shared + memory. For example, such case has been reported for Ubuntu 20.04 or + RedHat 8. + 2. Quick Start The default kamailio.cfg file has basic tls support included, it has to

2 years, 5 months

git:master:8dc18cab: tls: docs - added note about --atexit=no cli param for newer libssl versions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8dc18cab5bc32c1d34a9113242d230b7458d4075 URL: https://github.com/kamailio/kamailio/commit/8dc18cab5bc32c1d34a9113242d230b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-14T14:02:41+01:00 tls: docs - added note about --atexit=no cli param for newer libssl versions --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/8dc18cab5bc32c1d34a9113242d230b… Patch: https://github.com/kamailio/kamailio/commit/8dc18cab5bc32c1d34a9113242d230b… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index b5ea415ae79..e356d5bff7c 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -64,6 +64,15 @@ that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in &kamailio;.cfg). </para> + <para> + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require &kamailio; to be started with + <emphasis>--atexit=no</emphasis> command line parameters to avoid + calling C atexit callbacks inside the process ending during + daemonize procedure as well as during shut down, which can lead + to crashes because it destroys and then accesses shared memory. For + example, such case has been reported for Ubuntu 20.04 or RedHat 8. + </para> </section> <section id="tls.quick_start"> <title>Quick Start</title>

2 years, 5 months

[kamailio/kamailio] Kamailio with dmq stop processing SIP (Issue #2974)

by tser

### Description Hi, I have been doing some load testing on kamailio 5.4.7 running in podman. Kamailio is using dmq to share dialogs and htable with a backup Kamailio also running 5.4.7. I tested with 100 CPS and during the first minutes all calls are being processed correctly but then all the messages start to be retransmitted. Kamailio is not processing any sip messages anymore but still replies to HTTP requests, is still possible to run kamctl/kamcmd commands on it but for example, if running the command "kamcmd dlg.list" nothing happens. Also, I did a load test with the backup Kamailio turn off so that there is no replication between them, and in that case, I can run the 100 CPS without any issue. In kamcmd trap file I can see a lot of "<error: Cannot access memory" errors. In order for Kamailio to start processing again sip, I need to restart it. Any extra logs that I can try to collect when the problem happens? #### Debugging Data  [trap.txt](https://github.com/kamailio/kamailio/files/7705076/trap.txt) ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.7 (x86_64/linux) a19fe1 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a19fe1 compiled on 14:06:57 Dec 13 2021 with gcc 10.2.1 ``` * **Operating System**:  ``` Debian 5.10.70-1 (2021-09-30) x86_64 GNU/Linux ``` -- 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/2974

2 years, 5 months

git:master:2e62177f: core: tcp - fixed typo on condition introduced in previous commit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2e62177f7f08314efa883f87f3d703a4f71a1d5e URL: https://github.com/kamailio/kamailio/commit/2e62177f7f08314efa883f87f3d703a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T15:17:37+01:00 core: tcp - fixed typo on condition introduced in previous commit --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/2e62177f7f08314efa883f87f3d703a… Patch: https://github.com/kamailio/kamailio/commit/2e62177f7f08314efa883f87f3d703a… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 8824e123ab..ba9ed92575 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1145,7 +1145,7 @@ int tcpconn_read_haproxy(struct tcp_connection *c) { twaitms = 0; do { bytes = recv(c->s, &hdr, size, 0); - if(bytes==-1 && errno == EINTR)) { + if(bytes==-1 && errno == EINTR) { if(twaitms <= cfg_get(tcp, tcp_cfg, wait_data_ms)) { /* LM_DBG("bytes: %d - errno: %d (%d/%d) - twait: %dms\n", bytes, errno, EINTR, EAGAIN, twaitms); */

2 years, 5 months

git:master:7a5ae41e: core: tcp - added core parameter tcp_wait_data

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7a5ae41ec7184ffb362fe54154c350e552ad8917 URL: https://github.com/kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-13T14:47:59+01:00 core: tcp - added core parameter tcp_wait_data - specify how long to wait (in milliseconds) to wait for data on tcp connections in certain cases - default is 5000ms (5secs) - now applies when reading on tcp connection for haproxy protocol --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/tcp_main.c Modified: src/core/tcp_options.c Modified: src/core/tcp_options.h --- Diff: https://github.com/kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e… Patch: https://github.com/kamailio/kamailio/commit/7a5ae41ec7184ffb362fe54154c350e…

2 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021