sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
310 discussions

git:master:a84392d4: misc: update ims pcscf register example

by Daniel-Constantin Mierla

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

3 years

[kamailio/kamailio] tls: fix wrong macro used to detect OpenSSL 1.1.0+ (PR #2944)

by space88man

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

3 years

git:master:1285d8a2: tls: fix wrong macro used to detect OpenSSL 1.1.0+

by Daniel-Constantin Mierla

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

3 years

git:master:112f38a4: pv: added {val.ne} transformation

by Daniel-Constantin Mierla

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

3 years

[kamailio/kamailio] presence: return 200 instead of 202 (PR #2930)

by Laurențiu Nicola

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

3 years

[kamailio/kamailio] RFE app_python3: future EL8 packages switch to Python 3.9 (Issue #2938)

by space88man

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

3 years

[kamailio/kamailio] Expose the domain in certificate validation errors (#2873)

by Todd

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

3 years

git:5.5:471dea49: acc: set again the type of db vals

by Daniel-Constantin Mierla

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

3 years

git:5.5:706b1ceb: core: io wait - remove log level string from debug message

by Daniel-Constantin Mierla

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

3 years

git:5.5:5e771acc: acc: debug messages to print the type of extra acc attrs

by Daniel-Constantin Mierla

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;

3 years

← Newer
1
...
14
15
16
17
18
19
20
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021