sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
311 discussions

git:5.7:c5ed0e65: tls: historical code comment on repeating SSL_CTX per worker

by S-P Chan

Module: kamailio Branch: 5.7 Commit: c5ed0e65b2530443b1367986dac2b3da111c0701 URL: https://github.com/kamailio/kamailio/commit/c5ed0e65b2530443b1367986dac2b3d… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-11T08:04:58+08:00 tls: historical code comment on repeating SSL_CTX per worker (cherry-pick from 29007ada5bc9e07ede3cdbce285f04d1298c0612) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c5ed0e65b2530443b1367986dac2b3d… Patch: https://github.com/kamailio/kamailio/commit/c5ed0e65b2530443b1367986dac2b3d… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 7cad1b046e4..beaf1b7b70b 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -433,6 +433,16 @@ static int tls_engine_init(); int tls_fix_engine_keys(tls_domains_cfg_t *, tls_domain_t *, tls_domain_t *); #endif +/* + * OpenSSL 1.1.1+: SSL_CTX is repeated in each worker + * + * OpenSSL RSA blinding works in single-process multi-threaded mode + * and depends on pthread_self() to separate threads. In Kamailio multi-process workers + * pthread_self() will not necessarily be unique, this will result in incorrect BN + * operations��hence we create a separate SSL_CTX for each worker + * + * EC operations do not use pthread_self(), so could use shared SSL_CTX + */ static int mod_child(int rank) { if(tls_disable || (tls_domains_cfg == 0))

11 months, 2 weeks

git:master:29007ada: tls: historical code comment on repeating SSL_CTX per worker

by S-P Chan

Module: kamailio Branch: master Commit: 29007ada5bc9e07ede3cdbce285f04d1298c0612 URL: https://github.com/kamailio/kamailio/commit/29007ada5bc9e07ede3cdbce285f04d… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-11T08:03:07+08:00 tls: historical code comment on repeating SSL_CTX per worker --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/29007ada5bc9e07ede3cdbce285f04d… Patch: https://github.com/kamailio/kamailio/commit/29007ada5bc9e07ede3cdbce285f04d… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 7cad1b046e4..beaf1b7b70b 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -433,6 +433,16 @@ static int tls_engine_init(); int tls_fix_engine_keys(tls_domains_cfg_t *, tls_domain_t *, tls_domain_t *); #endif +/* + * OpenSSL 1.1.1+: SSL_CTX is repeated in each worker + * + * OpenSSL RSA blinding works in single-process multi-threaded mode + * and depends on pthread_self() to separate threads. In Kamailio multi-process workers + * pthread_self() will not necessarily be unique, this will result in incorrect BN + * operations��hence we create a separate SSL_CTX for each worker + * + * EC operations do not use pthread_self(), so could use shared SSL_CTX + */ static int mod_child(int rank) { if(tls_disable || (tls_domains_cfg == 0))

11 months, 2 weeks

git:master:42bae2a6: registrar: cumpute randmized-range expire value as float and then cast

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 42bae2a634249fe7d8ba174eaffff0ee547f6d2b URL: https://github.com/kamailio/kamailio/commit/42bae2a634249fe7d8ba174eaffff0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-10T13:45:30+01:00 registrar: cumpute randmized-range expire value as float and then cast --- Modified: src/modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/42bae2a634249fe7d8ba174eaffff0e… Patch: https://github.com/kamailio/kamailio/commit/42bae2a634249fe7d8ba174eaffff0e… --- diff --git a/src/modules/registrar/sip_msg.c b/src/modules/registrar/sip_msg.c index 9ef2c37db47..69e8606fbc1 100644 --- a/src/modules/registrar/sip_msg.c +++ b/src/modules/registrar/sip_msg.c @@ -48,15 +48,17 @@ static struct hdr_field *act_contact; */ static inline int randomize_expires(int expires, int range) { - int range_min; + float range_min; /* if no range is given just return expires */ if(range == 0) return expires; - range_min = expires - (float)range / 100 * expires; + range_min = (float)expires * (1.0 - ((float)range / 100)); - return range_min + (float)(kam_rand() % 100) / 100 * (expires - range_min); + return (int)(range_min + + ((float)(kam_rand() % 100) / 100) + * ((float)expires - range_min)); }

11 months, 2 weeks

git:master:403ed489: modules: readme files regenerated - usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 403ed48995e5eec5a795edd1748f9fe8a9ee520d URL: https://github.com/kamailio/kamailio/commit/403ed48995e5eec5a795edd1748f9fe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-10T13:32:13+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/403ed48995e5eec5a795edd1748f9fe… Patch: https://github.com/kamailio/kamailio/commit/403ed48995e5eec5a795edd1748f9fe…

11 months, 2 weeks

