sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:02a04a2b: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 17 Aug '22

17 Aug '22

Module: kamailio Branch: master Commit: 02a04a2b544d16ced3d6e59c4458605419880cfe URL: https://github.com/kamailio/kamailio/commit/02a04a2b544d16ced3d6e59c4458605… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-17T10:46:42+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/02a04a2b544d16ced3d6e59c4458605… Patch: https://github.com/kamailio/kamailio/commit/02a04a2b544d16ced3d6e59c4458605… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index d180968e95..a15bc8c62d 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -1113,10 +1113,15 @@ modparam("usrloc", "version_table", 0) Note: the internal keepalive is for the moment implemented only for contact records stored in memory. - Note: it is recommeder to set 'timer_procs' parameter in order to have + Note: it is recommended to set 'timer_procs' parameter in order to have dedicated timer processes for usrloc module and off-load the keepalive sending process from the core timers. + Note: Keepalives will be sent to the IP and port using the transport + defined in the âreceivedâ column. If not set, then keepalives will + be sent to the AOR using UDP as a default transport. If available, the + TCP connection will be re-used for WS, TCP and TLS. + Default value is “0 (keepalive disabled)”. Example 1.50. ka_mode parameter usage

1 0

git:master:edde9cdb: Makefile.defs: version set to 5.7.0-dev1
by Daniel-Constantin Mierla 17 Aug '22

17 Aug '22

Module: kamailio Branch: master Commit: edde9cdb0c4d78f4e72da297c9f025d6367f6d8d URL: https://github.com/kamailio/kamailio/commit/edde9cdb0c4d78f4e72da297c9f025d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-17T10:34:55+02:00 Makefile.defs: version set to 5.7.0-dev1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/edde9cdb0c4d78f4e72da297c9f025d… Patch: https://github.com/kamailio/kamailio/commit/edde9cdb0c4d78f4e72da297c9f025d… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index c155889688..1782abc657 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] usrloc: re-use TCP connections for keepalive (PR #3219)
by abrezinsky 17 Aug '22

17 Aug '22

- Fixes GH #3178. Sets TCP connection id for keepalive based on the value in the database If unset, tcpconn_id will remain 0 and keepalives will work the same as they do today - Update documentation to clarify when it will use received vs AOR for keepalive   #### 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) - [X] 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 #3178 (replace XXXX with an open issue number) #### Description  Updated usrloc module to re-use an active TCP session (if it exists). I marked this breaking only because the current code will use a UDP OPTIONS keepalive method even if the device is registered over TCP. I doubt that's what anyone would be expecting so I think the change is ok. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3219 -- Commit Summary -- * usrloc: re-use TCP connections for keepalive -- File Changes -- M src/modules/usrloc/dlist.c (4) M src/modules/usrloc/doc/usrloc_admin.xml (9) M src/modules/usrloc/ul_keepalive.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3219.patch https://github.com/kamailio/kamailio/pull/3219.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3219 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3219(a)github.com>

3 5

git:master:06f933ad: usrloc: re-use TCP connections for keepalive
by Daniel-Constantin Mierla 17 Aug '22

17 Aug '22

