sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
270 discussions

git:master:7556fbfa: pv: free escaped value for {val.json} transformations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7556fbfa38ac4dad00494944dd02fc60f65cfcb5 URL: https://github.com/kamailio/kamailio/commit/7556fbfa38ac4dad00494944dd02fc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-07T09:27:44+01:00 pv: free escaped value for {val.json} transformations --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/7556fbfa38ac4dad00494944dd02fc6… Patch: https://github.com/kamailio/kamailio/commit/7556fbfa38ac4dad00494944dd02fc6… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 5d7e0d32b3..5f45fa8e66 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2580,6 +2580,7 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, return 0; } if(sv.len >= TR_BUFFER_SIZE - 1) { + free(sv.s); LM_ERR("escaped value is too long\n"); return -1; } @@ -2588,6 +2589,7 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, _tr_buffer[sv.len] = '\0'; val->rs.s = _tr_buffer; val->rs.len = sv.len; + free(sv.s); } break; case TR_VAL_JSONQE: @@ -2601,7 +2603,8 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len = 2; val->flags = PV_VAL_STR; } else if(val->flags&PV_TYPE_INT) { - break; + /* no change needed */ + return 0; } else if(val->flags&PV_VAL_STR) { ksr_str_json_escape(&val->rs, &sv, &emode); if(sv.s==NULL) { @@ -2613,6 +2616,7 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, return 0; } if(sv.len >= TR_BUFFER_SIZE - 3) { + free(sv.s); LM_ERR("escaped value is too long\n"); return -1; } @@ -2623,6 +2627,7 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, _tr_buffer[sv.len + 2] = '\0'; val->rs.s = _tr_buffer; val->rs.len = sv.len + 2; + free(sv.s); } break;

2 years, 11 months

git:master:5b1177df: pv: added {val.jsonqe} - quoted json value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5b1177df2193968a3efc26bcf07eba80a59304e7 URL: https://github.com/kamailio/kamailio/commit/5b1177df2193968a3efc26bcf07eba8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-07T09:27:43+01:00 pv: added {val.jsonqe} - quoted json value --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/5b1177df2193968a3efc26bcf07eba8… Patch: https://github.com/kamailio/kamailio/commit/5b1177df2193968a3efc26bcf07eba8… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index e221cb300e..5d7e0d32b3 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2590,6 +2590,41 @@ int tr_eval_val(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len = sv.len; } break; + case TR_VAL_JSONQE: + if(val->flags&PV_VAL_NULL) { + val->ri = 0; + tr_set_crt_buffer(); + val->rs.s = _tr_buffer; + val->rs.s[0] = '"'; + val->rs.s[1] = '"'; + val->rs.s[2] = '\0'; + val->rs.len = 2; + val->flags = PV_VAL_STR; + } else if(val->flags&PV_TYPE_INT) { + break; + } else if(val->flags&PV_VAL_STR) { + ksr_str_json_escape(&val->rs, &sv, &emode); + if(sv.s==NULL) { + LM_ERR("failed to escape the value\n"); + return -1; + } + if(emode==0) { + /* no escape was needed */ + return 0; + } + if(sv.len >= TR_BUFFER_SIZE - 3) { + LM_ERR("escaped value is too long\n"); + return -1; + } + tr_set_crt_buffer(); + _tr_buffer[0] = '"'; + memcpy(_tr_buffer + 1, sv.s, sv.len); + _tr_buffer[sv.len + 1] = '"'; + _tr_buffer[sv.len + 2] = '\0'; + val->rs.s = _tr_buffer; + val->rs.len = sv.len + 2; + } + break; default: LM_ERR("unknown subtype %d\n", @@ -3847,6 +3882,9 @@ char* tr_parse_val(str* in, trans_t *t) } else if(name.len==4 && strncasecmp(name.s, "json", 4)==0) { t->subtype = TR_VAL_JSON; goto done; + } else if(name.len==6 && strncasecmp(name.s, "jsonqe", 6)==0) { + t->subtype = TR_VAL_JSONQE; + goto done; } diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 329f09a8a2..ff5cbebff8 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_NE, TR_VAL_JSON + TR_VAL_NONE=0, TR_VAL_N0, TR_VAL_NE, TR_VAL_JSON, TR_VAL_JSONQE };

2 years, 11 months

git:master:9517cf47: htable: Fix spelling errors in error and debug messages

by Olle E. Johansson

