sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
491 discussions

git:master:1d7d78c3: ipops: proper handling of return code for ip to buf conversion
by Daniel-Constantin Mierla 29 Mar '21

29 Mar '21

Module: kamailio Branch: master Commit: 1d7d78c31eeab717c7013a00650d3cb07895bac8 URL: https://github.com/kamailio/kamailio/commit/1d7d78c31eeab717c7013a00650d3cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-29T09:56:36+02:00 ipops: proper handling of return code for ip to buf conversion - reported in GH #2695 --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1d7d78c31eeab717c7013a00650d3cb… Patch: https://github.com/kamailio/kamailio/commit/1d7d78c31eeab717c7013a00650d3cb… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index cb7422b988..273f232fa7 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1105,15 +1105,15 @@ static inline ip_addr_t *strtoipX(str *ips) { /* IPv6 */ if(str2ip6buf(ips, &ipb) < 0) { - return &ipb; + return NULL; } } else { /* IPv4 */ if (str2ipbuf(ips, &ipb)<0) { - return &ipb; + return NULL; } } - return NULL; + return &ipb; } static int ki_dns_sys_match_ip(sip_msg_t *msg, str *vhn, str *vip)

1 0

mohqueue warning git master
by Henning Westerholt 28 Mar '21

28 Mar '21

