sr-dev March 2022

sr-dev@lists.kamailio.org

10 participants
245 discussions

git:5.5:0a945faa: blst: converted log macros and removed function names
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 0a945faa496a48377c766f5966243b3e0a9dbc75 URL: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:52+01:00 blst: converted log macros and removed function names (cherry picked from commit f85cd7eb9d3249ee93f0de7f978d0a9e7044df77) --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… Patch: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 5d33368bd8..1c2773c53c 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -119,11 +119,10 @@ static int ki_blst_add(sip_msg_t* msg, int t) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -193,12 +192,10 @@ static int ki_blst_add_retry_after(sip_msg_t* msg, int t_min, int t_max) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -241,11 +238,10 @@ static int ki_blst_del(sip_msg_t* msg) if (dst_blocklist_del(&src, msg)) return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -281,8 +277,7 @@ static int ki_blst_is_blocklisted(sip_msg_t* msg) " blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_is_blocklisted:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -309,8 +304,7 @@ static int ki_blst_set_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -349,8 +343,7 @@ static int ki_blst_clear_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -390,8 +383,7 @@ static int ki_blst_rpl_set_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -432,8 +424,7 @@ static int ki_blst_rpl_clear_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; }

1 0

git:5.5:42b80a2c: core: fixed comment typo
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 42b80a2cf0fa1b2e7192ade5844df670a49480ff URL: https://github.com/kamailio/kamailio/commit/42b80a2cf0fa1b2e7192ade5844df67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:15:05+01:00 core: fixed comment typo (cherry picked from commit c37ccdc6e3bad0af4644941a872f510c51936c58) --- Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/42b80a2cf0fa1b2e7192ade5844df67… Patch: https://github.com/kamailio/kamailio/commit/42b80a2cf0fa1b2e7192ade5844df67… --- diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 99c1dc1de1..df47e18965 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -154,7 +154,7 @@ typedef int (*param_func_t)( modparam_t type, void* val); @warning child_init(PROC_MAIN) is again called in the same process (main), but latter (before tcp), so make sure you don't init things - twice, bot in PROC_MAIN and PROC_INT */ + twice, both in PROC_MAIN and PROC_INT */ #define PROC_NOCHLDINIT -128 /**< no child init functions will be called if this rank is used in fork_process() */

1 0

git:5.5:e77e4ad4: nathelper: Fix uninitialized data
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: e77e4ad4953aac413d06ceb3954736b81ac30355 URL: https://github.com/kamailio/kamailio/commit/e77e4ad4953aac413d06ceb3954736b… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:38+01:00 nathelper: Fix uninitialized data - the IP checksum is part of the header and must be zeroed before checksumming - also silence another (benign) warning (cherry picked from commit 7cbbd8fb22ac0d57a5dd3883dee185b3bc0601e2) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/e77e4ad4953aac413d06ceb3954736b… Patch: https://github.com/kamailio/kamailio/commit/e77e4ad4953aac413d06ceb3954736b… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 9e45a61079..3cb138ebdd 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1615,7 +1615,7 @@ static inline int replace_sdp_ip( { str body1, oldip, newip; str body = *org_body; - int pf, pf1 = 0; + int pf = 0, pf1 = 0; str body2; char *bodylimit = body.s + body.len; int ret; @@ -1974,6 +1974,7 @@ static int send_raw(const char *buf, int buf_len, union sockaddr_union *to, ip->ip_off = 0; ip->ip_ttl = 69; ip->ip_p = 17; + ip->ip_sum = 0; ip->ip_src.s_addr = s_ip; ip->ip_dst.s_addr = to->sin.sin_addr.s_addr;

1 0

git:5.5:b8329204: Erlang: Revert breaking change
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: b83292042aae87c445e05c3f82231ca6d335cc96 URL: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:11+01:00 Erlang: Revert breaking change Revert https://github.com/kamailio/kamailio/commit/6542a367638ec5f8a2b62994f8c309e… xavp_add_xavp_value returns the root and not the xavp it added and that was the reason for the code the commit removed. Changed a variable name to help make that more clear. Also related to https://github.com/kamailio/kamailio/issues/2069. (cherry picked from commit 1ed58f0de4f7a3ab3a81dd84c1c3b94fa1df2c4b) --- Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… Patch: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… --- diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index 894c36784c..b19a22ac8e 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -86,11 +86,15 @@ sr_xavp_t *xbuff_new(str *name) if(!xbuffs_root) { - xbuff = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); - } else { - xbuff = xavp_get_child(&xbuff_list, name); + xbuffs_root = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); + if (!xbuffs_root){ + LM_ERR("cannot create xbuffs_root \n"); + return NULL; + } } + xbuff = xavp_get_child(&xbuff_list, name); + if (!xbuff) { xbuff_val.type = SR_XTYPE_NULL;

