sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
309 discussions

[kamailio/kamailio] tls: update DH initialization for OpenSSL 1.1.x (PR #2945)

by space88man

For OpenSSL 3.x, this will fix a deprecation warning.   #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Update DH initialization with appropriate API for OpenSSL >= 1.1.1. This also fixes a deprecation warning with OpenSSL 3.x. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2945 -- Commit Summary -- * tls: update DH initialization for OpenSSL 1.1.x -- File Changes -- M src/modules/tls/tls_domain.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2945.patch https://github.com/kamailio/kamailio/pull/2945.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/2945

2 years, 7 months

git:master:744bc8f9: tls: update DH initialization for OpenSSL 1.1.x

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 744bc8f9e12b698cd6b8bc5ef63c84df7a3aea90 URL: https://github.com/kamailio/kamailio/commit/744bc8f9e12b698cd6b8bc5ef63c84d… Author: SPChan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-23T20:02:37+01:00 tls: update DH initialization for OpenSSL 1.1.x For OpenSSL 3.x, this will fix a deprecation warning. --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/744bc8f9e12b698cd6b8bc5ef63c84d… Patch: https://github.com/kamailio/kamailio/commit/744bc8f9e12b698cd6b8bc5ef63c84d… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index 5f939df1d4..c6eac20738 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -89,6 +89,10 @@ static void setup_ecdh(SSL_CTX *ctx) #ifndef OPENSSL_NO_DH +/* + * not needed for OpenSSL 1.1.0+ and LibreSSL + */ +#if !defined(SSL_CTX_set_dh_auto) static unsigned char dh3072_p[] = { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC9,0x0F,0xDA,0xA2, 0x21,0x68,0xC2,0x34,0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1, @@ -126,9 +130,15 @@ static unsigned char dh3072_p[] = { }; static unsigned char dh3072_g[] = { 0x02 }; +#endif static void setup_dh(SSL_CTX *ctx) { +/* + * not needed for OpenSSL 1.1.0+ and LibreSSL + * DH_new() is deprecated in OpenSSL 3 + */ +#if !defined(SSL_CTX_set_dh_auto) DH *dh; BIGNUM *p; BIGNUM *g; @@ -146,19 +156,17 @@ static void setup_dh(SSL_CTX *ctx) return; } -#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(LIBRESSL_VERSION_NUMBER) - /* libssl >= v1.1.0 */ - DH_set0_pqg(dh, p, NULL, g); -#else dh->p = p; dh->g = g; -#endif SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE); SSL_CTX_set_tmp_dh(ctx, dh); DH_free(dh); +#else + SSL_CTX_set_dh_auto(ctx, 1); +#endif } #endif

2 years, 7 months

git:master:f068a9ad: core: clarification for -b cli parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f068a9ad1892777bfb9a6d1bcfd17a291578c6b6 URL: https://github.com/kamailio/kamailio/commit/f068a9ad1892777bfb9a6d1bcfd17a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-23T17:25:32+01:00 core: clarification for -b cli parameter --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/f068a9ad1892777bfb9a6d1bcfd17a2… Patch: https://github.com/kamailio/kamailio/commit/f068a9ad1892777bfb9a6d1bcfd17a2… --- diff --git a/src/main.c b/src/main.c index 14126ca3d0..60435e865e 100644 --- a/src/main.c +++ b/src/main.c @@ -169,8 +169,8 @@ Options:\n\ default is yes.\n\ -A define Add config pre-processor define (e.g., -A WITH_AUTH,\n\ -A 'FLT_ACC=1', -A 'DEFVAL=\"str-val\"')\n\ - -b nr Maximum receive buffer size which will not be exceeded by\n\ - auto-probing procedure even if OS allows\n\ + -b nr Maximum OS UDP receive buffer size which will not be exceeded by\n\ + auto-probing-and-increase procedure even if OS allows\n\ -c Check configuration file for syntax errors\n\ --cfg-print Print configuration file evaluating includes and ifdefs\n\ -d Debugging level control (multiple -d to increase the level from 0)\n\

2 years, 7 months

git:master:13bd752c: core: print udp sock fd in debug messages of probe_max_receive_buffer()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 13bd752cc932818f920a0835637431bf29d7db40 URL: https://github.com/kamailio/kamailio/commit/13bd752cc932818f920a0835637431b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-23T17:25:32+01:00 core: print udp sock fd in debug messages of probe_max_receive_buffer() --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/13bd752cc932818f920a0835637431b… Patch: https://github.com/kamailio/kamailio/commit/13bd752cc932818f920a0835637431b… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 9234e54ec1..bffdda1b01 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -143,15 +143,15 @@ int probe_max_receive_buffer( int udp_sock ) if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &ioptval, &ioptvallen) == -1 ) { - LM_ERR("getsockopt: %s\n", strerror(errno)); + LM_ERR("fd: %d getsockopt: %s\n", udp_sock, strerror(errno)); return -1; } if ( ioptval==0 ) { - LM_DBG("SO_RCVBUF initially set to 0; resetting to %d\n", - BUFFER_INCREMENT ); + LM_DBG("SO_RCVBUF initially set to 0 for fd %d; resetting to %d\n", + udp_sock, BUFFER_INCREMENT); ioptval=BUFFER_INCREMENT; - } else LM_INFO("SO_RCVBUF is initially %d\n", ioptval ); + } else LM_INFO("SO_RCVBUF is initially %d for fd %d\n", ioptval, udp_sock); for (optval=ioptval; ; ) { /* increase size; double in initial phase, add linearly later */ if (phase==0) optval <<= 1; else optval+=BUFFER_INCREMENT; @@ -160,11 +160,12 @@ int probe_max_receive_buffer( int udp_sock ) else { phase=1; optval >>=1; continue; } } if(ksr_verbose_startup) - LM_DBG("trying SO_RCVBUF: %d\n", optval); + LM_DBG("trying SO_RCVBUF: %d on fd: %d\n", optval, udp_sock); if (setsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*)&optval, sizeof(optval)) ==-1){ /* Solaris returns -1 if asked size too big; Linux ignores */ - LM_DBG("SOL_SOCKET failed for %d, phase %d: %s\n", optval, phase, strerror(errno)); + LM_DBG("SOL_SOCKET failed for val %d on fd %d, phase %d: %s\n", + optval, udp_sock, phase, strerror(errno)); /* if setting buffer size failed and still in the aggressive phase, try less aggressively; otherwise give up */ @@ -179,14 +180,14 @@ int probe_max_receive_buffer( int udp_sock ) if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &voptval, &voptvallen) == -1 ) { - LM_ERR("getsockopt: %s\n", strerror(errno)); + LM_ERR("fd: %d getsockopt: %s\n", udp_sock, strerror(errno)); return -1; } else { if(ksr_verbose_startup) - LM_DBG("setting SO_RCVBUF; set=%d,verify=%d\n", - optval, voptval); + LM_DBG("setting SO_RCVBUF on fd %d; val=%d, verify=%d\n", + udp_sock, optval, voptval); if (voptval<optval) { - LM_DBG("setting SO_RCVBUF has no effect\n"); + LM_DBG("setting SO_RCVBUF on fd %d has no effect\n", udp_sock); /* if setting buffer size failed and still in the aggressive phase, try less aggressively; otherwise give up */ @@ -200,10 +201,10 @@ int probe_max_receive_buffer( int udp_sock ) if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &foptval, &foptvallen) == -1 ) { - LM_ERR("getsockopt: %s\n", strerror(errno)); + LM_ERR("fd: %d getsockopt: %s\n", udp_sock, strerror(errno)); return -1; } - LM_INFO("SO_RCVBUF is finally %d\n", foptval ); + LM_INFO("SO_RCVBUF is finally %d on fd %d\n", foptval, udp_sock); return 0;

2 years, 7 months

[kamailio/kamailio] nats: move nats connection handling into a struct in order to extend features (PR #2934)

by Emmanuel Schmidbauer

- [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 - [x] Related to issue #2916 #### Description This update moves the nats urls into a `nats_connection_ptr` struct. This will allow the nats_urls to be extended into a linked-list (to allow simultaneous connections) while still maintaining nats built-in failover connectivity which comes included in the libnats You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2934 -- Commit Summary -- * nats: move nats connection handling into a struct in order to extend features -- File Changes -- M src/modules/nats/nats_mod.c (248) M src/modules/nats/nats_mod.h (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2934.patch https://github.com/kamailio/kamailio/pull/2934.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/2934

2 years, 7 months

git:master:210da840: Merge pull request #2934 from kamailio/nats-connection-ptr

by GitHub

Module: kamailio Branch: master Commit: 210da8403463290cdd0abec25473df5a15557b83 URL: https://github.com/kamailio/kamailio/commit/210da8403463290cdd0abec25473df5… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-23T07:59:26-05:00 Merge pull request #2934 from kamailio/nats-connection-ptr nats: move nats connection handling into a struct in order to extend features --- Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/210da8403463290cdd0abec25473df5… Patch: https://github.com/kamailio/kamailio/commit/210da8403463290cdd0abec25473df5…

2 years, 7 months

git:master:ff852c46: nats: move nats connection handling into a struct in order to extend features

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: ff852c46b3b8bee94f63a30974c0742b5829204d URL: https://github.com/kamailio/kamailio/commit/ff852c46b3b8bee94f63a30974c0742… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2021-11-19T07:24:29-05:00 nats: move nats connection handling into a struct in order to extend features --- Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/ff852c46b3b8bee94f63a30974c0742… Patch: https://github.com/kamailio/kamailio/commit/ff852c46b3b8bee94f63a30974c0742…

2 years, 7 months

[kamailio/kamailio] SQLOPS Module (Issue #2950)

by iliesh

### Description By using module 'sqlops' would be nice to pass also the database name as an argument to the function "sql_query" along with the connection name and SQL statement. This would be very useful when you have few database hosts and an SQL Proxy which is routing all queries based on the database name, for example: customer_1 -> db_host_1 -> db_name_c1 customer_2 -> db_host_2 -> db_name_c2 So instead of: ``` if($var(customer) == "customer_1") { sql_query("ca", "SELECT name from demo where id=1", "ra"); } else { sql_query("cb","SELECT name from demo where id=1", "ra"); } ``` use just a single connection to the Proxy: ``` sql_query("ca", "$var(db_name)", "SELECT name from demo where id=1", "ra"); ``` -- 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/2950

2 years, 7 months

[kamailio/kamailio] misc: update ims pcscf register example (PR #2947)

by alexyosifov

- Updated ims pcscf register script file with removing of ck/ik in 401 Challenge reply.   #### 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) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2947 -- Commit Summary -- * misc: update ims pcscf register example -- File Changes -- M misc/examples/ims/pcscf/route/register.cfg (48) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2947.patch https://github.com/kamailio/kamailio/pull/2947.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/2947

2 years, 7 months

git:master:a84392d4: misc: update ims pcscf register example

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a84392d49551dcc98378e9fe2feee5f6c3fb81a4 URL: https://github.com/kamailio/kamailio/commit/a84392d49551dcc98378e9fe2feee5f… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T19:32:49+01:00 misc: update ims pcscf register example - Updated ims pcscf register script file with removing of ck/ik in 401 Challenge reply. --- Modified: misc/examples/ims/pcscf/route/register.cfg --- Diff: https://github.com/kamailio/kamailio/commit/a84392d49551dcc98378e9fe2feee5f… Patch: https://github.com/kamailio/kamailio/commit/a84392d49551dcc98378e9fe2feee5f… --- diff --git a/misc/examples/ims/pcscf/route/register.cfg b/misc/examples/ims/pcscf/route/register.cfg index c10979d84a4..e90b7fa300b 100644 --- a/misc/examples/ims/pcscf/route/register.cfg +++ b/misc/examples/ims/pcscf/route/register.cfg @@ -3,9 +3,9 @@ ###################################################################### route[REGISTER] { # Provide some statistics - if ($sht(a=>$ci::start_time) == $null || $sht(a=>$ci::start_time) == 0) { - $sht(a=>$ci::start_time) = $TV(Sn); - } + if ($sht(a=>$ci::start_time) == $null || $sht(a=>$ci::start_time) == 0) { + $sht(a=>$ci::start_time) = $TV(Sn); + } # Strip Transport from RURI: $ru = $(ru{re.subst,/;transport=[A-Za-z]*//g}); @@ -146,23 +146,31 @@ onreply_route[REGISTER_reply] #!endif #!endif #update stats for register reply on success - $var(start_secs) = $(sht(a=>$ci::start_time){s.select,0,.}); - $var(start_usecs) = $(sht(a=>$ci::start_time){s.select,1,.}); - $var(diff_secs) = $TV(s) - $var(start_secs); - $var(diff_usecs) = $TV(u) - $var(start_usecs); - $var(diff_ms) = $var(diff_secs)*1000 + ($var(diff_usecs)/1000); - $sht(a=>$ci::start_time)=0; - $var(stat_add) = "+" + $var(diff_ms); - xlog("L_DBG", "REGISTER SUCCESS[$ci] took $var(stat_add)ms\n"); - update_stat("register_success", "+1"); - update_stat("register_time", "$var(stat_add)"); + $var(start_secs) = $(sht(a=>$ci::start_time){s.select,0,.}); + $var(start_usecs) = $(sht(a=>$ci::start_time){s.select,1,.}); + $var(diff_secs) = $TV(s) - $var(start_secs); + $var(diff_usecs) = $TV(u) - $var(start_usecs); + $var(diff_ms) = $var(diff_secs)*1000 + ($var(diff_usecs)/1000); + $sht(a=>$ci::start_time)=0; + $var(stat_add) = "+" + $var(diff_ms); + xlog("L_DBG", "REGISTER SUCCESS[$ci] took $var(stat_add)ms\n"); + update_stat("register_success", "+1"); + update_stat("register_time", "$var(stat_add)"); #!ifdef WITH_IPSEC - ipsec_forward("location"); - } - else { + ipsec_forward("location"); + } + else { if (t_check_status("401")) { - ipsec_create("location"); - } + #Remove ck and ik from Authentication header + $var(rem_ck) = $(hdr(WWW-Authenticate){re.subst,/ck="[a-zA-Z0-9]*", //g}); + $var(rem_ik) = $(var(rem_ck){re.subst,/ik="[a-zA-Z0-9]*", //g}); + remove_hf("WWW-Authenticate"); + append_hf("WWW-Authenticate: $var(rem_ik)\r\n"); + + if(ipsec_create("location")!=1) { + send_reply("503", "Service Unavailable (Create ipsec failed)"); + } + } #!endif } exit; @@ -183,12 +191,12 @@ failure_route[REGISTER_failure] xlog("Blocking traffic from $si\n"); $sht(ipban=>$si) = 1; } - update_stat("register_failed", "+1"); + update_stat("register_failed", "+1"); } #!endif if (t_check_status("408")) { send_reply("504","Server Time-Out"); - update_stat("register_failed", "+1"); + update_stat("register_failed", "+1"); exit; } }

2 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021