- sr-dev - kamailio.org

git:master:35767f38: acc: expose accounting functions via inter-module api
by Daniel-Constantin Mierla 26 Nov '21

26 Nov '21

Module: kamailio Branch: master Commit: 35767f387bbcd2766bf7a4ff1345183612219225 URL: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-25T13:36:59+01:00 acc: expose accounting functions via inter-module api --- Modified: src/modules/acc/acc_api.h Modified: src/modules/acc/acc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… Patch: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… --- diff --git a/src/modules/acc/acc_api.h b/src/modules/acc/acc_api.h index 0a6df2e32c..04b893483b 100644 --- a/src/modules/acc/acc_api.h +++ b/src/modules/acc/acc_api.h @@ -146,8 +146,16 @@ typedef acc_extra_t* (*parse_extra_f)(char *extra_str); typedef int (*register_cdr_engine_f)(cdr_engine_t *eng); typedef int (*cdr_api_exec_f)(struct dlg_cell *dlg, struct sip_msg *rq, cdr_engine_t *eng, acc_param_t* comment); +typedef int (*acc_log_request_f)(sip_msg_t *msg, str *comment); +typedef int (*acc_db_request_f)(sip_msg_t *msg, str *comment, str *dbtable); +typedef int (*acc_request_f)(sip_msg_t *msg, str *comment, str *dbtable); + + /* the acc API */ typedef struct acc_api { + acc_log_request_f acc_log_request; + acc_db_request_f acc_db_request; + acc_request_f acc_request; leg_info_f get_leg_info; core2strar_f get_core_attrs; extra2strar_f get_extra_attrs; diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c index 5afcab113b..801a908025 100644 --- a/src/modules/acc/acc_mod.c +++ b/src/modules/acc/acc_mod.c @@ -644,6 +644,12 @@ static int bind_acc(acc_api_t* api) return -1; } + memset(api, 0, sizeof(acc_api_t)); + + api->acc_log_request = ki_acc_log_request; + api->acc_db_request = ki_acc_db_request; + api->acc_request = ki_acc_request; + api->register_engine = acc_register_engine; api->get_leg_info = get_leg_info; api->get_core_attrs = core2strar;

1 0

git:master:a0ef1ccd: uac_redirect: use inter-module acc api instead of config export lookup
by Daniel-Constantin Mierla 26 Nov '21

26 Nov '21

Module: kamailio Branch: master Commit: a0ef1ccd17368775d68f8687f25b0d72656ac273 URL: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-26T15:32:54+01:00 uac_redirect: use inter-module acc api instead of config export lookup - use acc functions via inter-module acc api, intead of config file function export lookup, to get the right signature and avoid workaround of fixing a modparam like a function param and improper access of expected fields by offset - GH #2953 --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml Modified: src/modules/uac_redirect/rd_funcs.c Modified: src/modules/uac_redirect/rd_funcs.h Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7… Patch: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7…

1 0

[kamailio/kamailio] Config errors (Issue #2957)
by SerhiiZahuba 26 Nov '21

26 Nov '21

Perhaps I am doing something wrong? New installation, new config file and when starting the server I see an error 1) parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 165, column 1-5: syntax error 164 / * LOG Levels: 3 = DBG, 2 = INFO, 1 = NOTICE, 0 = WARN, -1 = ERR, ... * / 165 debug = DBGLEVEL 166 2) /usr/local/etc/kamailio/kamailio.cfg, line 34, column 1-9: syntax error 32 # *** To enable authentication execute: 33 #mysql 34 WITH_AUTH Where can there be an error if this file is downloaded from your server? Please tell me this is driving me crazy. -- 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/2957

2 4

parse error in core/receive.c
by Juha Heinanen 26 Nov '21

26 Nov '21