1 0

git:5.5:34eceee6: Erlang: Erlang module assumes pvi.type is zero
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 34eceee62f20dfd4ef148277c93391e5e778ccef URL: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:01+01:00 Erlang: Erlang module assumes pvi.type is zero Related to this commit: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… (cherry picked from commit fa74be53232d56797209a630823a20346f9d2597) --- Modified: src/modules/erlang/pv_atom.c Modified: src/modules/erlang/pv_pid.c Modified: src/modules/erlang/pv_ref.c Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… Patch: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… --- diff --git a/src/modules/erlang/pv_atom.c b/src/modules/erlang/pv_atom.c index b37f01560f..092672751c 100644 --- a/src/modules/erlang/pv_atom.c +++ b/src/modules/erlang/pv_atom.c @@ -51,6 +51,9 @@ int pv_atom_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_pid.c b/src/modules/erlang/pv_pid.c index 2de3f5e698..acb2bee5b2 100644 --- a/src/modules/erlang/pv_pid.c +++ b/src/modules/erlang/pv_pid.c @@ -54,6 +54,9 @@ int pv_pid_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_ref.c b/src/modules/erlang/pv_ref.c index 052f7ced90..927cb4b855 100644 --- a/src/modules/erlang/pv_ref.c +++ b/src/modules/erlang/pv_ref.c @@ -54,6 +54,9 @@ int pv_ref_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index ce6e2bd2eb..894c36784c 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -198,6 +198,9 @@ int pv_xbuff_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break;

1 0

git:5.5:11e7c173: tmx: use trimmed call-id value for hashing
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 11e7c173f2974c2174d1ccaca717eb63c5608a84 URL: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:13:19+01:00 tmx: use trimmed call-id value for hashing (cherry picked from commit 88f1a1a671c4486e5000415b3d52eb42e6ad4cbb) --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… Patch: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 256c82bf16..7bb2315fd3 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -243,7 +243,7 @@ int tmx_check_pretran(sip_msg_t *msg) sftag = get_from(msg)->tag_value; trim(&sftag); - chid = get_hash1_raw(msg->callid->body.s, msg->callid->body.len); + chid = get_hash1_raw(scallid.s, scallid.len); slotid = chid & (_tmx_ptran_size-1); if(unlikely(_tmx_proc_ptran == NULL)) {

1 0

git:5.5:39e6c357: siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 39e6c357a93a62033082a3bed2f985b8ad47db13 URL: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T09:33:52+01:00 siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate - GH #3042 (cherry picked from commit e3b9521a150ac2245dee2afeac5d674768c7399a) --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… Patch: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 63fdd5c6cb..31d7f716ca 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -349,7 +349,7 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) } } - if(msg_send(pdst, buf, len) < 0) { + if(msg_send_buffer(pdst, buf, len, 1) < 0) { LM_ERR("cannot send duplicate message\n"); goto error; }

1 0

git:master:e3b9521a: siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: master Commit: e3b9521a150ac2245dee2afeac5d674768c7399a URL: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T09:29:06+01:00 siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate - GH #3042 --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… Patch: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 63fdd5c6cb..31d7f716ca 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -349,7 +349,7 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) } } - if(msg_send(pdst, buf, len) < 0) { + if(msg_send_buffer(pdst, buf, len, 1) < 0) { LM_ERR("cannot send duplicate message\n"); goto error; }

1 0

git:master:3dc980d6: modules: readme files regenerated - jwt ... [skip ci]
by Kamailio Dev 02 Mar '22

02 Mar '22

Module: kamailio Branch: master Commit: 3dc980d66fc4caeea90bb95870394c8855b51dec URL: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-02T08:46:19+01:00 modules: readme files regenerated - jwt ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8… Patch: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8…

1 0

git:master:eee5068e: jwt: add missing tag in doc
by Victor Seva 02 Mar '22

02 Mar '22

Module: kamailio Branch: master Commit: eee5068e2f315b6d391e6fe7b6aef4875afcf574 URL: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-02T08:39:26+01:00 jwt: add missing tag in doc error instroduced at aaa142d293105ef27f7e4b6143fc3fb18c9a5a75 --- Modified: src/modules/jwt/doc/jwt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… Patch: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… --- diff --git a/src/modules/jwt/doc/jwt_admin.xml b/src/modules/jwt/doc/jwt_admin.xml index 45d98c7689..a72c518efe 100644 --- a/src/modules/jwt/doc/jwt_admin.xml +++ b/src/modules/jwt/doc/jwt_admin.xml @@ -115,6 +115,7 @@ modparam("jwt", "key_mode", 1) added as string value. </para> </listitem> + <listitem> <para> headers - the list of headers to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters format).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2022