Module: kamailio Branch: master Commit: 9517cf47f512f561c6461edc3cbca3410e773735 URL: https://github.com/kamailio/kamailio/commit/9517cf47f512f561c6461edc3cbca34… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2021-12-07T08:30:51+01:00 htable: Fix spelling errors in error and debug messages --- Modified: src/modules/htable/api.c Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_var.c Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9517cf47f512f561c6461edc3cbca34… Patch: https://github.com/kamailio/kamailio/commit/9517cf47f512f561c6461edc3cbca34…

2 years, 11 months

git:5.3:3e21c4d9: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: 3e21c4d96e9f88ef9013467ea43acae6c31f307c URL: https://github.com/kamailio/kamailio/commit/3e21c4d96e9f88ef9013467ea43acae… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-06T15:01:40+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/3e21c4d96e9f88ef9013467ea43acae… Patch: https://github.com/kamailio/kamailio/commit/3e21c4d96e9f88ef9013467ea43acae… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 3a9a6658a0..0d6b9347dd 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -222,9 +222,13 @@ Chapter 1. Admin Guide The module implements text based operations over the SIP message processed by Kamailio. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the message - at text level, e.g., regular expression search and replace, Perl-like + at text level, e.g., regular expression search, replace or substitutions, checks for method type, header presence, insert of new - header and date, etc. + header and date, string comparisons, multi-part body operations, etc. + + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. 2. Known Limitations @@ -545,7 +549,7 @@ replace_hdrs_str("Kamailio", "Kamailio SIP Proxy", "a"); 4.15. subst('/re/repl/flags') - Replaces re with repl (sed or perl like). + Replaces re with repl. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -626,7 +630,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ 4.18. subst_body('/re/repl/flags') - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -647,7 +651,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; 4.19. subst_hf(hf, subexp, flags) - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. Meaning of the parameters is as follows: * hf - header field name. @@ -713,7 +717,7 @@ set_reply_body("test", "text/plain"); Example 1.22. filter_body usage ... if (has_body("multipart/mixed")) { - if (filter_body("application/sdp") { + if (filter_body("application/sdp")) { remove_hf("Content-Type"); append_hf("Content-Type: application/sdp\r\n"); } else {

2 years, 11 months

git:5.3:6a230024: core: clarification for -b cli parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 6a230024af804ab97a2e260e5a644ad1f58d8c76 URL: https://github.com/kamailio/kamailio/commit/6a230024af804ab97a2e260e5a644ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:42:18+01:00 core: clarification for -b cli parameter (cherry picked from commit f068a9ad1892777bfb9a6d1bcfd17a291578c6b6) (cherry picked from commit 68a694676df0e0a0d0a8d0180ebc39f9893b49bc) (cherry picked from commit 748cd0834cc9118fec1ee69b749daad7203346fb) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/6a230024af804ab97a2e260e5a644ad… Patch: https://github.com/kamailio/kamailio/commit/6a230024af804ab97a2e260e5a644ad… --- diff --git a/src/main.c b/src/main.c index 6ca7feb5ef..0e16009e19 100644 --- a/src/main.c +++ b/src/main.c @@ -164,8 +164,8 @@ Options:\n\ (like for 'alias' global parameter)\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\ -d Debugging mode (multiple -d increase the level)\n\ -D Control how daemonize is done:\n\

2 years, 11 months

git:5.3:00e02d7d: core: io wait - remove log level string from debug message

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 00e02d7db1acdaaaf3193d701ba96081b7337331 URL: https://github.com/kamailio/kamailio/commit/00e02d7db1acdaaaf3193d701ba9608… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:41:52+01:00 core: io wait - remove log level string from debug message (cherry picked from commit 4608914cf9d3878c79560730ddad8e0800c38397) (cherry picked from commit 706b1ceb9cb5139c4464873c8df6d99c541dda7b) (cherry picked from commit 09ac130c86186334a1a1dd37d47f40b17a83b650) --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/00e02d7db1acdaaaf3193d701ba9608… Patch: https://github.com/kamailio/kamailio/commit/00e02d7db1acdaaaf3193d701ba9608… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index 04186c72ad..f83c6ff6bf 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);

2 years, 11 months

git:5.3:3c50cf57: msrp: fix some tcpconn where memory was never cleaned up

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 3c50cf570b41114925e689ca7c5dbd55b8d78d58 URL: https://github.com/kamailio/kamailio/commit/3c50cf570b41114925e689ca7c5dbd5… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:41:41+01:00 msrp: fix some tcpconn where memory was never cleaned up Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880 (cherry picked from commit bf371ccbfa1c89fefcd9d9322ae75189d97fc862) (cherry picked from commit f4ebe527c25ecedb3caffa8a361b5c42a2dd6b88) (cherry picked from commit dccc47c4fbb306150d88be40bf2463d4926c75bd) --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/3c50cf570b41114925e689ca7c5dbd5… Patch: https://github.com/kamailio/kamailio/commit/3c50cf570b41114925e689ca7c5dbd5… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b..859432aa6d 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