[kamailio/kamailio] htable dmq can not get the expected result (Issue #3674)

by sznoname

### Description I have Kam207(192.168.100.207) and Kam208(192.168.100.208) here is Kam207 route: ```cfg debug=2 log_stderror=yes # mpath="/usr/local/lib/kamailio/modules/" loadmodule "tm.so" loadmodule "sl.so" loadmodule "pv.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "ctl.so" loadmodule "textops.so" loadmodule "dmq.so" loadmodule "htable.so" modparam("tm", "failure_reply_mode", 3) modparam("tm", "fr_timer", 30000) modparam("tm", "fr_inv_timer", 120000) modparam("dmq", "server_address", "sip:192.168.100.207:5060") modparam("dmq", "notification_address", "sip:192.168.100.208:5060") modparam("dmq", "multi_notify", 1) modparam("dmq", "num_workers", 4) modparam("dmq", "ping_interval", 15) modparam("htable", "htable", "bancc=>size=10;autoexpire=3600;dmqreplicate=1;") modparam("htable", "enable_dmq", 1) modparam("htable", "dmq_init_sync", 1) request_route { # xinfo("*** $sel(msg)\n"); if(is_method("KDMQ")) { dmq_handle_message(); exit; } sl_send_reply("404", "Not here"); exit; } ``` and here is Kam208 route: ```cfg debug=2 log_stderror=yes # mpath="/usr/local/lib/kamailio/modules/" loadmodule "tm.so" loadmodule "sl.so" loadmodule "pv.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "ctl.so" loadmodule "textops.so" loadmodule "dmq.so" loadmodule "htable.so" modparam("tm", "failure_reply_mode", 3) modparam("tm", "fr_timer", 30000) modparam("tm", "fr_inv_timer", 120000) modparam("dmq", "server_address", "sip:192.168.100.208:5060") modparam("dmq", "notification_address", "sip:192.168.100.207:5060") modparam("dmq", "multi_notify", 1) modparam("dmq", "num_workers", 4) modparam("dmq", "ping_interval", 15) modparam("htable", "htable", "bancc=>size=10;autoexpire=3600;dmqreplicate=1;") modparam("htable", "enable_dmq", 1) modparam("htable", "dmq_init_sync", 1) request_route { # xinfo("*** $sel(msg)\n"); if(is_method("KDMQ")) { dmq_handle_message(); exit; } sl_send_reply("404", "Not here"); exit; } ``` at Kam207 run `kamcmd htable.seti bancc TW 1` at Kam208 run `kamcmd htable.dump bancc`, and got: ``` { entry: 779 size: 1 slot: { { name: TW value: -2147483648 type: int } } } ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.7.3 (x86_64/linux) ``` * **Operating System**:  ``` Debian11 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3674 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3674(a)github.com>

11 months, 2 weeks

git:master:bbb81e5f: usrloc: docs for ka_randomize parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bbb81e5f6ef5744cc9b74302e8ecee6687199872 URL: https://github.com/kamailio/kamailio/commit/bbb81e5f6ef5744cc9b74302e8ecee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-10T13:20:34+01:00 usrloc: docs for ka_randomize parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bbb81e5f6ef5744cc9b74302e8ecee6… Patch: https://github.com/kamailio/kamailio/commit/bbb81e5f6ef5744cc9b74302e8ecee6… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 77b18989b4b..d7d78ae7b00 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1481,6 +1481,31 @@ modparam("usrloc", "ka_interval", 30) </example> </section> + <section id="usrloc.p.ka_randomize"> + <title><varname>ka_randomize</varname> (int)</title> + <para> + The parameter sets the the upper limit to the range of random seconds + to be added to ka_interval before checking if a new keepalive request + has to be sent. It should help to distribute better the sending of + keepalive requests. The keepalive for a location record is going to be + sent in a random fashion between (ka_interval + 0) and + (ka_interval + ka_randomize). + </para> + <para> + <emphasis> + Default value is <quote>20</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ka_randomize</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_interval", 30) +... +</programlisting> + </example> + </section> + <section id="usrloc.p.ka_loglevel"> <title><varname>ka_loglevel</varname> (int)</title> <para>

11 months, 2 weeks

git:master:5bf1a7ab: usrloc: option to randomize when keepalive is sent

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5bf1a7ab30f14d989ab185585427c868429224fa URL: https://github.com/kamailio/kamailio/commit/5bf1a7ab30f14d989ab185585427c86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-10T13:20:34+01:00 usrloc: option to randomize when keepalive is sent - default adds a range from 0 to 20 seconds to ka_interval --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5bf1a7ab30f14d989ab185585427c86… Patch: https://github.com/kamailio/kamailio/commit/5bf1a7ab30f14d989ab185585427c86… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 435f84d7c71..eba6bec5c0d 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -44,6 +44,7 @@ extern int ul_keepalive_timeout; extern int ul_ka_interval; +extern int ul_ka_randomize; static int ul_ka_send(str *kamsg, dest_info_t *kadst); @@ -110,6 +111,7 @@ int ul_ka_urecord(urecord_t *ur) int i; struct timeval tv; time_t tnow = 0; + int ka_limit = 0; if(ul_ka_mode == ULKA_NONE) { return 0; @@ -160,10 +162,12 @@ int ul_ka_urecord(urecord_t *ur) } } } - if(ul_ka_interval > 0 && uc->last_keepalive > 0 - && (uc->last_keepalive + ul_ka_interval) < tnow) { - /* not yet the time for keepalive */ - continue; + if(ul_ka_interval > 0 && uc->last_keepalive > 0) { + ka_limit = ul_ka_interval - (fastrand() % ul_ka_randomize); + if((uc->last_keepalive + ka_limit) < tnow) { + /* not yet the time for keepalive */ + continue; + } } if(uc->received.len > 0) { sdst = uc->received; diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index f493915a564..b14fe7273e1 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -128,6 +128,7 @@ str ul_ka_method = str_init("OPTIONS"); int ul_ka_mode = 0; int ul_ka_filter = 0; int ul_ka_interval = 40; +int ul_ka_randomize = 20; int ul_ka_loglevel = 255; str ul_ka_logmsg = str_init(" to-uri: [$tu] remote-addr: [$sas]"); pv_elem_t *ul_ka_logfmt = NULL; @@ -302,6 +303,7 @@ static param_export_t params[] = { {"ka_method", PARAM_STR, &ul_ka_method}, {"ka_filter", PARAM_INT, &ul_ka_filter}, {"ka_interval", PARAM_INT, &ul_ka_interval}, + {"ka_randomize", PARAM_INT, &ul_ka_randomize}, {"ka_timeout", PARAM_INT, &ul_keepalive_timeout}, {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {"ka_logmsg", PARAM_STR, &ul_ka_logmsg},

11 months, 2 weeks

git:master:03f939e3: modules: readme files regenerated - usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 03f939e3d1a0dbf56791943f90942984984f2d72 URL: https://github.com/kamailio/kamailio/commit/03f939e3d1a0dbf56791943f9094298… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-10T12:47:06+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/03f939e3d1a0dbf56791943f9094298… Patch: https://github.com/kamailio/kamailio/commit/03f939e3d1a0dbf56791943f9094298…

11 months, 2 weeks

git:master:36608af8: usrloc: docs for ka_interval parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 36608af81b3ed64b3800be1625647ed0a9e5031d URL: https://github.com/kamailio/kamailio/commit/36608af81b3ed64b3800be1625647ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-10T12:42:43+01:00 usrloc: docs for ka_interval parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/36608af81b3ed64b3800be1625647ed… Patch: https://github.com/kamailio/kamailio/commit/36608af81b3ed64b3800be1625647ed… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 5c0796935c7..77b18989b4b 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1460,6 +1460,27 @@ modparam("usrloc", "ka_timeout", 120) </example> </section> + <section id="usrloc.p.ka_interval"> + <title><varname>ka_interval</varname> (int)</title> + <para> + The parameter sets the interval in seconds after which a new keepalive + request should be sent for a location record. + </para> + <para> + <emphasis> + Default value is <quote>40</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ka_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_interval", 30) +... +</programlisting> + </example> + </section> + <section id="usrloc.p.ka_loglevel"> <title><varname>ka_loglevel</varname> (int)</title> <para>

11 months, 2 weeks

git:master:53ace443: usrloc: added keepalive interval to set the step for sending

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 53ace443020075f7ecd12c72f154193c6cfa6af3 URL: https://github.com/kamailio/kamailio/commit/53ace443020075f7ecd12c72f154193… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-10T12:42:43+01:00 usrloc: added keepalive interval to set the step for sending - the keepalive is not going to be sent before the interval elapsed - the keepalive is no longer sent on every timer callback - default 40 seconds --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/53ace443020075f7ecd12c72f154193… Patch: https://github.com/kamailio/kamailio/commit/53ace443020075f7ecd12c72f154193… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 02c21c0837e..435f84d7c71 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -43,6 +43,7 @@ #include "ul_keepalive.h" extern int ul_keepalive_timeout; +extern int ul_ka_interval; static int ul_ka_send(str *kamsg, dest_info_t *kadst); @@ -159,6 +160,11 @@ int ul_ka_urecord(urecord_t *ur) } } } + if(ul_ka_interval > 0 && uc->last_keepalive > 0 + && (uc->last_keepalive + ul_ka_interval) < tnow) { + /* not yet the time for keepalive */ + continue; + } if(uc->received.len > 0) { sdst = uc->received; } else { diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index e6aa591bbce..f493915a564 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -127,6 +127,7 @@ str ul_ka_domain = str_init("kamailio.org"); str ul_ka_method = str_init("OPTIONS"); int ul_ka_mode = 0; int ul_ka_filter = 0; +int ul_ka_interval = 40; int ul_ka_loglevel = 255; str ul_ka_logmsg = str_init(" to-uri: [$tu] remote-addr: [$sas]"); pv_elem_t *ul_ka_logfmt = NULL; @@ -300,6 +301,7 @@ static param_export_t params[] = { {"ka_domain", PARAM_STR, &ul_ka_domain}, {"ka_method", PARAM_STR, &ul_ka_method}, {"ka_filter", PARAM_INT, &ul_ka_filter}, + {"ka_interval", PARAM_INT, &ul_ka_interval}, {"ka_timeout", PARAM_INT, &ul_keepalive_timeout}, {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {"ka_logmsg", PARAM_STR, &ul_ka_logmsg},

11 months, 2 weeks

← Newer
1
...
21
22
23
24
25
26
27
...
32
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