Module: kamailio Branch: master Commit: 06f933ad17aac3a3f0f81cf0e0ab04f38cf60993 URL: https://github.com/kamailio/kamailio/commit/06f933ad17aac3a3f0f81cf0e0ab04f… Author: Andy Brezinsky <andy.brezinsky(a)mitel.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-17T10:33:50+02:00 usrloc: re-use TCP connections for keepalive - Fixes GH #3178. Sets TCP connection id for keepalive based on the value in the database If unset, tcpconn_id will remain 0 and keepalives will work the same as they do today - Update documentation to clarify when it will use received vs AOR for keepalive --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/doc/usrloc_admin.xml Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/06f933ad17aac3a3f0f81cf0e0ab04f… Patch: https://github.com/kamailio/kamailio/commit/06f933ad17aac3a3f0f81cf0e0ab04f… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 252bb8bde07..c0c7cb0009f 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -114,6 +114,7 @@ int ul_ka_db_records(int partidx) keys2[5] = &ul_ruid_col; keys2[6] = &ul_user_col; keys2[7] = &ul_domain_col; + keys2[8] = &ul_con_id_col; /* where fields */ keys1[0] = &ul_expires_col; @@ -256,6 +257,9 @@ int ul_ka_db_records(int partidx) ur.aorhash = ul_get_aorhash(&ur.aor); ur.contacts = &uc; + /* tcpconn_id */ + uc.tcpconn_id = VAL_INT(ROW_VALUES(row)+8); + ul_ka_urecord(&ur); } /* row cycle */ diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 66dae449130..f2d2001689c 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1317,11 +1317,17 @@ modparam("usrloc", "version_table", 0) contact records stored in memory. </para> <para> - Note: it is recommeder to set 'timer_procs' parameter in order to have + Note: it is recommended to set 'timer_procs' parameter in order to have dedicated timer processes for usrloc module and off-load the keepalive sending process from the core timers. </para> <para> + Note: Keepalives will be sent to the IP and port using the transport + defined in the “received” column. If not set, then keepalives will be sent + to the AOR using UDP as a default transport. If available, the TCP + connection will be re-used for WS, TCP and TLS. + </para> + <para> Default value is <quote>0 (keepalive disabled)</quote>. </para> <example> @@ -1780,4 +1786,3 @@ modparam("usrloc", "db_clean_tcp", 1) </chapter> - diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 8808725849f..ffe37fdc738 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -200,6 +200,7 @@ int ul_ka_urecord(urecord_t *ur) } idst.proto = dproto; idst.send_sock = ssock; + idst.id = uc->tcpconn_id; if(ssock->useinfo.name.len > 0) { if (ssock->useinfo.address.af == AF_INET6) { @@ -270,19 +271,16 @@ static int ul_ka_send(str *kamsg, dest_info_t *kadst) #ifdef USE_TCP else if(kadst->proto == PROTO_WS || kadst->proto == PROTO_WSS) { /*ws-wss*/ - kadst->id=0; return wss_send(kadst, kamsg->s, kamsg->len); } else if(kadst->proto == PROTO_TCP) { /*tcp*/ - kadst->id=0; return tcp_send(kadst, 0, kamsg->s, kamsg->len); } #endif #ifdef USE_TLS else if(kadst->proto == PROTO_TLS) { /*tls*/ - kadst->id=0; return tcp_send(kadst, 0, kamsg->s, kamsg->len); } #endif

1 0

