sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
271 discussions

git:5.3:31947769: textops: docs update to state regex params expect posix format
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

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>

1 0

git:5.3:401c65ba: textops: fix broken example for filter_body
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.3 Commit: 401c65ba3a8168af370c9a3e9c9e445eb66ebbf3 URL: https://github.com/kamailio/kamailio/commit/401c65ba3a8168af370c9a3e9c9e445… Author: Sven Uhlig <git(a)resident-uhlig.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:40:20+01:00 textops: fix broken example for filter_body (cherry picked from commit f8c1cabaeadb8ee145174843ed11bbbb0c3276b0) (cherry picked from commit d9c34770caa305fc6cafa18e255f3c05342305dc) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/401c65ba3a8168af370c9a3e9c9e445… Patch: https://github.com/kamailio/kamailio/commit/401c65ba3a8168af370c9a3e9c9e445… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 47d482aec7e..4d5a7372edb 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -859,7 +859,7 @@ set_reply_body("test", "text/plain"); <programlisting format="linespecific"> ... 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 {

1 0

git:5.4:2296c8d8: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 2296c8d889797daf0eb5cedb4970f8f957a42f20 URL: https://github.com/kamailio/kamailio/commit/2296c8d889797daf0eb5cedb4970f8f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-06T14:46:31+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sipdump/README Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/2296c8d889797daf0eb5cedb4970f8f… Patch: https://github.com/kamailio/kamailio/commit/2296c8d889797daf0eb5cedb4970f8f… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index e1841bf545..01d3a721df 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -289,8 +289,8 @@ event_route[sipdump:msg] { examples shows how to delete the files older than 2 days using Kamailio modules. ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN") diff --git a/src/modules/textops/README b/src/modules/textops/README index dd1fc06a8b..1810c74782 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -237,9 +237,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 @@ -565,7 +569,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 @@ -646,7 +650,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 @@ -667,7 +671,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.

1 0

git:5.4:afc7f4c2: db_redis: don't leave unconsumed redis replies in case of error on update
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: afc7f4c2e9c8c9176e655303fa1d949cbb4ecdec URL: https://github.com/kamailio/kamailio/commit/afc7f4c2e9c8c9176e655303fa1d949… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:32:25+01:00 db_redis: don't leave unconsumed redis replies in case of error on update Execute db_redis_consume_replies on failed update same as in db_redis_insert: if db_redis_perform_update encounters an error it was leaving unconsumed data thus causing unexpected reply later on when reading from the same connection. (cherry picked from commit bbd7b2ed5827252680e9d8949c193699da0a76b2) (cherry picked from commit 7b371b77702471e62d8bd2ee957c44df73f1db80) --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/afc7f4c2e9c8c9176e655303fa1d949… Patch: https://github.com/kamailio/kamailio/commit/afc7f4c2e9c8c9176e655303fa1d949… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index c9a25adf36..ac1bd2b946 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -2249,6 +2249,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&all_type_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return 0; error: @@ -2260,6 +2261,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&type_keys); db_redis_key_free(&set_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return -1; }

1 0

git:5.4:748cd083: core: clarification for -b cli parameter
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 748cd0834cc9118fec1ee69b749daad7203346fb URL: https://github.com/kamailio/kamailio/commit/748cd0834cc9118fec1ee69b749daad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:32:09+01:00 core: clarification for -b cli parameter (cherry picked from commit f068a9ad1892777bfb9a6d1bcfd17a291578c6b6) (cherry picked from commit 68a694676df0e0a0d0a8d0180ebc39f9893b49bc) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/748cd0834cc9118fec1ee69b749daad… Patch: https://github.com/kamailio/kamailio/commit/748cd0834cc9118fec1ee69b749daad… --- diff --git a/src/main.c b/src/main.c index 3a67f841e6..6b53133e31 100644 --- a/src/main.c +++ b/src/main.c @@ -170,8 +170,8 @@ Options:\n\ default is yes.\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 level control (multiple -d to increase the level from 0)\n\ --debug=val Debugging level value\n\

1 0

git:5.4:09ac130c: core: io wait - remove log level string from debug message
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

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

1 0

git:5.4:dccc47c4: msrp: fix some tcpconn where memory was never cleaned up
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: dccc47c4fbb306150d88be40bf2463d4926c75bd URL: https://github.com/kamailio/kamailio/commit/dccc47c4fbb306150d88be40bf2463d… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:30:38+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) --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/dccc47c4fbb306150d88be40bf2463d… Patch: https://github.com/kamailio/kamailio/commit/dccc47c4fbb306150d88be40bf2463d… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b8..859432aa6d2 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) {

1 0

git:5.4:88ec70c9: tls: print src/dst port in error message
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 88ec70c9b056a91a187a68dcb0aa88345a5874e7 URL: https://github.com/kamailio/kamailio/commit/88ec70c9b056a91a187a68dcb0aa883… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:30:16+01:00 tls: print src/dst port in error message - related to GH #2872 (cherry picked from commit daedf1201c2776ccc1040e03f8f63d256e75a43a) (cherry picked from commit 058ed2e1e4fdaf4ff99cd6db5a96793d6b420483) --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/88ec70c9b056a91a187a68dcb0aa883… Patch: https://github.com/kamailio/kamailio/commit/88ec70c9b056a91a187a68dcb0aa883… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 5ca11894f7..53c806a376 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -1284,10 +1284,10 @@ int tls_h_read_f(struct tcp_connection* c, int* flags) TLS_ERR(err_src); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); - ERR("source IP: %s\n", ip_buf); + ERR("src addr: %s:%d\n", ip_buf, c->rcv.src_port); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.dst_ip), ip_buf, sizeof(ip_buf)); - ERR("destination IP: %s\n", ip_buf); + ERR("dst addr: %s:%d\n", ip_buf, c->rcv.dst_port); goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/

1 0

git:5.4:1dcda242: sipdump: docs - fix example config snippet
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 1dcda2425d28c182cf2b85f6f53ebe94c4f28ea1 URL: https://github.com/kamailio/kamailio/commit/1dcda2425d28c182cf2b85f6f53ebe9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:29:56+01:00 sipdump: docs - fix example config snippet (cherry picked from commit f202cfe647c6a1ac92a3c2b8e2ee056d678fb802) (cherry picked from commit 8df8974bb0f9754b126cac75eed76360e12d8a22) --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1dcda2425d28c182cf2b85f6f53ebe9… Patch: https://github.com/kamailio/kamailio/commit/1dcda2425d28c182cf2b85f6f53ebe9… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 0a603c2803..d6a679d215 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -309,8 +309,8 @@ event_route[sipdump:msg] { </para> <programlisting format="linespecific"> ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN")

1 0

git:5.4:49f3ec66: core: parse main headers after updating msg buffer
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

Module: kamailio Branch: 5.4 Commit: 49f3ec66c9e187584f403ca19e3b436abd20376a URL: https://github.com/kamailio/kamailio/commit/49f3ec66c9e187584f403ca19e3b436… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:29:42+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) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/49f3ec66c9e187584f403ca19e3b436… Patch: https://github.com/kamailio/kamailio/commit/49f3ec66c9e187584f403ca19e3b436… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 1ecb566592..683b4a3b00 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3315,7 +3315,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; }

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 December 2021