sr-dev August 2022

sr-dev@lists.kamailio.org

16 participants
280 discussions

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:ddf1cbc4: pkg/kamailio/obs: fixed rpm packaging on CentOS 8 and Fedora
by Sergey Safarov 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.4 Commit: ddf1cbc422d3f5af12ec2b206d8df2116c17d24a URL: https://github.com/kamailio/kamailio/commit/ddf1cbc422d3f5af12ec2b206d8df21… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-08-16T22:40:33+03:00 pkg/kamailio/obs: fixed rpm packaging on CentOS 8 and Fedora (cherry picked from commit 44b3ccd71467b78d9e9a7184c9fd25bc5f616ac4) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ddf1cbc422d3f5af12ec2b206d8df21… Patch: https://github.com/kamailio/kamailio/commit/ddf1cbc422d3f5af12ec2b206d8df21… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 0054587e22..20d6588e80 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1809,7 +1809,7 @@ fi %dir %{_libdir}/kamailio/kamctl/dbtextdb %{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.py -%if 0%{?rhel} > 8 +%if 0%{?rhel} >= 8 || 0%{?fedora} %dir %{_libdir}/kamailio/kamctl/dbtextdb/__pycache__ %{_libdir}/kamailio/kamctl/dbtextdb/__pycache__/*.pyc %endif

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

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:0c6b55fd: packaging: on EL8 package with Python 3.9
by Sergey Safarov 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.4 Commit: 0c6b55fd5588979ec3dfc26112de06825731dce5 URL: https://github.com/kamailio/kamailio/commit/0c6b55fd5588979ec3dfc26112de068… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-08-16T22:40:00+03:00 packaging: on EL8 package with Python 3.9 (cherry picked from commit c938619e458e0efa0676e7e60c2b1a6fc7e947db) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0c6b55fd5588979ec3dfc26112de068… Patch: https://github.com/kamailio/kamailio/commit/0c6b55fd5588979ec3dfc26112de068… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ee9c08e0b85..57f14110a6c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -807,6 +807,10 @@ BuildRequires: python2, python2-devel %if 0%{?rhel} == 7 Requires: python36, kamailio = %ver BuildRequires: python36, python36-devel +%endif +%if 0%{?rhel} == 8 +Requires: python39, kamailio = %ver +BuildRequires: python39, python39-devel %else Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel @@ -1174,6 +1178,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ +%endif +%if 0%{?rhel} == 8 + PYTHON3=python3.9 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc} @@ -1269,6 +1276,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ +%endif +%if 0%{?rhel} == 8 + PYTHON3=python3.9 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc}

1 0

git:5.5:d0e9b871: pkg/kamailio/obs: fixed rpm packaging on CentOS 8 and Fedora
by Sergey Safarov 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.5 Commit: d0e9b871ab46868ab971b1fcd02f47d756363c03 URL: https://github.com/kamailio/kamailio/commit/d0e9b871ab46868ab971b1fcd02f47d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-08-16T20:51:48+03:00 pkg/kamailio/obs: fixed rpm packaging on CentOS 8 and Fedora (cherry picked from commit 44b3ccd71467b78d9e9a7184c9fd25bc5f616ac4) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d0e9b871ab46868ab971b1fcd02f47d… Patch: https://github.com/kamailio/kamailio/commit/d0e9b871ab46868ab971b1fcd02f47d… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index c76b3c95cf..4a26128e8c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1786,7 +1786,7 @@ fi %dir %{_libdir}/kamailio/kamctl/dbtextdb %{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.py -%if 0%{?rhel} > 8 +%if 0%{?rhel} >= 8 || 0%{?fedora} %dir %{_libdir}/kamailio/kamctl/dbtextdb/__pycache__ %{_libdir}/kamailio/kamctl/dbtextdb/__pycache__/*.pyc %endif

1 0

git:5.5:9a1883f3: 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.5 Commit: 9a1883f32a4cf39c1808d9979ecc13463b5ae932 URL: https://github.com/kamailio/kamailio/commit/9a1883f32a4cf39c1808d9979ecc134… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-08-16T20:51:48+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/9a1883f32a4cf39c1808d9979ecc134… Patch: https://github.com/kamailio/kamailio/commit/9a1883f32a4cf39c1808d9979ecc134… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index cab1a68543..c76b3c95cf 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1786,8 +1786,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

git:5.5:cfe190c0: pkg/kamailio/obs: added CentOS 9 support
by Sergey Safarov 16 Aug '22

16 Aug '22

Module: kamailio Branch: 5.5 Commit: cfe190c0946f12e15b241c0cc2e619973568c77b URL: https://github.com/kamailio/kamailio/commit/cfe190c0946f12e15b241c0cc2e6199… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-08-16T20:51:48+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/cfe190c0946f12e15b241c0cc2e6199… Patch: https://github.com/kamailio/kamailio/commit/cfe190c0946f12e15b241c0cc2e6199…

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2022