2 years, 11 months

git:5.3:4ba9945e: core: parse main headers after updating msg buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 4ba9945e26199b5a64b2e5cd02062ef9f866ac1a URL: https://github.com/kamailio/kamailio/commit/4ba9945e26199b5a64b2e5cd02062ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:41:03+01:00 core: parse main headers after updating msg buffer - same group of headers as for the case of receiving the message - applies for msg_apply_changes() as well - related to GH #2877 (cherry picked from commit d5c1b4693b6e47b4123b5f9417b5fd88d4dafd1f) (cherry picked from commit 992c5a349454e40c87c8918283ffde7302da9d8e) (cherry picked from commit 49f3ec66c9e187584f403ca19e3b436abd20376a) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/4ba9945e26199b5a64b2e5cd02062ef… Patch: https://github.com/kamailio/kamailio/commit/4ba9945e26199b5a64b2e5cd02062ef… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index bb8d60c1ce..cc9943fe74 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3284,7 +3284,13 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) * valid/safe for config */ return 0; } - + if(parse_headers(msg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) < 0) { + LM_ERR("parsing main headers of new sip message failed [[%.*s]]\n", + msg->len, msg->buf); + /* exit config execution - sip_msg_t structure is no longer + * valid/safe for config */ + return 0; + } return 1; }

2 years, 11 months

git:5.3:cfaf76db: timer: extend internal static HTTP message to have one header

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: cfaf76db114ff10005ee37ce33aa05b4b24116fd URL: https://github.com/kamailio/kamailio/commit/cfaf76db114ff10005ee37ce33aa05b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:40:52+01:00 timer: extend internal static HTTP message to have one header (cherry picked from commit c3629f877500373028d2c7cdefd976cddda31c15) (cherry picked from commit a9c5f3e4d29dccda79eee8e594d4316e32196db5) (cherry picked from commit 3d5f1a75a1413126532b6bed41f2e5ec7acc57fb) --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/cfaf76db114ff10005ee37ce33aa05b… Patch: https://github.com/kamailio/kamailio/commit/cfaf76db114ff10005ee37ce33aa05b… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index 9880a8420b0..224a6bed572 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -159,7 +159,7 @@ static unsigned int timer_msg_no = 0; static ticks_t timer_handler(ticks_t ticks, struct timer_ln* tl, void* data) { /*?min length of first line of message is 16 char!?*/ -#define MSG "GET /timer HTTP/0.9\n\n" +#define MSG "GET /timer HTTP/0.9\r\nUser-Agent: internal\r\n\r\n" sip_msg_t* msg; timer_action_t *a; run_act_ctx_t ra_ctx;

2 years, 11 months

git:5.3:31947769: textops: docs update to state regex params expect posix format

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 319477691bfed48749eea5c40626f033bfbcf842 URL: https://github.com/kamailio/kamailio/commit/319477691bfed48749eea5c40626f03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:40:43+01:00 textops: docs update to state regex params expect posix format (cherry picked from commit b19aab7fe00f72d0c9e54a7a106ec7a065a3d02b) (cherry picked from commit a78acd8f40ed38b161a075bef74febd93acb092c) (cherry picked from commit e4eda3f5131e2788670a1f9f8342a2889e9b1107) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/319477691bfed48749eea5c40626f03… Patch: https://github.com/kamailio/kamailio/commit/319477691bfed48749eea5c40626f03… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 4d5a7372ed..59eba31655 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -19,9 +19,15 @@ The module implements text based operations over the SIP message processed by &kamailio;. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the - message at text level, e.g., regular expression search and replace, - Perl-like substitutions, checks for method type, header presence, - insert of new header and date, etc. + message at text level, e.g., regular expression search, replace + or substitutions, checks for method type, header presence, + insert of new header and date, string comparisons, multi-part body + operations, etc. + </para> + <para> + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. </para> </section> <section> @@ -555,7 +561,7 @@ replace_hdrs_str("&kamailio;", "&kamailio; SIP Proxy", "a"); <function moreinfo="none">subst('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like). + Replaces re with repl. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -692,7 +698,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ <function moreinfo="none">subst_body('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -732,7 +738,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; <function moreinfo="none">subst_hf(hf, subexp, flags)</function> </title> <para> - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

2 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021