[kamailio/kamailio] dialog: dont reset dlg_db_mode in POSTCHILDINIT for DB_MODE_SHUTDOWN (PR #3221)
by shaneqld 17 Aug '22

17 Aug '22

#### 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 #3218 #### Description Per the DB issue in #3218: I've determined the commit where dialog with db_mode SHUTDOWN stopped working is 1ff86ffceede46c7a67fec92c8319c34c916a545. This is the change where `PROC_POSTCHILDINIT` was enabled/used. In dialog.c `child_init()`, there is code that resets the DB mode to NONE if not running in the main process: ```c /* in DB_MODE_SHUTDOWN only PROC_MAIN will do a DB dump at the end, so * for the rest of the processes will be the same as DB_MODE_NONE */ if (dlg_db_mode==DB_MODE_SHUTDOWN && rank!=PROC_MAIN) dlg_db_mode = DB_MODE_NONE; ``` However, because PROC_POSTCHILDINIT has now been enabled for the module, this code effectively disables DB persistence as PROC_POSTCHILDINIT is called in the main process after PROC_MAIN. I have modified the rank check to `rank!=PROC_POSTCHILDINIT` and can confirm that DB persistence in SHUTDOWN mode is working once again. Note that the PR changes the logic to: ```c if (dlg_db_mode==DB_MODE_SHUTDOWN && rank!=PROC_POSTCHILDINIT) dlg_db_mode = DB_MODE_NONE; ``` Technically dlg_db_mode will be reset to DB_MODE_NONE when called with rank PROC_MAIN, but the value will be restored when PROC_POSTCHILDINIT is called. I assume this behavior is OK, but otherwise I can change it to: ```c if (dlg_db_mode==DB_MODE_SHUTDOWN && rank!=PROC_MAIN && rank!=PROC_POSTCHILDINIT) dlg_db_mode = DB_MODE_NONE; ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3221 -- Commit Summary -- * dialog: dont reset dlg_db_mode in POSTCHILDINIT for DB_MODE_SHUTDOWN -- File Changes -- M src/modules/dialog/dialog.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3221.patch https://github.com/kamailio/kamailio/pull/3221.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3221 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3221(a)github.com>

3 5

git:master:8fb25f7c: dialog: dont reset dlg_db_mode in POSTCHILDINIT for DB_MODE_SHUTDOWN
by Daniel-Constantin Mierla 17 Aug '22

17 Aug '22

Module: kamailio Branch: master Commit: 8fb25f7cb6fa73dc37fe11df9b921c32009bd107 URL: https://github.com/kamailio/kamailio/commit/8fb25f7cb6fa73dc37fe11df9b921c3… Author: Shane Mitchell <sm(a)opencluster.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-17T10:32:41+02:00 dialog: dont reset dlg_db_mode in POSTCHILDINIT for DB_MODE_SHUTDOWN --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/8fb25f7cb6fa73dc37fe11df9b921c3… Patch: https://github.com/kamailio/kamailio/commit/8fb25f7cb6fa73dc37fe11df9b921c3… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 9b196f86c1d..4347399a794 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -824,7 +824,7 @@ static int child_init(int rank) /* in DB_MODE_SHUTDOWN only PROC_MAIN will do a DB dump at the end, so * for the rest of the processes will be the same as DB_MODE_NONE */ - if (dlg_db_mode==DB_MODE_SHUTDOWN && rank!=PROC_MAIN) + if (dlg_db_mode==DB_MODE_SHUTDOWN && rank!=PROC_POSTCHILDINIT) dlg_db_mode = DB_MODE_NONE; /* in DB_MODE_REALTIME and DB_MODE_DELAYED the PROC_MAIN have no DB handle */ if ( (dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) &&

1 0

[kamailio/kamailio] tls: add timestamp and sni info for a session (PR #3193)
by Stefan Mititelu 17 Aug '22

17 Aug '22

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3193 -- Commit Summary -- * tls: add timestamp and sni info for a session -- File Changes -- M src/core/tcp_conn.h (1) M src/core/tcp_main.c (1) M src/modules/tls/tls_rpc.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3193.patch https://github.com/kamailio/kamailio/pull/3193.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3193 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3193(a)github.com>

4 17

git:master:c0c1dcc1: tls: add timestamp and sni info for a session
by Daniel-Constantin Mierla 17 Aug '22

17 Aug '22

Module: kamailio Branch: master Commit: c0c1dcc1008e74ed51987506d96bd8ebc88f3c9d URL: https://github.com/kamailio/kamailio/commit/c0c1dcc1008e74ed51987506d96bd8e… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-17T10:31:55+02:00 tls: add timestamp and sni info for a session --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c Modified: src/modules/tls/tls_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/c0c1dcc1008e74ed51987506d96bd8e… Patch: https://github.com/kamailio/kamailio/commit/c0c1dcc1008e74ed51987506d96bd8e… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index aaf1f2fcb05..fb6bbe63277 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -220,6 +220,7 @@ typedef struct tcp_connection { enum tcp_conn_states state; /* connection state */ void* extra_data; /* extra data associated to the connection, 0 for tcp*/ struct timer_ln timer; + time_t timestamp;/* connection creation timestamp */ ticks_t timeout;/* connection timeout, after this it will be removed*/ ticks_t lifetime;/* connection lifetime */ unsigned id_hash; /* hash index in the id_hash */ diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 9edbe79a361..2114e390f4c 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1220,6 +1220,7 @@ struct tcp_connection* tcpconn_new(int sock, union sockaddr_union* su, c->rcv.proto_reserved2=0; c->state=state; c->extra_data=0; + c->timestamp=time(NULL); #ifdef USE_TLS if (type==PROTO_TLS){ if (tls_tcpconn_init(c, sock)==-1) goto error; diff --git a/src/modules/tls/tls_rpc.c b/src/modules/tls/tls_rpc.c index 9c7f980e71e..a7ad254a1b5 100644 --- a/src/modules/tls/tls_rpc.c +++ b/src/modules/tls/tls_rpc.c @@ -115,6 +115,9 @@ static void tls_list(rpc_t* rpc, void* c) struct tls_extra_data* tls_d; struct tcp_connection* con; int i, len, timeout; + struct tm timestamp; + char timestamp_s[128]; + const char* sni; TCPCONN_LOCK; for(i = 0; i < TCP_ID_HASH_SIZE; i++) { @@ -132,8 +135,29 @@ static void tls_list(rpc_t* rpc, void* c) BUG("failed to convert destination ip"); dst_ip[len] = 0; timeout = TICKS_TO_S(con->timeout - get_ticks_raw()); - rpc->struct_add(handle, "ddsdsd", + timestamp = *localtime(&con->timestamp); + if (snprintf(timestamp_s, 128, "%d-%02d-%02d %02d:%02d:%02d", timestamp.tm_year + 1900, + timestamp.tm_mon + 1, timestamp.tm_mday, timestamp.tm_hour, + timestamp.tm_min, timestamp.tm_sec) < 0) { + timestamp_s[0] = 'N'; + timestamp_s[1] = '/'; + timestamp_s[2] = 'A'; + timestamp_s[3] = '\0'; + } + + if (tls_d) { + sni = SSL_get_servername(tls_d->ssl, TLSEXT_NAMETYPE_host_name); + if (sni == NULL) { + sni = "N/A"; + } + } else { + sni = "N/A"; + } + + rpc->struct_add(handle, "dssdsdsd", "id", con->id, + "sni", sni, + "timestamp", timestamp_s, "timeout", timeout, "src_ip", src_ip, "src_port", con->rcv.src_port,

1 0

git:5.4:3eb540bd: pkg/kamailio/obs: added CentOS 9 support
by Sergey Safarov 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.4 Commit: 3eb540bd16d7a0c983f67331c4b84e9b6d580b57 URL: https://github.com/kamailio/kamailio/commit/3eb540bd16d7a0c983f67331c4b84e9… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-08-16T22:40:16+03:00 pkg/kamailio/obs: added CentOS 9 support (cherry picked from commit 19edea067f890814c767581fef65713046c768c6) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3eb540bd16d7a0c983f67331c4b84e9… Patch: https://github.com/kamailio/kamailio/commit/3eb540bd16d7a0c983f67331c4b84e9…

1 0

git:5.4:7f34953c: pkg/kamailio/obs: fixed packaging for RHEL 7 and RHEL 6 based dists [skip ci]
by Sergey Safarov 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.4 Commit: 7f34953ceb7dfb0353becfc4b52c2b3b82ffef4f URL: https://github.com/kamailio/kamailio/commit/7f34953ceb7dfb0353becfc4b52c2b3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-08-16T22:40:25+03:00 pkg/kamailio/obs: fixed packaging for RHEL 7 and RHEL 6 based dists [skip ci] (cherry picked from commit 4a6aa75dd1de4e33ba6ac3f1d770a1beed61e157) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/7f34953ceb7dfb0353becfc4b52c2b3… Patch: https://github.com/kamailio/kamailio/commit/7f34953ceb7dfb0353becfc4b52c2b3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d779c24b84..0054587e22 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1809,8 +1809,14 @@ fi %dir %{_libdir}/kamailio/kamctl/dbtextdb %{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.py +%if 0%{?rhel} > 8 %dir %{_libdir}/kamailio/kamctl/dbtextdb/__pycache__ %{_libdir}/kamailio/kamctl/dbtextdb/__pycache__/*.pyc +%endif +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyc +%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyo +%endif %{_mandir}/man5/* %{_mandir}/man8/*

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev