sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
254 discussions

git:master:ed60be16: pv: transformation to escape/unescape cr lf
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: ed60be162918fc1791ee6425f664eb2f76b9475e URL: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T18:52:58+02:00 pv: transformation to escape/unescape cr lf - {s.escape.crlf}, {s.unescape.crlf} --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… Patch: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 0cc6f8f2e2c..a3ce0f0ace3 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -566,6 +566,32 @@ int tr_eval_string( val->rs.s = _tr_buffer; val->rs.len = i; break; + case TR_S_ESCAPECRLF: + if(!(val->flags & PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len > TR_BUFFER_SIZE / 2 - 1) + return -1; + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if(escape_crlf(&val->rs, &st)) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; + case TR_S_UNESCAPECRLF: + if(!(val->flags & PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len > TR_BUFFER_SIZE - 1) + return -1; + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if(unescape_crlf(&val->rs, &st)) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; case TR_S_ESCAPEUSER: if(!(val->flags & PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); @@ -2768,6 +2794,12 @@ char *tr_parse_string(str *in, trans_t *t) && strncasecmp(name.s, "unescape.common", 15) == 0) { t->subtype = TR_S_UNESCAPECOMMON; goto done; + } else if(name.len == 11 && strncasecmp(name.s, "escape.crlf", 11) == 0) { + t->subtype = TR_S_ESCAPECRLF; + goto done; + } else if(name.len == 13 && strncasecmp(name.s, "unescape.crlf", 13) == 0) { + t->subtype = TR_S_UNESCAPECRLF; + goto done; } else if(name.len == 11 && strncasecmp(name.s, "escape.user", 11) == 0) { t->subtype = TR_S_ESCAPEUSER; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 827f74feb49..662d5a2b578 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -60,6 +60,8 @@ enum _tr_s_subtype TR_S_DECODEBASE64, TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, + TR_S_ESCAPECRLF, + TR_S_UNESCAPECRLF, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM,

1 0

git:master:6992c9ee: core: helper functions to escape/unescape cr lf
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 6992c9eedeabd931fc255e5c1e992b0cfb01dbca URL: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T18:48:29+02:00 core: helper functions to escape/unescape cr lf --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… Patch: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index 73e713cb451..475150dc0f7 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -109,6 +109,68 @@ int unescape_common(char *dst, char *src, int src_len) return j; } +/*! \brief + * add backslashes for CR LF + */ +int escape_crlf(str *sin, str *sout) +{ + int i, j; + + if(sout == 0 || sin == 0 || sin->len <= 0) + return -1; + j = 0; + for(i = 0; i < sin->len; i++) { + switch(sin->s[i]) { + case '\n': + sout->s[j++] = '\\'; + sout->s[j++] = 'n'; + break; + case '\r': + sout->s[j++] = '\\'; + sout->s[j++] = 'r'; + break; + default: + sout->s[j++] = sin->s[i]; + } + } + sout->len = j; + return 0; +} + +/*! \brief + * remove backslashes for CR LF + */ +int unescape_crlf(str *sin, str *sout) +{ + int i, j; + + if(sout == 0 || sin == 0 || sin->len <= 0) + return -1; + j = 0; + i = 0; + while(i < sin->len) { + if(sin->s[i] == '\\' && i + 1 < sin->len) { + switch(sin->s[i + 1]) { + case 'n': + sout->s[j++] = '\n'; + i++; + break; + case 'r': + sout->s[j++] = '\r'; + i++; + break; + default: + sout->s[j++] = sin->s[i]; + } + } else { + sout->s[j++] = sin->s[i]; + } + i++; + } + sout->len = j; + return 0; +} + /*! \brief Unscape all printable ASCII characters */ int unescape_user(str *sin, str *sout) { diff --git a/src/core/strutils.h b/src/core/strutils.h index b32e610512c..5781943dacb 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -56,6 +56,8 @@ int escape_common(char *dst, char *src, int src_len); /* remove backslashes to special characters */ int unescape_common(char *dst, char *src, int src_len); +int escape_crlf(str *sin, str *sout); +int unescape_crlf(str *sin, str *sout); int escape_user(str *sin, str *sout); int unescape_user(str *sin, str *sout); int escape_param(str *sin, str *sout);

1 0

git:master:ec7f3a21: sdops: typo fixed for $sdp(m0:rtcp:port)
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: ec7f3a2173c1de220afd5b4776d92c98bb901630 URL: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T17:02:14+02:00 sdops: typo fixed for $sdp(m0:rtcp:port) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… Patch: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 644ded5b064..b7ee2482616 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2265,7 +2265,7 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) case 12: if(strncmp(in->s, "sess_version", 12) == 0) sp->pvp.pvn.u.isname.name.n = 1; - else if(strncmp(in->s, "m0:rctp:port", 12) == 0) + else if(strncmp(in->s, "m0:rtcp:port", 12) == 0) sp->pvp.pvn.u.isname.name.n = 5; else goto error;

1 0

Kamailio v5.8.1 Released
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Hello, Kamailio SIP Server v5.8.1 stable release is out. This is a maintenance release of the latest stable branch, 5.8, that includes fixes since the release of v5.8.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.8.x. Deployments running previous v5.8.x versions are strongly recommended to be upgraded to v5.8.1. For more details about version 5.8.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2024/04/kamailio-v5-8-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

1 0

git:5.8:384843ce: ChangeLog: content updated for v5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 384843ceb6705996c0c6da6359868bd6e370a0b7 URL: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:26:52+02:00 ChangeLog: content updated for v5.8.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd… Patch: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd…

1 0

git:5.8:e8aa9871: Makefile.defs: version set to 5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: e8aa98718d91d0e5af7d757176a180e0f2940417 URL: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:23:42+02:00 Makefile.defs: version set to 5.8.1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… Patch: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index f5e8b0da653..0f960b4478e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 8 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:5.8:69f667fe: core: msg translator - duplicate reply via xavp params and handle errors
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 69f667fe9b95d09a642cb7edd7f16ce09bbac3f1 URL: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:21:37+02:00 core: msg translator - duplicate reply via xavp params and handle errors (cherry picked from commit 5f83d4f9c447f5a7e3de8336dc0e076b10e43833) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… Patch: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index b54eded3f89..acd5911867a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2362,6 +2362,7 @@ char *generate_res_buf_from_sip_res( char *buf; unsigned int len; str xparams; + str sdup; sr_lump_t *anchor; buf = msg->buf; @@ -2393,11 +2394,18 @@ char *generate_res_buf_from_sip_res( anchor = anchor_lump(msg, msg->via2->params.s + msg->via2->params.len - msg->buf, 0, 0); - if(anchor != NULL) { - if(insert_new_lump_after(anchor, xparams.s, xparams.len, 0) - == 0) { - LM_ERR("unable to add via reply xavp params\n"); - } + if(anchor == NULL) { + LM_ERR("unable to get the anchor\n"); + goto error; + } + if(pkg_str_dup(&sdup, &xparams) < 0) { + PKG_MEM_ERROR; + goto error; + } + if(insert_new_lump_after(anchor, sdup.s, sdup.len, 0) == 0) { + LM_ERR("unable to add via reply xavp params\n"); + pkg_free(sdup.s); + goto error; } } }

1 0

git:5.8:1caec71a: core: xavp - added missing closing parenthesis in log messages
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 1caec71aeddb7f65afb93bf05cb9e0aae2a2c0cd URL: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:21:26+02:00 core: xavp - added missing closing parenthesis in log messages (cherry picked from commit 3b09fd343575c56d9658a61efebd4851662de338) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… Patch: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 128ea631013..21a8197080b 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1151,7 +1151,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long)avp->val.v.l, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long int value (%d/%d\n", + LM_ERR("failed to serialize long int value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1162,7 +1162,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long long)avp->val.v.ll, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long long value (%d/%d\n", + LM_ERR("failed to serialize long long value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1178,7 +1178,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) qs, avp->val.v.s.len, avp->val.v.s.s, qs, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, + LM_ERR("failed to serialize str value (%d/%d)\n", ostr.len, olen - rlen); return -1; }

1 0

git:master:5f83d4f9: core: msg translator - duplicate reply via xavp params and handle errors
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 5f83d4f9c447f5a7e3de8336dc0e076b10e43833 URL: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:18:47+02:00 core: msg translator - duplicate reply via xavp params and handle errors --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… Patch: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index b54eded3f89..acd5911867a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2362,6 +2362,7 @@ char *generate_res_buf_from_sip_res( char *buf; unsigned int len; str xparams; + str sdup; sr_lump_t *anchor; buf = msg->buf; @@ -2393,11 +2394,18 @@ char *generate_res_buf_from_sip_res( anchor = anchor_lump(msg, msg->via2->params.s + msg->via2->params.len - msg->buf, 0, 0); - if(anchor != NULL) { - if(insert_new_lump_after(anchor, xparams.s, xparams.len, 0) - == 0) { - LM_ERR("unable to add via reply xavp params\n"); - } + if(anchor == NULL) { + LM_ERR("unable to get the anchor\n"); + goto error; + } + if(pkg_str_dup(&sdup, &xparams) < 0) { + PKG_MEM_ERROR; + goto error; + } + if(insert_new_lump_after(anchor, sdup.s, sdup.len, 0) == 0) { + LM_ERR("unable to add via reply xavp params\n"); + pkg_free(sdup.s); + goto error; } } }

1 0

git:master:3b09fd34: core: xavp - added missing closing parenthesis in log messages
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 3b09fd343575c56d9658a61efebd4851662de338 URL: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:16:18+02:00 core: xavp - added missing closing parenthesis in log messages --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… Patch: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 128ea631013..21a8197080b 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1151,7 +1151,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long)avp->val.v.l, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long int value (%d/%d\n", + LM_ERR("failed to serialize long int value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1162,7 +1162,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long long)avp->val.v.ll, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long long value (%d/%d\n", + LM_ERR("failed to serialize long long value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1178,7 +1178,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) qs, avp->val.v.s.len, avp->val.v.s.s, qs, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, + LM_ERR("failed to serialize str value (%d/%d)\n", ostr.len, olen - rlen); return -1; }

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 April 2024