With gcc 9.3: CC (gcc) [M mohqueue.so] mohq_funcs.o mohq_funcs.c: In function 'send_rtp_answer': mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ | { mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

git:master:c331e6dd: pv: use unsigned for safer non-ascii bit shifting for hexa
by Daniel-Constantin Mierla 28 Mar '21

28 Mar '21

Module: kamailio Branch: master Commit: c331e6dddb238abe5fc832ce3d3934fbe56ad2f7 URL: https://github.com/kamailio/kamailio/commit/c331e6dddb238abe5fc832ce3d3934f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-28T11:11:08+02:00 pv: use unsigned for safer non-ascii bit shifting for hexa - related to GH #2690 --- Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/c331e6dddb238abe5fc832ce3d3934f… Patch: https://github.com/kamailio/kamailio/commit/c331e6dddb238abe5fc832ce3d3934f… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 5137048e10..103f9dd5ec 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -615,20 +615,22 @@ int pv_get_flag(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, (msg->flags & (1<<param->pvn.u.isname.name.n)) ? 1 : 0); } -static inline char* int_to_8hex(int val) +static inline char* int_to_8hex(int sval) { unsigned short digit; int i; static char outbuf[9]; + unsigned int uval; + uval = (unsigned int)sval; outbuf[8] = '\0'; for(i=0; i<8; i++) { - if(val!=0) + if(uval!=0) { - digit = val & 0x0f; + digit = uval & 0x0f; outbuf[7-i] = digit >= 10 ? digit + 'a' - 10 : digit + '0'; - val >>= 4; + uval >>= 4; } else outbuf[7-i] = '0'; diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index cbee7d6caa..e8d287bfe0 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -118,7 +118,7 @@ static int pdu_7bit_encode(str sin) { nleft = 1; j = 0; for(i = 0; i < sin.len; i++) { - hex = *(sin.s) >> (nleft - 1); + hex = (unsigned char)(*(sin.s)) >> (nleft - 1); fill = *(sin.s+1) << (8-nleft); hex = hex | fill; _tr_buffer[j++] = HexTbl[hex >> 4]; @@ -292,7 +292,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, j = 0; for(i=0; i<val->rs.len; i++) { - _tr_buffer[j++] = fourbits2char[val->rs.s[i] >> 4]; + _tr_buffer[j++] = fourbits2char[(unsigned char)val->rs.s[i] >> 4]; _tr_buffer[j++] = fourbits2char[val->rs.s[i] & 0xf]; } _tr_buffer[j] = '\0';

1 0

git:master:9efe1e0c: core: use unsigned for safer non-ascii bit shifting for hexa
by Daniel-Constantin Mierla 28 Mar '21

28 Mar '21

Module: kamailio Branch: master Commit: 9efe1e0c32ae43d67240d6a97306e3cff61c3c55 URL: https://github.com/kamailio/kamailio/commit/9efe1e0c32ae43d67240d6a97306e3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-28T11:11:08+02:00 core: use unsigned for safer non-ascii bit shifting for hexa --- Modified: src/core/basex.c Modified: src/core/strutils.c --- Diff: https://github.com/kamailio/kamailio/commit/9efe1e0c32ae43d67240d6a97306e3c… Patch: https://github.com/kamailio/kamailio/commit/9efe1e0c32ae43d67240d6a97306e3c… --- diff --git a/src/core/basex.c b/src/core/basex.c index 45abcac028..38fb08d91e 100644 --- a/src/core/basex.c +++ b/src/core/basex.c @@ -434,7 +434,7 @@ int base64url_enc(char *in, int ilen, char *out, int osize) int i; int r; char *p; - int block; + unsigned int block; int olen; olen = (((ilen+2)/3)<<2); @@ -465,7 +465,7 @@ int base64url_enc(char *in, int ilen, char *out, int osize) int base64url_dec(char *in, int ilen, char *out, int osize) { int n; - int block; + unsigned int block; int idx; int i; int j; @@ -493,7 +493,7 @@ int base64url_dec(char *in, int ilen, char *out, int osize) for(i=0, idx=0; i<end; idx+=3) { block = 0; for(j=0; j<4 && i<end ; j++) { - c = _ksr_b64url_decmap[(int)in[i++]]; + c = _ksr_b64url_decmap[(unsigned char)in[i++]]; if(c<0) { LM_ERR("invalid input string\"%.*s\"\n", ilen, in); return -1; diff --git a/src/core/strutils.c b/src/core/strutils.c index 75d5b1ec10..ff394e5470 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -270,7 +270,7 @@ int escape_user(str *sin, str *sout) break; default: *at++ = '%'; - x = (*p) >> 4; + x = (unsigned char)(*p) >> 4; if (x < 10) { *at++ = x + '0'; @@ -350,7 +350,7 @@ int escape_param(str *sin, str *sout) default: *at++ = '%'; - x = (*p) >> 4; + x = (unsigned char)(*p) >> 4; if (x < 10) { *at++ = x + '0'; @@ -792,7 +792,8 @@ int urlencode(str *sin, str *sout) if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') *at++ = *p; else - *at++ = '%', *at++ = char_to_hex(*p >> 4), *at++ = char_to_hex(*p & 15); + *at++ = '%', *at++ = char_to_hex((unsigned char)(*p) >> 4), + *at++ = char_to_hex(*p & 15); p++; }

1 0

[kamailio/kamailio] DMQ memory leak with dmq_bcast_message function (#2600)
by jklingenmeyer 26 Mar '21

26 Mar '21

### Description We noticed a PKG memory leak when using DMQ module's function _dmq_bcast_message_ . ### Troubleshooting #### Reproduction Issue can be reproduced with configuration below. * 3 Kamailio nodes each one listening on dedicated port 5070 for DMQ on their private IP address. * A dns name _[KAMAILIO_DNS]_ resolving these 3 nodes: ``` # dig +short A [KAMAILIO_DNS] 10.234.97.169 10.234.97.170 10.234.92.126 ``` DMQ module configured as below (example for node 1) ``` loadmodule "dmq.so" ... modparam("dmq", "server_address", "sip:10.234.97.169:5070") modparam("dmq", "notification_address", "sip:[KAMAILIO_DNS]:5070") modparam("dmq", "ping_interval", 10) modparam("dmq", "multi_notify", 1) ``` Each time an INVITE comes in, we use function below to broadcast custom message to all of the nodes: ``` ... if(is_method("INVITE")) { dmq_bcast_message("invitenotification", "invite received", "text/plain"); } ... ``` This custom message is handled as below: ``` request_route { ... if(is_method("KDMQ")) { if($Rp == 5070) route(DMQHANDLE); else drop; } ... } ... route[DMQHANDLE] { if($tU == "invitenotification") { # Doing some additional stuff here, but not the cause of the leak send_reply("200", "OK"); } else { dmq_handle_message(); } } ``` Using **sipp** to send lots of messages, we can easily notice the free PKG memory decreasing over time (using `kamcmd pkg.stats`) #### Debugging Data Processes impacted by the leak are the ones processing SIP messages. In case of TCP, it is one of the tcp receivers. When doing a dump of such processes with command below: ``` kamcmd cfg.set_now_int core mem_dump_pkg [PID] ``` Results are full of records like these ones: ``` ALERT: qm_status: alloc'd from core: core/parser/parse_from.c: parse_from_header(63) ALERT: qm_status: alloc'd from core: core/parser/parse_addr_spec.c: parse_to_param(285) ``` We are sure that the leak is generated by this DMQ broadcast function: we isolated it and noticed no leaks when removing it from a basic script configuration. We tried different configurations: * disabling multi_notify => memory leak still present * using an IP address instead of the DNS name => memory leak still present Valgrind did not help us to find out more precisely where the issue in the code could be located. ### Possible Solutions Would a _free_ of _msg->from->parsed_ be missing somewhere in DMQ code? Behavior looks very similar to https://github.com/kamailio/kamailio/pull/59 ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.7 (x86_64/linux) c16b3f-dirty flags: , EXTRA_DEBUGUSE_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, TIMER_DEBUG, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ``` * **Operating System**: ``` Debian 9.13 under docker Linux 4.9.0-9-amd64 ``` -- 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/2600

2 4

[kamailio/kamailio] Kamailio 5.2 / ims_registrar_scscf's NOTIFY message on registration (#2692)
by ErhanOnur 26 Mar '21

26 Mar '21

Hi When I register to my IMS core (Kamailio version 5.2), ims_registrar_scscf modul sends notification with XML body showing all contacts with expires "0". I noticed that , in ims_registrar_scscf module, the notify_subscribers function is as shown below: ``` int notify_subscribers(impurecord_t* impurecord, str *explit_dereg_contact, int num_explit_dereg_contact) { event_reg(0, impurecord, IMS_REGISTRAR_CONTACT_UNREGISTERED, 0, 0, explit_dereg_contact, num_explit_dereg_contact); return 0; } ``` IMS_REGISTRAR_CONTACT_UNREGISTERED parameter is hardcoded. I noticed that in upper version of Kamailio this changed like that: ``` int notify_subscribers(impurecord_t* impurecord, ucontact_t* contact, str *explit_dereg_contact, int num_explit_dereg_contact, int event_type) { event_reg(0, impurecord, contact, event_type, 0, 0, 0, explit_dereg_contact, num_explit_dereg_contact); return 0; } ``` Also noticed that in upper version of Kamailio notify_subscribers is only called on de-registration. But in version 5.2 it is called on registration and re-registration also. (This leads strange cases) Could you please advise on this issue? Best regards Erhan ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [stack@ims-test2 ~]$ /usr/local/sbin/kamailio -v version: kamailio 5.2.0 (x86_64/linux) 40c16b ``` * **Operating System**:  ``` [stack@ims-test2 ~]$ uname -a Linux ims-test2.novalocal 3.10.0-1062.1.1.el7.x86_64 #1 SMP Fri Sep 13 22:55:44 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/2692

2 2

git:master:ec3f98b2: modules: readme files regenerated - stirshaken ... [skip ci]
by Kamailio Dev 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: ec3f98b2b9e2a44b57f0b60401d2f037d3068e83 URL: https://github.com/kamailio/kamailio/commit/ec3f98b2b9e2a44b57f0b60401d2f03… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-26T15:01:13+01:00 modules: readme files regenerated - stirshaken ... [skip ci] --- Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/ec3f98b2b9e2a44b57f0b60401d2f03… Patch: https://github.com/kamailio/kamailio/commit/ec3f98b2b9e2a44b57f0b60401d2f03… --- diff --git a/src/modules/stirshaken/README b/src/modules/stirshaken/README index f4ab54e6cb..3b280ff289 100644 --- a/src/modules/stirshaken/README +++ b/src/modules/stirshaken/README @@ -105,10 +105,11 @@ Chapter 1. Admin Guide 1. Overview - The module implements secure SIP identity specifications - STIR (Secure - Telephony Identity Revisited) and SHAKEN (Signature-based Handling of - Asserted information using toKENs) IETF extensions for SIP (RFC8224, - RFC8588). + This module implements STIR (Secure Telephony Identity Revisited) and + SHAKEN (Signature-based Handling of Asserted information using toKENs) + (RFC8224, RFC8588), with X509 certificate path check (ATIS + "Signature-based Handling of Asserted information using toKENs + (SHAKEN)", RFC5280 "6. Certification Path Validation"). stirshaken module exports the functions to check and to generate PASSporT, wrapped into SIP Identity header. For call authentication two @@ -179,7 +180,7 @@ modparam("stirshaken", "as_default_key", "/path/to/key") meaning for calls to stirshaken_check_identity_with_key(key) and stirshaken_check_identity_with_cert(cert). - Default value is 0, (turned off). + Default value is 1, (turned on). Example 1.2. Set vs_verify_x509_cert_path parameter ...

1 0

git:master:3053b87a: stirshaken: Update docs [skip ci]
by Piotr Gregor 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 3053b87a5c023a89be33a0fad924e31f41d4bcda URL: https://github.com/kamailio/kamailio/commit/3053b87a5c023a89be33a0fad924e31… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Piotr Gregor <piotr(a)signalwire.com> Date: 2021-03-26T13:59:48Z stirshaken: Update docs [skip ci] Update docs about X509 cerrtificate path verification turned on by default. Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3053b87a5c023a89be33a0fad924e31… Patch: https://github.com/kamailio/kamailio/commit/3053b87a5c023a89be33a0fad924e31… --- diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml index 9cf8fada82..7514523ff6 100644 --- a/src/modules/stirshaken/doc/stirshaken_admin.xml +++ b/src/modules/stirshaken/doc/stirshaken_admin.xml @@ -16,10 +16,7 @@ <section> <title>Overview</title> <para> - The module implements secure SIP identity specifications - STIR - (Secure Telephony Identity Revisited) and SHAKEN - (Signature-based Handling of Asserted information using toKENs) - IETF extensions for SIP (RFC8224, RFC8588). + This module implements STIR (Secure Telephony Identity Revisited) and SHAKEN (Signature-based Handling of Asserted information using toKENs) (RFC8224, RFC8588), with X509 certificate path check (ATIS "Signature-based Handling of Asserted information using toKENs (SHAKEN)", RFC5280 "6. Certification Path Validation"). </para> <para> stirshaken module exports the functions to check and to generate PASSporT, wrapped into SIP Identity header. @@ -93,7 +90,7 @@ modparam("stirshaken", "as_default_key", "/path/to/key") </para> <para> <emphasis> - Default value is 0, (turned off). + Default value is 1, (turned on). </emphasis> </para> <example>

1 0

git:master:0793fb05: lwsc: do not set timeout fileds lws_context_creation_info
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 0793fb05b61e517a3353c436e8fb928c4730e573 URL: https://github.com/kamailio/kamailio/commit/0793fb05b61e517a3353c436e8fb928… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T14:51:46+01:00 lwsc: do not set timeout fileds lws_context_creation_info - needs to sort out which versions have them --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0793fb05b61e517a3353c436e8fb928… Patch: https://github.com/kamailio/kamailio/commit/0793fb05b61e517a3353c436e8fb928… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index a30179c13b..17eb0ca30a 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -531,11 +531,6 @@ static lwsc_endpoint_t* lwsc_get_endpoint(str *wsurl, str *wsproto) ep->crtinfo.uid = -1; #if LWS_LIBRARY_VERSION_MAJOR >= 3 ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ -#endif -#if LWS_LIBRARY_VERSION_MAJOR >= 4 - /* apparently only in newer versions of libwebsockets */ - ep->crtinfo.timeout_secs = _lwsc_timeout_send; - ep->crtinfo.connect_timeout_secs = _lwsc_timeout_connect; #endif /* 1 internal and 1 (+ 1 http2 nwsi) */ ep->crtinfo.fd_limit_per_thread = 1 + 1 + 1;

1 0

git:master:054febc0: stirshaken: Turn on X509 cert path check as default
by Piotr Gregor 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 054febc016f3fa089c9dc84bcb7581c04213eeed URL: https://github.com/kamailio/kamailio/commit/054febc016f3fa089c9dc84bcb7581c… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Piotr Gregor <piotr(a)signalwire.com> Date: 2021-03-26T13:25:29Z stirshaken: Turn on X509 cert path check as default --- Modified: src/modules/stirshaken/stirshaken_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/054febc016f3fa089c9dc84bcb7581c… Patch: https://github.com/kamailio/kamailio/commit/054febc016f3fa089c9dc84bcb7581c… --- diff --git a/src/modules/stirshaken/stirshaken_mod.c b/src/modules/stirshaken/stirshaken_mod.c index a98cb3a4e3..88ec8812ab 100644 --- a/src/modules/stirshaken/stirshaken_mod.c +++ b/src/modules/stirshaken/stirshaken_mod.c @@ -40,7 +40,7 @@ MODULE_VERSION static str stirshaken_as_default_key = str_init(""); // Verification service -static int stirshaken_vs_verify_x509_cert_path = 0; +static int stirshaken_vs_verify_x509_cert_path = 1; static str stirshaken_vs_ca_dir = str_init(""); static str stirshaken_vs_crl_dir = str_init(""); static int stirshaken_vs_identity_expire_s = 60;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021