Is it only me who gets this with master? -- Juha CC (gcc) [pres-serv] core/receive.o In file included from core/ut.h:42, from core/ip_addr.h:39, from core/receive.h:32, from core/receive.c:34: core/receive.c: In function 'receive_msg': core/receive.c:376:5: error: expected ')' before 'ip_addr2a' 376 | ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, | ^~~~~~~~~ core/dprint.h:317:30: note: in definition of macro 'LOG_FX' 317 | _ksr_slog_func(&__kld, fmt, ## args); \ | ^~~ core/dprint.h:351:4: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ...

1 1

[kamailio/kamailio] cannot adopt OIDs in KAMAILIO-SIP-COMMON-MIB (Issue #2955)
by abonela 25 Nov '21

25 Nov '21

Please try to fill this template as much as possible for any issue. It helps the developers to troubleshoot the issue. we have configured snmp module following https://www.kamailio.org/dokuwiki/doku.php/utils:kamailio-and-snmp ### Description  we could able to poll or snmpwalk most of the OIDs in KAMAILIO-REG-MIB , KAMAILIO-SIP-SERVER-MIB but having issues below from KAMAILIO-SIP-COMMON-MIB snmpd[358730]: Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsMethod ::= { kamailioSIPMethodStatsEntry 1 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsOutbounds ::= { kamailioSIPMethodStatsEntry 2 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsInbounds ::= { kamailioSIPMethodStatsEntry 3 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeMethod ::= { kamailioSIPStatusCodesEntry 1 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeValue ::= { kamailioSIPStatusCodesEntry 2 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeIns ::= { kamailioSIPStatusCodesEntry 3 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeOuts ::= { kamailioSIPStatusCodesEntry 4 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeRowStatus ::= { kamailioSIPStatusCodesEntry 5 } ### Troubleshooting root@host# snmpwalk -v2c -c public localhost .1.3.6.1.4.1.34352.3.1.1.1.4.1.1.2.0 SNMPv2-SMI::enterprises.34352.3.1.1.1.4.1.1.2.0 = No Such Object available on this agent at this OID root@host# snmpwalk -v2c -c public localhost .1.3.6.1.4.1.34352.3.1.1.1.4.1.1.2 SNMPv2-SMI::enterprises.34352.3.1.1.1.4.1.1.2 = No Such Object available on this agent at this OID #### Reproduction using snmpwalk or snmget to any of the above mentioned kamailioSIPStats* OIDs will do ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.1 (x86_64/linux) 307af8-dirty ``` * **Operating System**:  ``` No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.2 LTS Release: 20.04 Codename: focal ``` -- 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/2955

2 2

[kamailio/kamailio] OpenSSL:It(PTHREAD_PROCESS_SHARED) is not initialized, which may cause the Kamailio worker process to block (Issue #2956)
by 陈庆毅 25 Nov '21

25 Nov '21

why the process sharing option (PTHREAD_PROCESS_SHARED) was not used for initialization, which might cause the Kamailio worker process to block -- 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/2956

2 2

git:master:b3f77460: tls: get local/remote issuer line via $tls(key)
by Daniel-Constantin Mierla 25 Nov '21

25 Nov '21

Module: kamailio Branch: master Commit: b3f77460ff78f4d38542ca79bb13398180cd7710 URL: https://github.com/kamailio/kamailio/commit/b3f77460ff78f4d38542ca79bb13398… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-25T09:55:31+01:00 tls: get local/remote issuer line via $tls(key) - new keys: m_issuer_line, p_issuer_line --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/b3f77460ff78f4d38542ca79bb13398… Patch: https://github.com/kamailio/kamailio/commit/b3f77460ff78f4d38542ca79bb13398… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 9a1f6b94b3..985e6dcec1 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -1263,6 +1263,13 @@ int pv_parse_tls_name(pv_spec_p sp, str *in) return -1; switch(in->len) { + case 13: + if(strncmp(in->s, "m_issuer_line", 13)==0) + sp->pvp.pvn.u.isname.name.n = 1001; + else if(strncmp(in->s, "p_issuer_line", 13)==0) + sp->pvp.pvn.u.isname.name.n = 5001; + else goto error; + break; case 14: if(strncmp(in->s, "m_subject_line", 14)==0) sp->pvp.pvn.u.isname.name.n = 1000; @@ -1309,9 +1316,9 @@ int pv_get_tls(struct sip_msg *msg, pv_param_t *param, : SSL_get_peer_certificate(ssl); if (cert == NULL) { if (param->pvn.u.isname.name.n < 5000) { - LM_ERR("Unable to retrieve my TLS certificate from SSL structure\n"); + LM_ERR("failed to retrieve my TLS certificate from SSL structure\n"); } else { - LM_ERR("Unable to retrieve peer TLS certificate from SSL structure\n"); + LM_ERR("failed to retrieve peer TLS certificate from SSL structure\n"); } goto error; } @@ -1325,8 +1332,21 @@ int pv_get_tls(struct sip_msg *msg, pv_param_t *param, if(X509_NAME_oneline(X509_get_subject_name(cert), sv.s, sv.len)==NULL) { goto error; } + tcpconn_put(c); + return pv_get_strzval(msg, param, res, sv.s); + break; + + case 1001: + case 5001: + sv.s = pv_get_buffer(); + sv.len = pv_get_buffer_size() - 1; + if(X509_NAME_oneline(X509_get_issuer_name(cert), sv.s, sv.len)==NULL) { + goto error; + } + tcpconn_put(c); return pv_get_strzval(msg, param, res, sv.s); break; + default: goto error; }

1 0

Re: [sr-dev] [kamailio/kamailio] tls: openssl_mutex_shared - add a date to the note about libssl workaround validity (a0ca4cd)
by 陈庆毅 25 Nov '21

25 Nov '21

I wonder why the process sharing option (PTHREAD_PROCESS_SHARED) was not used for initialization, which might cause the Kamailio worker process to block -- 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/commit/a0ca4cd43f098d10aa5aadcc18453cb…

1 0

[kamailio/kamailio] TLS module: access UID attribute (#1843)
by Sebastian Denz 24 Nov '21

24 Nov '21

### Description While implementing an edgeproxy based on kamailio i have to add a custom SIPHeader which contains the uid from the useragents client certificate. The UID is part of the subject like: O = Company CN = Sebastian Denz UID = denz But i cant access that attribute. All i can do is reading the CN and O. ### Expected behavior There should be a select to access the uid Attribute from the subject, or at least a select which returns the whole subject, so it can be parsed manually in kamailio.cfg. #### Actual observed behavior It is only possible to access the O and CN field from the subject. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.2.0 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 ``` -- 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/1843

4 24

Kamailio v5.5.3 Released
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Hello, Kamailio SIP Server v5.5.3 stable release is out. This is a maintenance release of the latest stable branch, 5.5, that includes fixes since the release of v5.5.2. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.3. For more details about version 5.5.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/11/kamailio-v5-5-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.5:473cefc7: ChangeLog: content updated for v5.5.3
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Module: kamailio Branch: 5.5 Commit: 473cefc7678c747874944216801cb72adb054aa0 URL: https://github.com/kamailio/kamailio/commit/473cefc7678c747874944216801cb72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-24T12:40:07+01:00 ChangeLog: content updated for v5.5.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/473cefc7678c747874944216801cb72… Patch: https://github.com/kamailio/kamailio/commit/473cefc7678c747874944216801cb72…

1 0

git:5.5:f3a4cfd5: Makefile.defs: version set to 5.5.3
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Module: kamailio Branch: 5.5 Commit: f3a4cfd565c3c5a998de5bab39b3c066edc12496 URL: https://github.com/kamailio/kamailio/commit/f3a4cfd565c3c5a998de5bab39b3c06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-24T12:34:56+01:00 Makefile.defs: version set to 5.5.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/f3a4cfd565c3c5a998de5bab39b3c06… Patch: https://github.com/kamailio/kamailio/commit/f3a4cfd565c3c5a998de5bab39b3c06… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9f76722eb5..82b8751e2e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:cd6b228d: pkg/kamailio/deb: version set 5.5.3
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Module: kamailio Branch: 5.5 Commit: cd6b228dc9b902da37101dc3b6da3859adecc0de URL: https://github.com/kamailio/kamailio/commit/cd6b228dc9b902da37101dc3b6da385… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-24T11:48:45+01:00 pkg/kamailio/deb: version set 5.5.3 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/cd6b228dc9b902da37101dc3b6da385… Patch: https://github.com/kamailio/kamailio/commit/cd6b228dc9b902da37101dc3b6da385…

1 0

git:5.5:35477876: pkg: version set to 5.5.3 for rpm and alpine specs
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Module: kamailio Branch: 5.5 Commit: 3547787637f856e83974358ee0e3d09754532a76 URL: https://github.com/kamailio/kamailio/commit/3547787637f856e83974358ee0e3d09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-24T12:04:33+01:00 pkg: version set to 5.5.3 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3547787637f856e83974358ee0e3d09… Patch: https://github.com/kamailio/kamailio/commit/3547787637f856e83974358ee0e3d09… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 9ce95c81d9..9fcabf2cd1 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.2 +pkgver=5.5.3 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5c5948b669..fa6c13757e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.2 +%define ver 5.5.3 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:master:c2c3c8b5: tls: new config variable $tls(key)
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Module: kamailio Branch: master Commit: c2c3c8b5615294989ac81203e65df76b2a08fb02 URL: https://github.com/kamailio/kamailio/commit/c2c3c8b5615294989ac81203e65df76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-24T11:41:17+01:00 tls: new config variable $tls(key) - return attributes related to tls communication - first implemented keys: - m_subject_line - return local (my) certificate subject line - p_subject_line - return remote (peer) certificate subject line --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/c2c3c8b5615294989ac81203e65df76… Patch: https://github.com/kamailio/kamailio/commit/c2c3c8b5615294989ac81203e65df76… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 89b6a44b67..9a1f6b94b3 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -39,6 +39,7 @@ #include "../../core/tcp_server.h" #include "../../core/tcp_conn.h" #include "../../core/ut.h" +#include "../../core/pvapi.h" #include "../../core/cfg/cfg.h" #include "../../core/dprint.h" #include "../../core/strutils.h" @@ -1256,8 +1257,84 @@ static int pv_tlsext_sn(sip_msg_t* msg, pv_param_t* param, pv_value_t* res) } +int pv_parse_tls_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) { + case 14: + if(strncmp(in->s, "m_subject_line", 14)==0) + sp->pvp.pvn.u.isname.name.n = 1000; + else if(strncmp(in->s, "p_subject_line", 14)==0) + sp->pvp.pvn.u.isname.name.n = 5000; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + return 0; +error: + LM_ERR("unknown PV tls name %.*s\n", in->len, in->s); + return -1; +} + + +int pv_get_tls(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + SSL *ssl = NULL; + tcp_connection_t *c = NULL; + X509 *cert = NULL; + str sv = STR_NULL; + + if(msg==NULL || param==NULL) { + return -1; + } + + c = get_cur_connection(msg); + if (c == NULL) { + LM_DBG("TLS connection not found\n"); + return pv_get_null(msg, param, res); + } + ssl = get_ssl(c); + if (ssl == NULL) { + goto error; + } + cert = (param->pvn.u.isname.name.n < 5000) ? SSL_get_certificate(ssl) + : SSL_get_peer_certificate(ssl); + if (cert == NULL) { + if (param->pvn.u.isname.name.n < 5000) { + LM_ERR("Unable to retrieve my TLS certificate from SSL structure\n"); + } else { + LM_ERR("Unable to retrieve peer TLS certificate from SSL structure\n"); + } + goto error; + } + + switch(param->pvn.u.isname.name.n) + { + case 1000: + case 5000: + sv.s = pv_get_buffer(); + sv.len = pv_get_buffer_size() - 1; + if(X509_NAME_oneline(X509_get_subject_name(cert), sv.s, sv.len)==NULL) { + goto error; + } + return pv_get_strzval(msg, param, res, sv.s); + break; + default: + goto error; + } + +error: + tcpconn_put(c); + return pv_get_null(msg, param, res); +} select_row_t tls_sel[] = { /* Current cipher parameters */ @@ -1544,6 +1621,8 @@ pv_export_t tls_pv[] = { {{"tls_peer_server_name", sizeof("tls_peer_server_name")-1}, PVT_OTHER, pv_tlsext_sn, 0, 0, 0, pv_init_iname, PV_TLSEXT_SNI }, + { {"tls", (sizeof("tls")-1)}, PVT_OTHER, pv_get_tls, + 0, pv_parse_tls_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 }

2 1

[kamailio/kamailio] nats: Add one subscriber connection per nats_url (PR #2918)
by Stefan Mititelu 24 Nov '21

24 Nov '21

Updated doc. Fixes #2916.   #### 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  Add a separate connection for each nats_url, for subscriber workers. Basically tested it locally, with 3 nats_url and 2 workers. Thanks, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2918 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2918/commits/dd86ed8d88ad1e25a765…">nats: Add one subscriber connection per nats_url</a> -- File Changes -- M src/modules/nats/doc/nats_admin.xml (4) M src/modules/nats/nats_mod.c (41) M src/modules/nats/nats_mod.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2918.patch https://github.com/kamailio/kamailio/pull/2918.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/2918

3 5

Releasing Kamailio v5.5.3
by Daniel-Constantin Mierla 24 Nov '21

24 Nov '21

Hello, I am considering to release Kamailio v5.5.3 sometime next week, likely on Wednesday or Thursday (Nov 24/25, 2021). This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 4

[kamailio/kamailio] Store full JSON output of rtpengine_query in avp (#2130)
by hrantbagdasarian 23 Nov '21

23 Nov '21

### Description Currently the rtpengine_query function stores some values in predefined avps. I would like to have access to the whole output returned by the query to rtpengine. Sample provided at: https://github.com/sipwise/rtpengine#query-message ### Possible Solutions / Expected behavior Introduce a new avp which stores the full output in json format. -- 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/2130

2 2

git:5.5:9427586f: core: parser - detect pai/ppi headers spanning many lines
by Daniel-Constantin Mierla 23 Nov '21

23 Nov '21

Module: kamailio Branch: 5.5 Commit: 9427586f3af4dacfa2b3293ea6c5813a6b6c1e5c URL: https://github.com/kamailio/kamailio/commit/9427586f3af4dacfa2b3293ea6c5813… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-23T20:26:57+01:00 core: parser - detect pai/ppi headers spanning many lines - GH #2837 (cherry picked from commit f0e8898d83c54e5e4383b70ba54ad340c5ae13b6) --- Modified: src/core/parser/parse_ppi_pai.c --- Diff: https://github.com/kamailio/kamailio/commit/9427586f3af4dacfa2b3293ea6c5813… Patch: https://github.com/kamailio/kamailio/commit/9427586f3af4dacfa2b3293ea6c5813… --- diff --git a/src/core/parser/parse_ppi_pai.c b/src/core/parser/parse_ppi_pai.c index 4e4ebe392b..c60e33a9fd 100644 --- a/src/core/parser/parse_ppi_pai.c +++ b/src/core/parser/parse_ppi_pai.c @@ -65,6 +65,26 @@ int parse_pai_ppi_body(char *buf, int len, p_id_body_t **body) while ((*tmp == ',') && (num_uri < NUM_PAI_BODIES)) { tmp++; + while(tmp<buf+len && (*tmp==' ' || *tmp=='\t')) tmp++; + if(tmp>=buf+len) { + LM_ERR("no content after comma when parsing PAI/PPI body %u '%.*s'\n", + num_uri, len, buf); + return -1; + } + if((tmp<buf+len-1 && *tmp=='\n') + || (tmp<buf+len-2 && *tmp=='\r' && *(tmp+1)=='\n')) { + if(*tmp=='\n') { + tmp++; + } else { + tmp += 2; + } + if(*tmp!=' ' && *tmp!='\t') { + LM_ERR("no space after EOL when parsing PAI/PPI body %u '%.*s'\n", + num_uri, len, buf); + return -1; + } + tmp++; + } tmp = parse_addr_spec(tmp, buf+len, &uri_b[num_uri], 1); if (uri_b[num_uri].error == PARSE_ERROR) {

1 0

[kamailio/kamailio] Error when parsing P-Asserted-Identity use $ai variable (#2837)
by MikhailKalashnikov 23 Nov '21

23 Nov '21

### Description According to RFC 3261 part `7.3.1 Header Field Format` header fields values can be extended over multiple lines separated with tab (`\r\n\t`). It seems that for many headers Kamailio support this format, but for `P-Asserted-Identity` if I try to use variable `$ai` I get error and null value ``` ERROR: |1232432423|<core> [core/parser/parse_addr_spec.c:662]: parse_addr_spec(): unexpected char [] in status 0: [] . ERROR: |1232432423|<core> [core/parser/parse_ppi_pai.c:71]: parse_pai_ppi_body(): Error parsing PAI/PPI body 1 '<sip:+70000000000@test.com>, <tel:+79211119987>' ``` I attach example of pcap. [pai.zip](https://github.com/kamailio/kamailio/files/7071411/pai.zip) And below quotes from RFC 3261 ``` Header fields can be extended over multiple lines by preceding each extra line with at least one SP or horizontal tab (HT) .... Route: <sip:alice@atlanta.com>, <sip:bob@biloxi.com>, <sip:carol@chicago.com> ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.0 (x86_64/linux) 6c4fce flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 6c4fce compiled on 17:15:32 Jul 29 2020 with gcc 4.8.5 ``` * **Operating System**: ``` CentOS Linux release 7.8.2003 ``` -- 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/2837

2 5

[kamailio/kamailio] tls: update DH initialization for OpenSSL 1.1.x (PR #2945)
by space88man 23 Nov '21

23 Nov '21

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 7

git:master:744bc8f9: tls: update DH initialization for OpenSSL 1.1.x
by Daniel-Constantin Mierla 23 Nov '21

23 Nov '21

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

1 0

git:master:13bd752c: core: print udp sock fd in debug messages of probe_max_receive_buffer()
by Daniel-Constantin Mierla 23 Nov '21

23 Nov '21

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;

1 0

git:master:f068a9ad: core: clarification for -b cli parameter
by Daniel-Constantin Mierla 23 Nov '21

23 Nov '21

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\

1 0

[kamailio/kamailio] nats: move nats connection handling into a struct in order to extend features (PR #2934)
by Emmanuel Schmidbauer 23 Nov '21

23 Nov '21

- [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 4

git:master:ff852c46: nats: move nats connection handling into a struct in order to extend features
by Emmanuel Schmidbauer 23 Nov '21

23 Nov '21

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…

1 0

git:master:210da840: Merge pull request #2934 from kamailio/nats-connection-ptr
by GitHub 23 Nov '21

23 Nov '21

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…

1 0

[kamailio/kamailio] SQLOPS Module (Issue #2950)
by iliesh 23 Nov '21

23 Nov '21

### 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 3

[kamailio/kamailio] misc: update ims pcscf register example (PR #2947)
by alexyosifov 22 Nov '21

22 Nov '21

- 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 2

git:master:a84392d4: misc: update ims pcscf register example
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

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; } }

1 0

[kamailio/kamailio] tls: fix wrong macro used to detect OpenSSL 1.1.0+ (PR #2944)
by space88man 22 Nov '21

22 Nov '21

#### 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 In commit 6c8861353e504a2bc1b661e5685fc5c12ba48f52 we attempt to detect OpenSSL 1.1.0+ to fix initialization of EC. The wrong macro `OPENSSL_VERSION_1_1` was used; this is not actually defined in the OpenSSL headers. Use the correct macro `OPENSSL_VERSION_NUMBER`. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2944 -- Commit Summary -- * tls: fix wrong macro used to detect OpenSSL 1.1.0+ -- File Changes -- M src/modules/tls/tls_domain.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2944.patch https://github.com/kamailio/kamailio/pull/2944.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/2944

2 2

git:master:1285d8a2: tls: fix wrong macro used to detect OpenSSL 1.1.0+
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: master Commit: 1285d8a291a1b746a33d643004153203bc06b6cb URL: https://github.com/kamailio/kamailio/commit/1285d8a291a1b746a33d64300415320… Author: SPChan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T19:22:23+01:00 tls: fix wrong macro used to detect OpenSSL 1.1.0+ --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/1285d8a291a1b746a33d64300415320… Patch: https://github.com/kamailio/kamailio/commit/1285d8a291a1b746a33d64300415320… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index b5160ec833..5f939df1d4 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -62,7 +62,7 @@ extern EVP_PKEY * tls_engine_private_key(const char* key_id); * prime256v1 by default. This is Apache mod_ssl's initialization * policy, so we should be safe. OpenSSL 1.1 has it enabled by default. */ -#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) +#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER < 0x10100000L static void setup_ecdh(SSL_CTX *ctx) { #if !defined(SSL_CTX_set_ecdh_auto) @@ -701,7 +701,7 @@ static int set_cipher_list(tls_domain_t* d) tls_domain_str(d), cipher_list); return -1; } -#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) +#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER < 0x10100000L setup_ecdh(d->ctx[i]); #endif #ifndef OPENSSL_NO_DH

1 0

git:master:112f38a4: pv: added {val.ne} transformation
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: master Commit: 112f38a4787c4ea5a3b3df3ebc8619f08a05e790 URL: https://github.com/kamailio/kamailio/commit/112f38a4787c4ea5a3b3df3ebc8619f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T18:54:02+01:00 pv: added {val.ne} transformation - return empty string if the variable value is $null --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/112f38a4787c4ea5a3b3df3ebc8619f… Patch: https://github.com/kamailio/kamailio/commit/112f38a4787c4ea5a3b3df3ebc8619f… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 4848936d62..e221cb300e 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2551,6 +2551,16 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, val->flags = PV_TYPE_INT|PV_VAL_INT|PV_VAL_STR; } break; + case TR_VAL_NE: + if(val->flags&PV_VAL_NULL) { + val->ri = 0; + tr_set_crt_buffer(); + val->rs.s = _tr_buffer; + val->rs.s[0] = '\0'; + val->rs.len = 0; + val->flags = PV_VAL_STR; + } + break; case TR_VAL_JSON: if(val->flags&PV_VAL_NULL) { val->ri = 0; @@ -3831,6 +3841,9 @@ char* tr_parse_val(str* in, trans_t *t) if(name.len==2 && strncasecmp(name.s, "n0", 2)==0) { t->subtype = TR_VAL_N0; goto done; + } else if(name.len==2 && strncasecmp(name.s, "ne", 2)==0) { + t->subtype = TR_VAL_NE; + goto done; } else if(name.len==4 && strncasecmp(name.s, "json", 4)==0) { t->subtype = TR_VAL_JSON; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index ebae2720f9..329f09a8a2 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -73,7 +73,7 @@ enum _tr_urialias_subtype { }; enum _tr_val_subtype { - TR_VAL_NONE=0, TR_VAL_N0, TR_VAL_JSON + TR_VAL_NONE=0, TR_VAL_N0, TR_VAL_NE, TR_VAL_JSON };

1 0

[kamailio/kamailio] presence: return 200 instead of 202 (PR #2930)
by Laurențiu Nicola 22 Nov '21

22 Nov '21

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description RFC 6665 [says](https://datatracker.ietf.org/doc/html/rfc6665#section-8.3.1): > Implementations conformant with the current specification MUST treat an incoming 202 response as identical to a 200 response and MUST NOT generate 202 response codes to SUBSCRIBE or NOTIFY requests. I'm not sure if Kamailio is supposed to conform to the older RFC, so this change might not be _acceptable_. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2930 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2930/commits/04d51f7c489bce19fdf5…">presence: return 200 instead of 202</a> -- File Changes -- M src/modules/presence/subscribe.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2930.patch https://github.com/kamailio/kamailio/pull/2930.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/2930

4 21

[kamailio/kamailio] RFE app_python3: future EL8 packages switch to Python 3.9 (Issue #2938)
by space88man 22 Nov '21

22 Nov '21

### Description RHEL8 and rebuilders (Oracle Linux, AlmaLinux, Rocky Linux et al) now include Python 3.9 in base system. This RFE is for ≥ 5.6.x: can we switch the `app_python3` package to use the Python 3.9 packages - no external repos will be required for switch. This will allow newer Python 3.9 features in the routing script and keep up to date with improvements in the Python language. Further more Python 3.6 is EoL on 23 Dec 2021. I don't propose this for 5.5.x as it may be too intrusive but perhaps the switch could be made on master in anticipation for 5.6.x.  ### Expected behavior `app_python3` module will now use system Python 3.9 packages instead of Python 3.6 packages #### Actual observed behavior `app_python3` module in 5.5.x now uses system Python 3.6. -- 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/2938

2 3

[kamailio/kamailio] Expose the domain in certificate validation errors (#2873)
by Todd 22 Nov '21

22 Nov '21

We ran into an issue recently with certificate validation and this modification to the source code helped us quickly identify the root cause. Previously we had no way of seeing which domain was invalid. I didn't like using malloc here but hopefully freeing it in the same context ensures no memory leak as well avoid any memory corruption... with the memcpy and '\0'... hope this helps...   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2873 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2873/commits/b7673a8423ed17b78f81…">Expose the domain in certificate validation errors</a> -- File Changes -- M src/modules/tls/tls_util.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2873.patch https://github.com/kamailio/kamailio/pull/2873.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/2873

2 5

git:5.5:471dea49: acc: set again the type of db vals
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: 5.5 Commit: 471dea4941f044e4a1489bf6f1dbb7297341a3fb URL: https://github.com/kamailio/kamailio/commit/471dea4941f044e4a1489bf6f1dbb72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T09:12:23+01:00 acc: set again the type of db vals - work properly when nullable modparam is set and var can be null on some transactions (cherry picked from commit 908ca872bec956d5f755a1b51df781bf66ad3866) --- Modified: src/modules/acc/acc.c --- Diff: https://github.com/kamailio/kamailio/commit/471dea4941f044e4a1489bf6f1dbb72… Patch: https://github.com/kamailio/kamailio/commit/471dea4941f044e4a1489bf6f1dbb72… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index b95275853d..196aba5c7e 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -464,6 +464,9 @@ int acc_db_request( struct sip_msg *rq) LM_DBG("attr[%d] is NULL\n", i); VAL_NULL(db_vals + i) = 1; } else { + LM_DBG("attr[%d] is STR len=%d\n", i, val_arr[i].len); + VAL_NULL(db_vals+i) = 0; + VAL_TYPE(db_vals+i)=DB1_STR; VAL_STR(db_vals+i) = val_arr[i]; } } @@ -499,6 +502,8 @@ int acc_db_request( struct sip_msg *rq) if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) { VAL_NULL(db_vals + i) = 1; } else { + VAL_NULL(db_vals+i) = 0; + VAL_TYPE(db_vals+i)=DB1_STR; VAL_STR(db_vals+i)=val_arr[i]; } }

1 0

git:5.5:5e771acc: acc: debug messages to print the type of extra acc attrs
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: 5.5 Commit: 5e771acc3e4c3e8f3480cb971a5493d5c667cf5e URL: https://github.com/kamailio/kamailio/commit/5e771acc3e4c3e8f3480cb971a5493d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T09:09:38+01:00 acc: debug messages to print the type of extra acc attrs (cherry picked from commit 4bd77f1dae2eeacbe7384ac2838c691f76e077f1) --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/5e771acc3e4c3e8f3480cb971a5493d… Patch: https://github.com/kamailio/kamailio/commit/5e771acc3e4c3e8f3480cb971a5493d… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index 81e27eb2c5..b95275853d 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -461,6 +461,7 @@ int acc_db_request( struct sip_msg *rq) for( i++ ; i<m; i++) { if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) { + LM_DBG("attr[%d] is NULL\n", i); VAL_NULL(db_vals + i) = 1; } else { VAL_STR(db_vals+i) = val_arr[i]; diff --git a/src/modules/acc/acc_extra.c b/src/modules/acc/acc_extra.c index 5e8568535e..ac84d3f894 100644 --- a/src/modules/acc/acc_extra.c +++ b/src/modules/acc/acc_extra.c @@ -258,6 +258,7 @@ int extra2strar(struct acc_extra *extra, struct sip_msg *rq, str *val_arr, type_arr[n] = TYPE_STR; } } + LM_DBG("type of the extra attr[%d] set to: %d\n", n, type_arr[n]); n++; extra = extra->next;

1 0

git:5.5:706b1ceb: core: io wait - remove log level string from debug message
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: 5.5 Commit: 706b1ceb9cb5139c4464873c8df6d99c541dda7b URL: https://github.com/kamailio/kamailio/commit/706b1ceb9cb5139c4464873c8df6d99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T09:09:58+01:00 core: io wait - remove log level string from debug message (cherry picked from commit 4608914cf9d3878c79560730ddad8e0800c38397) --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/706b1ceb9cb5139c4464873c8df6d99… Patch: https://github.com/kamailio/kamailio/commit/706b1ceb9cb5139c4464873c8df6d99… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index d9791c3c85..5e823fb76f 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -371,7 +371,7 @@ inline static int io_watch_add( io_wait_h* h, LM_CRIT("maximum fd number exceeded: %d/%d\n", h->fd_no, h->max_fd_no); goto error; } - DBG("DBG: io_watch_add(%p, %d, %d, %p), fd_no=%d\n", + DBG("processing io_watch_add(%p, %d, %d, %p) - fd_no=%d\n", h, fd, type, data, h->fd_no); /* hash sanity check */ e=get_fd_map(h, fd);

1 0

git:master:e2cc98eb: tls: try to print sni on tls error
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: master Commit: e2cc98eb5aca42b82eb18c35adfa2d16ff4a3f60 URL: https://github.com/kamailio/kamailio/commit/e2cc98eb5aca42b82eb18c35adfa2d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T09:01:09+01:00 tls: try to print sni on tls error --- Modified: src/modules/tls/tls_server.c Modified: src/modules/tls/tls_util.h --- Diff: https://github.com/kamailio/kamailio/commit/e2cc98eb5aca42b82eb18c35adfa2d1… Patch: https://github.com/kamailio/kamailio/commit/e2cc98eb5aca42b82eb18c35adfa2d1… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index f75b111168..7004096adf 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -285,7 +285,7 @@ static int tls_complete_init(struct tcp_connection* c) data->state = state; if (unlikely(data->ssl == 0 || data->rwbio == 0)) { - TLS_ERR("Failed to create SSL or BIO structure:"); + TLS_ERR_SSL("Failed to create SSL or BIO structure:", data->ssl); if (data->ssl) SSL_free(data->ssl); if (data->rwbio) @@ -446,7 +446,7 @@ EVP_PKEY * tls_lookup_private_key(SSL_CTX*); int tls_accept(struct tcp_connection *c, int* error) { int ret; - SSL *ssl; + SSL *ssl = NULL; X509* cert; struct tls_extra_data* tls_c; int tls_log; @@ -792,7 +792,7 @@ int tls_h_encode_f(struct tcp_connection *c, snd_flags_t* send_flags) { int n, offs; - SSL* ssl; + SSL* ssl = NULL; struct tls_extra_data* tls_c; static unsigned char wr_buf[TLS_WR_MBUF_SZ]; struct tls_mbuf rd, wr; @@ -929,7 +929,7 @@ int tls_h_encode_f(struct tcp_connection *c, case SSL_ERROR_SSL: /* protocol level error */ ERR("protocol level error\n"); - TLS_ERR(err_src); + TLS_ERR_SSL(err_src, ssl); memset(ip_buf, 0, sizeof(buf)); ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); ERR("source IP: %s\n", ip_buf); @@ -970,7 +970,7 @@ int tls_h_encode_f(struct tcp_connection *c, } goto error; default: - TLS_ERR(err_src); + TLS_ERR_SSL(err_src, ssl); BUG("unexpected SSL error %d\n", ssl_error); goto bug; } @@ -1053,6 +1053,7 @@ int tls_h_read_f(struct tcp_connection* c, rd_conn_flags_t* flags) int x; int tls_dbg; + ssl = NULL; TLS_RD_TRACE("(%p, %p (%d)) start (%s -> %s:%d*)\n", c, flags, *flags, su2a(&c->rcv.src_su, sizeof(c->rcv.src_su)), @@ -1327,7 +1328,7 @@ int tls_h_read_f(struct tcp_connection* c, rd_conn_flags_t* flags) case SSL_ERROR_SSL: /* protocol level error */ ERR("protocol level error\n"); - TLS_ERR(err_src); + TLS_ERR_SSL(err_src, ssl); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); ERR("src addr: %s:%d\n", ip_buf, c->rcv.src_port); @@ -1368,7 +1369,7 @@ int tls_h_read_f(struct tcp_connection* c, rd_conn_flags_t* flags) } goto error; default: - TLS_ERR(err_src); + TLS_ERR_SSL(err_src, ssl); BUG("unexpected SSL error %d\n", ssl_error); goto bug; } diff --git a/src/modules/tls/tls_util.h b/src/modules/tls/tls_util.h index 8ff63dd0f1..86e036cce9 100644 --- a/src/modules/tls/tls_util.h +++ b/src/modules/tls/tls_util.h @@ -26,20 +26,29 @@ #ifndef _TLS_UTIL_H #define _TLS_UTIL_H +#include <openssl/ssl.h> #include <openssl/err.h> #include "../../core/dprint.h" #include "../../core/str.h" #include "tls_domain.h" -static inline int tls_err_ret(char *s, tls_domains_cfg_t **tls_domains_cfg) { +static inline int tls_err_ret(char *s, SSL* ssl, + tls_domains_cfg_t **tls_domains_cfg) +{ long err; int ret = 0; + const char *sn = NULL; + if ((*tls_domains_cfg)->srv_default->ctx && (*tls_domains_cfg)->srv_default->ctx[0]) { + if(ssl) { + sn = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name); + } while((err = ERR_get_error())) { ret = 1; - ERR("%s%s\n", s ? s : "", ERR_error_string(err, 0)); + ERR("%s%s (sni: %s)\n", s ? s : "", ERR_error_string(err, 0), + (sn) ? sn : "unknown"); } } return ret; @@ -47,15 +56,19 @@ static inline int tls_err_ret(char *s, tls_domains_cfg_t **tls_domains_cfg) { #define TLS_ERR_RET(r, s) \ do { \ - (r) = tls_err_ret((s), tls_domains_cfg); \ + (r) = tls_err_ret((s), NULL, tls_domains_cfg); \ } while(0) #define TLS_ERR(s) \ do { \ - tls_err_ret((s), tls_domains_cfg); \ + tls_err_ret((s), NULL, tls_domains_cfg); \ } while(0) +#define TLS_ERR_SSL(s, ssl) \ +do { \ + tls_err_ret((s), (ssl), tls_domains_cfg); \ +} while(0) /* * Make a shared memory copy of ASCII zero terminated string

1 0

[kamailio/kamailio] tls module causes too many small fragments when tls connection time out (Issue #2943)
by JiangHai2011 22 Nov '21

22 Nov '21

### Description I made sipp 3000 calls test with tls connection in both caller side and callee side. After 3000calls are all established, the sipp will stay for 1min and then shut down all the network interfaces(iptables -I INPUT -j DROP) to let all tls connections timeout. And then repeat this test over and over again . But after some rounds of this kind of test, the calls can not reach 3000, only 2900calls will meet "out of mem" issue. The log is :+1: fm_malloc(): fm_malloc(0x7fd314a68000, 256760) called from core: tcp_main.c: tcpconn_new(1886), module: core; Free fragment not found! Our reliminary analysis: 1. this is not memory leak issue, 2. tls module malloc too many small fragments, which causes shared memory pool's utility reduced (we can see core.shmmem show us the free >= 200MB and fragments >=600000. But there is no consecutive free frags for a new tls connections) ### Reproduction Settings: /opt/kamailio/sbin/kamailio -m 2048 -M 64 ----------------------cfg------------------------- enable_tls=yes tls_port_no=SIP_LISTEN_PORT_V6 tls_max_connections=102400 tcp_connection_lifetime=3605 tcp_max_connections=102400 dns_cache_min_ttl=1800 open_files_limit=102400 tcp_no_connect=no tcp_conn_wq_max=10240000 tcp_async=no tcp_rd_buf_size=256000 ----------------------------------------- Topology: sipp caller ------tls--------kamailio-----tls-------sipp callee (3000calls = 6000 tls connections) sipp and kamailio are running in the same PC Step1: start sipp 3000 call test Step2: after 3000 calls are all established, execute "iptables -I INPUT -j DROP" Step3: wait for all connections are timeout Step4: go to Step1: restart sipp scripts ### Expected Behavior 3000 calls test will always be successful #### Log Messages ------------------------------this is the log of "after 2900 calls"---------------------------- Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [mem/f_malloc.c:416]: fm_search_defrag(): fm_search_defrag(0x7fd314a68000, 256760); Free fragment not found! Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [mem/f_malloc.c:499]: fm_malloc(): fm_malloc(0x7fd314a68000, 256760) called from core: tcp_main.c: tcpconn_new(1886), module: core; Free fragment not found! Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [tcp_main.c:1888]: tcpconn_new(): mem. allocation failure -----------------------------this is corex.shm_summary of "after 2900 calls"------------------------------ corex [corex_rpc.c:176]: corex_rpc_shm_summary(): printing shared memory summary report fm_status: summarizing all alloc'ed. fragments: fm_status: count= 2928 size= 113296 bytes from tls: tls_ct_q.h: tls_ct_q_add(58) fm_status: count= 5857 size=1504098328 bytes from core: tcp_main.c: tcpconn_new(1886) fm_status: count= 1 size= 8192 bytes from core: counters.c: counters_prefork_init(207) fm_status: count= 22 size= 688 bytes from core: cfg_parser.c: cfg_parse_str(906) fm_status: count= 8 size= 1024 bytes from tls: tls_domain.c: fix_domain(1004) fm_status: count= 5856 size= 307200 bytes from tls: tls_server.c: tls_complete_init(228) fm_status: count= 1 size= 3072 bytes from sl: sl_stats.c: init_sl_stats_child(125) fm_status: count= 1 size= 768 bytes from kex: pkg_stats.c: pkg_proc_stats_init(79) fm_status: count= 5 size= 152 bytes from core: cfg/cfg_struct.c: cfg_clone_str(130) fm_status: count= 1 size= 712 bytes from core: cfg/cfg_struct.c: cfg_shmize(217) fm_status: count= 1 size= 2240 bytes from core: pt.c: init_pt(104) fm_status: count= 1 size= 8 bytes from core: pt.c: init_pt(110) fm_status: count= 1 size= 8 bytes from core: pt.c: init_pt(105) fm_status: count= 3 size= 120 bytes from gs: gs_mod.c: _append_to_blacklist_unsafe(692) fm_status: count= 3 size= 48 bytes from gs: gs_mod.c: _append_to_blacklist_unsafe(684) fm_status: count= 1008 size= 40320 bytes from gs: gs_mod.c: _append_to_backend_server_list_unsafe(472) fm_status: count= 1008 size= 16128 bytes from gs: gs_mod.c: _append_to_backend_server_list_unsafe(465) fm_status: count= 1011 size= 32352 bytes from gs: gs_mod.c: _update_one_slot_in_gs_hash_table_by_domain_dir(892) fm_status: count= 1011 size= 48528 bytes from gs: gs_mod.c: _update_one_slot_in_gs_hash_table_by_domain_dir(883) fm_status: count= 65536 size= 3670016 bytes from gs: gs_mod.c: mod_init(267) fm_status: count= 1 size= 1048576 bytes from gs: gs_mod.c: mod_init(260) fm_status: count= 1 size= 24 bytes from outbound: ob_mod.c: mod_init(104) fm_status: count= 1 size= 24 bytes from utils: conf.c: conf_init(549) fm_status: count= 1 size= 8 bytes from utils: utils.c: init_shmlock(160) fm_status: count= 8 size= 1536 bytes from tls: tls_domain.c: tls_new_domain(160) fm_status: count= 2 size= 96 bytes from tls: tls_domain.c: tls_new_cfg(1317) fm_status: count= 1 size= 8 bytes from tls: tls_ct_wrq.c: tls_ct_wq_init(49) fm_status: count= 1 size= 8 bytes from tls: tls_mod.c: mod_init(406) fm_status: count= 1 size= 8 bytes from tls: tls_mod.c: mod_init(390) fm_status: count= 1 size= 8 bytes from sl: sl_funcs.c: sl_startup(83) fm_status: count= 1 size= 8 bytes from sl: sl_stats.c: init_sl_stats(110) fm_status: count= 2 size= 64 bytes from core: cfg/cfg_ctx.c: cfg_register_ctx(47) fm_status: count= 63282 size= 2975704 bytes from tls: tls_init.c: ser_realloc(292) fm_status: count= 1 size= 8192 bytes from core: tcp_main.c: init_tcp(5649) fm_status: count= 1 size= 32768 bytes from core: tcp_main.c: init_tcp(5643) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5635) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5628) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5621) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5615) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5603) fm_status: count= 1 size= 8 bytes from core: usr_avp.c: init_avps(90) fm_status: count= 1 size= 8 bytes from core: usr_avp.c: init_avps(89) fm_status: count= 1 size= 16384 bytes from core: dst_blacklist.c: init_dst_blacklist(437) fm_status: count= 1 size= 8 bytes from core: dst_blacklist.c: init_dst_blacklist(430) fm_status: count= 2 size= 96 bytes from core: timer.c: timer_alloc(514) fm_status: count= 1 size= 8 bytes from core: dns_cache.c: init_dns_cache(369) fm_status: count= 1 size= 16384 bytes from core: dns_cache.c: init_dns_cache(361) fm_status: count= 1 size= 16 bytes from core: dns_cache.c: init_dns_cache(354) fm_status: count= 1 size= 8 bytes from core: dns_cache.c: init_dns_cache(345) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(283) fm_status: count= 1 size= 16384 bytes from core: timer.c: init_timer(282) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(281) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(280) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(269) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(237) fm_status: count= 1 size= 278544 bytes from core: timer.c: init_timer(220) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(219) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(206) fm_status: count= 1 size= 64 bytes from core: cfg/cfg_struct.c: cfg_child_cb_new(830) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(361) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(354) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(347) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(335) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(323) fm_status: count=502731 size= 292261096 bytes from tls: tls_init.c: ser_malloc(286) fm_status: count= 1 size= 24 bytes from tls: ../../lock_alloc.h: lock_set_alloc(70) fm_status: count= 1 size= 8 bytes from core: mem/shm.c: shm_core_lock_init(153) fm_status: ----------------------------- -- 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/2943

2 2

[kamailio/kamailio] too many fragments are generated during tls connection timeout (Issue #2942)
by JiangHai2011 22 Nov '21

22 Nov '21

### Description I made sipp 3000 calls test with tls connection in both caller side and callee side. After 3000calls are all established, the sipp will stay for 1min and then shut down all the network interfaces(iptables -I INPUT -j DROP) to let all tls connections timeout. And then repeat this test over and over again . But after some rounds of this kind of test, the calls can not reach 3000, only 2900calls will meet "out of mem" issue. The log is :+1: fm_malloc(): fm_malloc(0x7fd314a68000, 256760) called from core: tcp_main.c: tcpconn_new(1886), module: core; Free fragment not found! Our reliminary analysis: 1. this is not memory leak issue, 2. tls module malloc too many small fragments, which causes shared memory pool's utility reduced (we can see core.shmmem show us the free >= 200MB and fragments >=600000. But there is no consecutive free frags for a new tls connections) ### Reproduction Settings: /opt/kamailio/sbin/kamailio -m 2048 -M 64 ----------------------cfg------------------------- enable_tls=yes tls_port_no=SIP_LISTEN_PORT_V6 tls_max_connections=102400 # life time of TCP connection when there is no traffic # - a bit higher than registration expires to cope with UA behind NAT tcp_connection_lifetime=3605 tcp_max_connections=102400 dns_cache_min_ttl=1800 open_files_limit=102400 #for IMS, tcp_no_connect should be set to no, there is a fixing on Thu Dec 28 10:38:59 2017 tcp_no_connect=no tcp_conn_wq_max=10240000 tcp_async=no tcp_rd_buf_size=256000 ----------------------------------------- Topology: sipp caller ------tls--------kamailio-----tls-------sipp callee (3000calls = 6000 tls connections) sipp and kamailio are running in the same PC Step1: start sipp 3000 call test Step2: after 3000 calls are all established, execute "iptables -I INPUT -j DROP" Step3: wait for all connections are timeout Step4: go to Step1: restart sipp scripts ### Expected Behavior 3000 calls test will always be successful #### Log Messages ------------------------------this is the log of "after 2900 calls"---------------------------- Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [mem/f_malloc.c:416]: fm_search_defrag(): fm_search_defrag(0x7fd314a68000, 256760); Free fragment not found! Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [mem/f_malloc.c:499]: fm_malloc(): fm_malloc(0x7fd314a68000, 256760) called from core: tcp_main.c: tcpconn_new(1886), module: core; Free fragment not found! Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [tcp_main.c:1888]: tcpconn_new(): mem. allocation failure -----------------------------this is corex.shm_summary of "after 2900 calls"------------------------------ corex [corex_rpc.c:176]: corex_rpc_shm_summary(): printing shared memory summary report fm_status: summarizing all alloc'ed. fragments: fm_status: count= 2928 size= 113296 bytes from tls: tls_ct_q.h: tls_ct_q_add(58) fm_status: count= 5857 size=1504098328 bytes from core: tcp_main.c: tcpconn_new(1886) fm_status: count= 1 size= 8192 bytes from core: counters.c: counters_prefork_init(207) fm_status: count= 22 size= 688 bytes from core: cfg_parser.c: cfg_parse_str(906) fm_status: count= 8 size= 1024 bytes from tls: tls_domain.c: fix_domain(1004) fm_status: count= 5856 size= 307200 bytes from tls: tls_server.c: tls_complete_init(228) fm_status: count= 1 size= 3072 bytes from sl: sl_stats.c: init_sl_stats_child(125) fm_status: count= 1 size= 768 bytes from kex: pkg_stats.c: pkg_proc_stats_init(79) fm_status: count= 5 size= 152 bytes from core: cfg/cfg_struct.c: cfg_clone_str(130) fm_status: count= 1 size= 712 bytes from core: cfg/cfg_struct.c: cfg_shmize(217) fm_status: count= 1 size= 2240 bytes from core: pt.c: init_pt(104) fm_status: count= 1 size= 8 bytes from core: pt.c: init_pt(110) fm_status: count= 1 size= 8 bytes from core: pt.c: init_pt(105) fm_status: count= 3 size= 120 bytes from gs: gs_mod.c: _append_to_blacklist_unsafe(692) fm_status: count= 3 size= 48 bytes from gs: gs_mod.c: _append_to_blacklist_unsafe(684) fm_status: count= 1008 size= 40320 bytes from gs: gs_mod.c: _append_to_backend_server_list_unsafe(472) fm_status: count= 1008 size= 16128 bytes from gs: gs_mod.c: _append_to_backend_server_list_unsafe(465) fm_status: count= 1011 size= 32352 bytes from gs: gs_mod.c: _update_one_slot_in_gs_hash_table_by_domain_dir(892) fm_status: count= 1011 size= 48528 bytes from gs: gs_mod.c: _update_one_slot_in_gs_hash_table_by_domain_dir(883) fm_status: count= 65536 size= 3670016 bytes from gs: gs_mod.c: mod_init(267) fm_status: count= 1 size= 1048576 bytes from gs: gs_mod.c: mod_init(260) fm_status: count= 1 size= 24 bytes from outbound: ob_mod.c: mod_init(104) fm_status: count= 1 size= 24 bytes from utils: conf.c: conf_init(549) fm_status: count= 1 size= 8 bytes from utils: utils.c: init_shmlock(160) fm_status: count= 8 size= 1536 bytes from tls: tls_domain.c: tls_new_domain(160) fm_status: count= 2 size= 96 bytes from tls: tls_domain.c: tls_new_cfg(1317) fm_status: count= 1 size= 8 bytes from tls: tls_ct_wrq.c: tls_ct_wq_init(49) fm_status: count= 1 size= 8 bytes from tls: tls_mod.c: mod_init(406) fm_status: count= 1 size= 8 bytes from tls: tls_mod.c: mod_init(390) fm_status: count= 1 size= 8 bytes from sl: sl_funcs.c: sl_startup(83) fm_status: count= 1 size= 8 bytes from sl: sl_stats.c: init_sl_stats(110) fm_status: count= 2 size= 64 bytes from core: cfg/cfg_ctx.c: cfg_register_ctx(47) fm_status: count= 63282 size= 2975704 bytes from tls: tls_init.c: ser_realloc(292) fm_status: count= 1 size= 8192 bytes from core: tcp_main.c: init_tcp(5649) fm_status: count= 1 size= 32768 bytes from core: tcp_main.c: init_tcp(5643) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5635) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5628) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5621) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5615) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5603) fm_status: count= 1 size= 8 bytes from core: usr_avp.c: init_avps(90) fm_status: count= 1 size= 8 bytes from core: usr_avp.c: init_avps(89) fm_status: count= 1 size= 16384 bytes from core: dst_blacklist.c: init_dst_blacklist(437) fm_status: count= 1 size= 8 bytes from core: dst_blacklist.c: init_dst_blacklist(430) fm_status: count= 2 size= 96 bytes from core: timer.c: timer_alloc(514) fm_status: count= 1 size= 8 bytes from core: dns_cache.c: init_dns_cache(369) fm_status: count= 1 size= 16384 bytes from core: dns_cache.c: init_dns_cache(361) fm_status: count= 1 size= 16 bytes from core: dns_cache.c: init_dns_cache(354) fm_status: count= 1 size= 8 bytes from core: dns_cache.c: init_dns_cache(345) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(283) fm_status: count= 1 size= 16384 bytes from core: timer.c: init_timer(282) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(281) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(280) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(269) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(237) fm_status: count= 1 size= 278544 bytes from core: timer.c: init_timer(220) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(219) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(206) fm_status: count= 1 size= 64 bytes from core: cfg/cfg_struct.c: cfg_child_cb_new(830) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(361) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(354) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(347) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(335) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(323) fm_status: count=502731 size= 292261096 bytes from tls: tls_init.c: ser_malloc(286) fm_status: count= 1 size= 24 bytes from tls: ../../lock_alloc.h: lock_set_alloc(70) fm_status: count= 1 size= 8 bytes from core: mem/shm.c: shm_core_lock_init(153) fm_status: ----------------------------- -- 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/2942

1 1

[kamailio/kamailio] core: add a module hook for post-fork cleanup (PR #2919)
by aalba6675 22 Nov '21

22 Nov '21

#### 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 - [X] Related to issue #2285 #### Description This PR provides a hook to all into modules when all `fork_process()` is completed. This is to that the module in the main process can perform post-fork cleanup. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2919 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2919/commits/cfc8f6373d3dd4cdb09f…">core: add a module hook for post-fork cleanup</a> -- File Changes -- M src/core/sr_module.h (1) M src/main.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2919.patch https://github.com/kamailio/kamailio/pull/2919.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/2919

2 10

git:master:d2c22d2b: app_python3: Python >= 3.7 call PyOS_AfterFork_Parent in main context after all forks
by Anthony Alba 22 Nov '21

22 Nov '21

Module: kamailio Branch: master Commit: d2c22d2b72d7ffd616a6aaacbabc6184a8da56e7 URL: https://github.com/kamailio/kamailio/commit/d2c22d2b72d7ffd616a6aaacbabc618… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-11-22T11:46:25+08:00 app_python3: Python >= 3.7 call PyOS_AfterFork_Parent in main context after all forks --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d2c22d2b72d7ffd616a6aaacbabc618… Patch: https://github.com/kamailio/kamailio/commit/d2c22d2b72d7ffd616a6aaacbabc618… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 8ec252039c..f710694d75 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -104,7 +104,13 @@ static int mod_init(void) char *dname_src, *bname_src; int i; - if(apy_sr_init_mod()<0) { + /* + * register the need to be called post-fork of all children + * with the special rank PROC_POSTCHILDINIT + */ + ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); + + if (apy_sr_init_mod()<0) { LM_ERR("failed to init the sr mod\n"); return -1; } @@ -185,6 +191,16 @@ static int child_init(int rank) */ #if PY_VERSION_HEX >= 0x03070000 PyOS_BeforeFork() ; +#endif + return 0; + } + if(rank==PROC_POSTCHILDINIT) { + /* + * this is called after forking of all child + * processes + */ +#if PY_VERSION_HEX >= 0x03070000 + PyOS_AfterFork_Parent() ; #endif return 0; }

1 0

[kamailio/kamailio] ims_usrloc_pcscf: fix on saving protocol info into DB (#2879)
by Erhan Onur Sendag 19 Nov '21

19 Nov '21

#### Pre-Submission Checklist    - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] 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 - [*] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Protocol information of pcontact was not written to mysql database You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2879 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2879/commits/c7cf1937bfc9a36e7086…">Fix on saving protocol info for ims_usrloc_pcscf</a> -- File Changes -- M src/modules/ims_usrloc_pcscf/usrloc_db.c (2) M utils/kamctl/mysql/ims_usrloc_pcscf-create.sql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2879.patch https://github.com/kamailio/kamailio/pull/2879.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/2879

4 4

git:master:5e617b5e: modules: readme files regenerated - kazoo ... [skip ci]
by Kamailio Dev 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: 5e617b5e2130ed96f624e027023329433f8814ee URL: https://github.com/kamailio/kamailio/commit/5e617b5e2130ed96f624e0270233294… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-19T12:46:21+01:00 modules: readme files regenerated - kazoo ... [skip ci] --- Modified: src/modules/kazoo/README --- Diff: https://github.com/kamailio/kamailio/commit/5e617b5e2130ed96f624e0270233294… Patch: https://github.com/kamailio/kamailio/commit/5e617b5e2130ed96f624e0270233294… --- diff --git a/src/modules/kazoo/README b/src/modules/kazoo/README index 7497dd20e8..572774ff2c 100644 --- a/src/modules/kazoo/README +++ b/src/modules/kazoo/README @@ -67,10 +67,10 @@ Luis Azedo 5.1. amqp related 5.1.1. kazoo_publish(exchange, routing_key, - json_payload) + json_payload [, amqp_headers]) 5.1.2. kazoo_query(exchange, routing_key, json_payload - [, target_var]) + [, target_var] [, amqp_headers]) 5.1.3. kazoo_subscribe(exchange, exchange_type, queue, routing_key) @@ -175,9 +175,11 @@ Chapter 1. Admin Guide 5.1. amqp related - 5.1.1. kazoo_publish(exchange, routing_key, json_payload) + 5.1.1. kazoo_publish(exchange, routing_key, json_payload [, + amqp_headers]) + 5.1.2. kazoo_query(exchange, routing_key, json_payload [, - target_var]) + target_var] [, amqp_headers]) 5.1.3. kazoo_subscribe(exchange, exchange_type, queue, routing_key) @@ -623,9 +625,11 @@ modparam("kazoo", "pua_mode", 0) 5.1. amqp related - 5.1.1. kazoo_publish(exchange, routing_key, json_payload) + 5.1.1. kazoo_publish(exchange, routing_key, json_payload [, + amqp_headers]) + 5.1.2. kazoo_query(exchange, routing_key, json_payload [, - target_var]) + target_var] [, amqp_headers]) 5.1.3. kazoo_subscribe(exchange, exchange_type, queue, routing_key) @@ -643,10 +647,11 @@ modparam("kazoo", "pua_mode", 0) 5.1. amqp related -5.1.1. kazoo_publish(exchange, routing_key, json_payload) +5.1.1. kazoo_publish(exchange, routing_key, json_payload [, amqp_headers]) The function publishes a json payload to rabbitmq. The routing_key - parameter should be encoded. + parameter should be encoded. Optional AMQP-Headers are specified in the + format key1=value1;key2=value2 This function can be used from ANY ROUTE. @@ -661,12 +666,14 @@ $var(amqp_routing_key) = "registration.success." + $(fd{kz.encode}) + "." + $fU; kazoo_publish("callmgr", $var(amqp_routing_key), $var(amqp_payload_request)); ... -5.1.2. kazoo_query(exchange, routing_key, json_payload [, target_var]) +5.1.2. kazoo_query(exchange, routing_key, json_payload [, target_var] [, +amqp_headers]) The function publishes a json payload to rabbitmq, waits for a correlated messageand puts the result in target_var. The routing_key parameter should be encoded. target_var is optional as the function - also puts the result in pseudo-variable $kzR. + also puts the result in pseudo-variable $kzR. Optional AMQP-Headers are + specified in the format key1=value1;key2=value2 This function can be used from ANY ROUTE.

1 0

[kamailio/kamailio] Allow setting AMQP-Headers when publishing messages (Issue #2895)
by mihovilkolaric 19 Nov '21

19 Nov '21

### Description I am using kazoo-module for connecting Kamailio to RabbitMQ and publishing messages to several consumers. Now I´d like to extend my setup to a more sophisticated routing based on a consistent hash-exchange (https://github.com/rabbitmq/rabbitmq-consistent-hash-exchange), while retaining also existing topology based on routing keys. This can be achieved by using ["Routing on a Header" (hash-header)](https://github.com/rabbitmq/rabbitmq-consistent-hash-exchange…). However, [kazoo_publish](https://kamailio.org/docs/modules/5.0.x/modules/kazoo.html#i… does not allow setting such header. ### Expected behavior Please extend publish-functions of the kazoo-module with the possibility to (optionally) supply AMQP-headers. -- 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/2895

3 4

[kamailio/kamailio] kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish (PR #2925)
by mihovilkolaric 19 Nov '21

19 Nov '21

- implements GH #2895   #### 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 - [x] Related to issue #2895 #### Description Allows adding additional AMQP-headers in the format header1=value1;header2=value2;... Remark: I decided to re-use the definition `{"kazoo_publish", (cmd_function) kz_amqp_publish_ex, 4, fixup_kz_amqp, fixup_kz_amqp_free, ANY_ROUTE},` resp. to modify the existing method signature `int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* _pub_flags)` to `int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* _pub_flags)` as the param _pub_flags is neither described in the docs, nor it was evaluated/used, and thus was useless anyhow. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2925 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2925/commits/0aee8fc2c486f19a20c9…">kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish</a> -- File Changes -- M src/modules/kazoo/doc/kazoo_admin.xml (8) M src/modules/kazoo/kazoo.c (1) M src/modules/kazoo/kz_amqp.c (117) M src/modules/kazoo/kz_amqp.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2925.patch https://github.com/kamailio/kamailio/pull/2925.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/2925

3 4

git:master:dcb8e165: kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish
by Henning Westerholt 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: dcb8e1650204c9453457871515ab5c7ec2d497f1 URL: https://github.com/kamailio/kamailio/commit/dcb8e1650204c9453457871515ab5c7… Author: mihovilkolaric <mihovilkolaric(a)github.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-11-19T12:43:16+01:00 kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish - implements GH #2895 --- Modified: src/modules/kazoo/doc/kazoo_admin.xml Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/dcb8e1650204c9453457871515ab5c7… Patch: https://github.com/kamailio/kamailio/commit/dcb8e1650204c9453457871515ab5c7…

1 0

[kamailio/kamailio] Possible deadlock bug in the method acquire_spi and release_spi? (Issue #2939)
by ryancaicse 19 Nov '21

19 Nov '21

In the method `acquire_spi`, the condition of acquiring and releasing is not aligned. It seems the lock would be acquired but released only when `spi_data->spi_val == initial_val`, Would it lead to missing lock release? https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… In the method `release_spi`, the lock may be re-acquired so missing lock release in the method `acquire_spi` could lead to a deadlock. https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… -- 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/2939

3 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev