sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
307 discussions

[kamailio/kamailio] callout from event_route [tm:local-response] only occurs once (Issue #3064)

by dpaape

version: kamailio 5.5.2 (arm6/linux) 55e232 raspberry pi 3b I initially stated that I was running on 5.5.3 but I was mistaken. However I checked the 5.5.3 source and it appears to be the same. I think that there is a bug in the tm module with respect to the "tm:local-response" event route. In the "t_reply.c" file, there is a static variable called '_tm_local_response_set_lookup'. This variable is initialized at load time to zero. It is checked in the '_reply_light()' routine and will initiate a local callback from the config script if "armed". The problem as I see it is that if the callback is readied, the variable is set to one. But it is never reset. So the observed behavior is as follows. A REGISTER is received and the request_route arms the callback. The REGISTER requires an authorization (local database sqlite). After the 401 is sent back, the callback via the event route is called as expected. All good except that the event route script fragment is never executed again after the first call... ever, even if it's a new REGISTER request. I would think that somewhere in the tm module, the variable should be reset to zero so that subsequent transactions can initiate the event route again. Or maybe the variable ought to live somewhere in the transaction cell??? . . . t_on_reply ("MY_FRAG"); t_on_failure ("MY_FRAG"); . . . event_route [tm:local-response] { xlog ("L_NOTICE", IN tm:local-response\n"); my_function(); } . . . So 'my_function()' is only called once. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3064 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3064(a)github.com>

5 months, 1 week

[kamailio/kamailio] when enabled haproxy protocol required use kamailio server haproxy IP (Issue #3666)

by sergey-safarov

### Description I have enabled `tcp_accept_haproxy=yes`, inbound TCP connection received on IPv6 kamailio socket but client real IP is IPv4. When kamailio add `Record-Route` header then added IPv6 header and not added IPv4. Example ``` INVITE sip:xxxx@example.com SIP/2.0 Record-Route: <sip:9sovfn2oP7ozLQID7BkFxBNt/CfE+wc=@[2600::6]:5060;r2=on;lr=on> Record-Route: <sip:9sovfn2oP7ozLQID7BkFxBNt/CfE+wc=@[2600::6]:5060;transport=tcp;r2=on;lr=on> ``` From client perspective Kamailio make protocol conversion from the IPv4 to IPv6, and expected to see IPv4 in the IPv4 address in the received 'Record-Route' headers to use in the future requests. Because client receiving IPv6 only and client does not have IPv6 address, then `ACK` message cannot be send to Kamailio. ### Expected behavior Kamailio will use Kamailio server load balancer address to generate `Record-Route` headers. Load balancer IP address can be received from the HAPROXY protocol. #### Actual observed behavior Kamailio use listeneer socket IP to generate `Record-Route` headers. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3666 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3666(a)github.com>

5 months, 2 weeks

[kamailio/kamailio] TLS Module Regression (ee key too small) (Issue #3737)

by Tyler Moore

### Description The TLS module seems to have some regression from 5.7.3 to 5.7.4 causing `tls.reload` to fail loading certificates. ### Troubleshooting #### System Info - kamailio version: 5.7.4 (from official kamailio repos) - distro version: debian 12 - OS/kernel version: Linux ip-172-31-30-183 6.1.0-17-cloud-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.69-1 (2023-12-30) x86_64 GNU/Linux - openssl version: 3.0.11 (from official debian repos) #### Reproduction On a fresh install of debian 12: - install openssl from debian repos - install kamailio 5.7.4 from kamailio repos - install kamailio-tls-modules from kamailio repos - create a self signed cert with 4096 bit rsa key - create a basic tls.cfg to load those files on the client/server default domain - reload kamailio - try running `kamcmd tls.reload` #### Debugging Data Example tls.cfg ``` [server:default] method = TLSv1.2+ verify_certificate = yes require_certificate = yes private_key = /etc/dsiprouter/certs/dsiprouter-key.pem certificate = /etc/dsiprouter/certs/dsiprouter-cert.pem ca_list = /etc/dsiprouter/certs/ca-list.pem ca_path = /etc/dsiprouter/certs/ca [client:default] method = TLSv1.2+ verify_certificate = yes require_certificate = yes private_key = /etc/dsiprouter/certs/dsiprouter-key.pem certificate = /etc/dsiprouter/certs/dsiprouter-cert.pem ca_list = /etc/dsiprouter/certs/ca-list.pem ca_path = /etc/dsiprouter/certs/ca ``` Example tls cert: ``` Certificate: Data: Version: 3 (0x2) Serial Number: 7a:43:b8:fa:df:c9:ed:a7:d6:ab:bb:9a:89:c0:8e:95:fd:62:de:26 Signature Algorithm: sha256WithRSAEncryption Issuer: C = US, ST = MI, L = Detroit, O = dSIPRouter, CN = ec2-34-224-90-100.compute-1.amazonaws.com Validity Not Before: Jan 30 15:28:11 2024 GMT Not After : Jan 29 15:28:11 2025 GMT Subject: C = US, ST = MI, L = Detroit, O = dSIPRouter, CN = ec2-34-224-90-100.compute-1.amazonaws.com Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (4096 bit) ... ``` Example tls key: ``` Private-Key: (4096 bit, 2 primes) modulus: ... ``` #### Log Messages ``` Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:345]: ksr_tls_fill_missing(): TLSs<default>: tls_method=25 Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:357]: ksr_tls_fill_missing(): TLSs<default>: certificate='/etc/dsiprouter/certs/dsiprouter-cert.pem' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:364]: ksr_tls_fill_missing(): TLSs<default>: ca_list='/etc/dsiprouter/certs/ca-list.pem' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:371]: ksr_tls_fill_missing(): TLSs<default>: ca_path='/etc/dsiprouter/certs/ca' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:378]: ksr_tls_fill_missing(): TLSs<default>: crl='(null)' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:382]: ksr_tls_fill_missing(): TLSs<default>: require_certificate=1 Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:390]: ksr_tls_fill_missing(): TLSs<default>: cipher_list='(null)' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:397]: ksr_tls_fill_missing(): TLSs<default>: private_key='/etc/dsiprouter/certs/dsiprouter-key.pem' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:401]: ksr_tls_fill_missing(): TLSs<default>: verify_certificate=1 Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:406]: ksr_tls_fill_missing(): TLSs<default>: verify_depth=9 Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:410]: ksr_tls_fill_missing(): TLSs<default>: verify_client=0 Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: NOTICE: tls [tls_domain.c:1168]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='<default>' ... Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: ERROR: tls [tls_domain.c:590]: load_cert(): TLSs<default>: Unable to load certificate file '/etc/dsiprouter/certs/dsiprouter-cert.pem' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: ERROR: tls [tls_util.h:49]: tls_err_ret(): load_cert:error:03000072:digital envelope routines::decode error (sni: unknown) Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: ERROR: tls [tls_util.h:49]: tls_err_ret(): load_cert:error:0A00018F:SSL routines::ee key too small (sni: unknown) ``` #### SIP Traffic N/A -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3737 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3737(a)github.com>

5 months, 2 weeks

[kamailio/kamailio] core: Fix check to also work for KEMI framework (PR #3718)

by Xenofon Karamanos

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes an issue regarding KEMI framework for onsend_route. KSR.set_drop() in [ksr_onsend_route](https://www.kamailio.org/wikidocs/cookbooks/5.7.x/core/#o… does not make kamailio dropping the message when using kemi (python3) (probably holds true for other engines too): This is exactly the example from [documentation](https://kamailio.org/docs/tutorials/devel/kamailio-kemi-fram…: ``` def ksr_onsend_route(self, msg): KSR.set_drop() exit() ``` The issue arises because we are not setting `ret = 0` when the drop flag is set, but instead check if it's not set to return `ret=1` (The case for native that returns `0` but no `DROP_R_F` was set). **Note**: KEMI Case: `ret = 1` always See [app_python3/apy_kemi.c](https://github.com/kamailio/kamailio/blob/79697b4d5… Native case: `ret` can be `0` for drop, or `1` for success You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3718 -- Commit Summary -- * core: Fix check to also work for KEMI framework -- File Changes -- M src/core/onsend.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3718.patch https://github.com/kamailio/kamailio/pull/3718.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3718 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3718(a)github.com>

5 months, 2 weeks

Freezing development for 5.8.x series

by Daniel-Constantin Mierla

Hello, I propose to aim freezing the development for 5.8.x series at the end of the 1st of February 2024 (Thursday). New features that one wants to get in this release series have to be pushed to git repository or pull requests made for them. Afterwards usually follows a 4-6 weeks of testing till the first release 5.8.0. Unfreezing will happen earlier, after the first weeks of testing when the 5.8 branch will be created. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio Advanced Training, February 20-22, 2024 -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

5 months, 2 weeks

git:master:0833a72d: db_mysql: proper macro to check mysql version id

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0833a72d4b70d224ab02c90b7b94648db7f52c73 URL: https://github.com/kamailio/kamailio/commit/0833a72d4b70d224ab02c90b7b94648… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-31T10:13:48+01:00 db_mysql: proper macro to check mysql version id --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/0833a72d4b70d224ab02c90b7b94648… Patch: https://github.com/kamailio/kamailio/commit/0833a72d4b70d224ab02c90b7b94648… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index b415ff87655..88c950417a6 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -141,7 +141,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) break; } #else -#ifdef MYSQL_VERSION_ID> 50710 +#if MYSQL_VERSION_ID > 50710 if(db_mysql_opt_ssl_mode != 0) { unsigned int optuint = 0; if(db_mysql_opt_ssl_mode == 1) {

5 months, 2 weeks

[kamailio/kamailio] core: infra to run functions in threads (PR #3736)

by space88man

- [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 Introduce utility functions that run module functions in a thread —- primary use case is to init libssl in a thread. Also to avoid a lot of duplicate pthread_XXXX code. Does not affect core as it is just a header file, however it could be put into core or a utility object. This infra is applied to a few modules to see the code savings. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3736 -- Commit Summary -- * core: add infrastructure to run functions in threads * db_unixodbc: use core/rthreads.h * db_mysql: use core/rthreads.h * db_postgres: use core/rthreads.h * outbound: use core/rthreads.h -- File Changes -- A src/core/rthreads.h (77) M src/modules/db_mysql/km_dbase.c (10) M src/modules/db_postgres/km_dbase.c (32) M src/modules/db_unixodbc/dbase.c (11) M src/modules/outbound/outbound_mod.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3736.patch https://github.com/kamailio/kamailio/pull/3736.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3736 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3736(a)github.com>

5 months, 2 weeks

git:master:94f6df50: outbound: use core/rthreads.h

by S-P Chan

Module: kamailio Branch: master Commit: 94f6df509bf77c19c745749716a9e075ec17f3c7 URL: https://github.com/kamailio/kamailio/commit/94f6df509bf77c19c745749716a9e07… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-31T16:47:09+08:00 outbound: use core/rthreads.h --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/94f6df509bf77c19c745749716a9e07… Patch: https://github.com/kamailio/kamailio/commit/94f6df509bf77c19c745749716a9e07… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index e2e3a86a73b..24d7a54cd71 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -40,6 +40,10 @@ #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_supported.h" +#define KSR_RTHREAD_SKIP_P +#define KSR_RTHREAD_NEED_V +#include "../../core/rthreads.h" + #include "api.h" #include "config.h" @@ -75,26 +79,25 @@ struct module_exports exports = { destroy /* destroy function */ }; -static void *mod_init_openssl(void *arg) { - if(flow_token_secret.s) { - assert(ob_key.len == SHA_DIGEST_LENGTH); - LM_DBG("flow_token_secret mod param set. use persistent ob_key"); +static void mod_init_openssl(void) +{ + if(flow_token_secret.s) { + assert(ob_key.len == SHA_DIGEST_LENGTH); + LM_DBG("flow_token_secret mod param set. use persistent ob_key"); #if OPENSSL_VERSION_NUMBER < 0x030000000L - SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len, - (unsigned char *)ob_key.s); + SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len, + (unsigned char *)ob_key.s); #else - EVP_Q_digest(NULL, "SHA1", NULL, flow_token_secret.s, - flow_token_secret.len, (unsigned char *)ob_key.s, NULL); + EVP_Q_digest(NULL, "SHA1", NULL, flow_token_secret.s, + flow_token_secret.len, (unsigned char *)ob_key.s, NULL); #endif - } else { - if(RAND_bytes((unsigned char *)ob_key.s, ob_key.len) == 0) { - LM_ERR("unable to get %d cryptographically strong pseudo-" - "random bytes\n", - ob_key.len); - } - } - - return NULL; + } else { + if(RAND_bytes((unsigned char *)ob_key.s, ob_key.len) == 0) { + LM_ERR("unable to get %d cryptographically strong pseudo-" + "random bytes\n", + ob_key.len); + } + } } static int mod_init(void) @@ -116,12 +119,9 @@ static int mod_init(void) ob_key.len = OB_KEY_LEN; #if OPENSSL_VERSION_NUMBER < 0x010101000L - mod_init_openssl(NULL); + mod_init_openssl(NULL); #else - pthread_t tid; - void *retval; - pthread_create(&tid, NULL, mod_init_openssl, NULL); - pthread_join(tid, &retval); + run_threadV(mod_init_openssl); #endif if(cfg_declare("outbound", outbound_cfg_def, &default_outbound_cfg,

5 months, 2 weeks

git:master:8a1c383f: db_postgres: use core/rthreads.h

by S-P Chan

Module: kamailio Branch: master Commit: 8a1c383f6af5bc0547e32430a4469333160b93e6 URL: https://github.com/kamailio/kamailio/commit/8a1c383f6af5bc0547e32430a446933… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-31T16:47:09+08:00 db_postgres: use core/rthreads.h --- Modified: src/modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/8a1c383f6af5bc0547e32430a446933… Patch: https://github.com/kamailio/kamailio/commit/8a1c383f6af5bc0547e32430a446933… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index 065b71f0709..3d58f1a53e0 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -34,7 +34,6 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> -#include <pthread.h> #include "../../core/dprint.h" #include "../../core/mem/mem.h" #include "../../lib/srdb1/db.h" @@ -44,6 +43,8 @@ #include "../../core/locking.h" #include "../../core/hashes.h" #include "../../core/clist.h" +#define KSR_RTHREAD_NEED_PI +#include "../../core/rthreads.h" #include "km_dbase.h" #include "km_pg_con.h" #include "km_val.h" @@ -119,14 +120,7 @@ static db1_con_t *db_postgres_init0(const str *_url) db1_con_t *db_postgres_init(const str *_url) { - pthread_t tid; - db1_con_t *ret; - - pthread_create( - &tid, NULL, (void *(*)(void *))db_postgres_init0, (void *)_url); - pthread_join(tid, (void **)&ret); - - return ret; + return run_threadP((_thread_proto)db_postgres_init0, (void *)_url); } /*! * \brief Initialize database for future queries, specify pooling @@ -137,28 +131,15 @@ db1_con_t *db_postgres_init(const str *_url) * * Init libssl in thread */ -struct _thread_args -{ - const str *_url; - db_pooling_t pooling; -}; - -static db1_con_t *_db_postgres_init2(struct _thread_args *args) +static db1_con_t *db_postgres_init2_impl(const str *_url, db_pooling_t pooling) { - return db_do_init2( - args->_url, (void *)db_postgres_new_connection, args->pooling); + return db_do_init2(_url, (void *)db_postgres_new_connection, pooling); } db1_con_t *db_postgres_init2(const str *_url, db_pooling_t pooling) { - pthread_t tid; - db1_con_t *ret; - - pthread_create(&tid, NULL, (void *(*)(void *))_db_postgres_init2, - (void *)&(struct _thread_args){_url, pooling}); - pthread_join(tid, (void **)&ret); - - return ret; + return run_threadPI( + (_thread_protoPI)db_postgres_init2_impl, (void *)_url, pooling); } /*! * \brief Close database when the database is no longer needed

5 months, 2 weeks

git:master:733a2681: db_mysql: use core/rthreads.h

by S-P Chan

Module: kamailio Branch: master Commit: 733a268114261d49ed11aec83fe39ea8c34a0b69 URL: https://github.com/kamailio/kamailio/commit/733a268114261d49ed11aec83fe39ea… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-31T16:47:09+08:00 db_mysql: use core/rthreads.h --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/733a268114261d49ed11aec83fe39ea… Patch: https://github.com/kamailio/kamailio/commit/733a268114261d49ed11aec83fe39ea… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index 721ba8aa6cf..9cd238b78ab 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -34,11 +34,11 @@ #include <stdio.h> #include <string.h> #include <mysql.h> -#include <pthread.h> #include <errmsg.h> #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h" +#include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" #include "db_mysql.h" @@ -213,13 +213,7 @@ static db1_con_t *db_mysql_init0(const str *_url) db1_con_t *db_mysql_init(const str *_url) { - pthread_t tid; - db1_con_t *ret; - - pthread_create(&tid, NULL, (void *(*)(void *))db_mysql_init0, (void *)_url); - pthread_join(tid, (void **)&ret); - - return ret; + return run_threadP((_thread_proto)db_mysql_init0, (void *)_url); } /** * Shut down the database module.

5 months, 2 weeks

← Newer
1
2
3
4
5
6
7
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2024