sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
223 discussions

git:master:385c054a: modules: readme files regenerated - pv ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 385c054a5d96b4d2b888e62dd26ca7d563d93f61 URL: https://github.com/kamailio/kamailio/commit/385c054a5d96b4d2b888e62dd26ca7d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-25T13:01:10+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/385c054a5d96b4d2b888e62dd26ca7d… Patch: https://github.com/kamailio/kamailio/commit/385c054a5d96b4d2b888e62dd26ca7d…

5 months, 4 weeks

git:master:8df69ebc: pv: docs for xavp_xparams_explode(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8df69ebca23bde071b08b0ed5b8cd34b2d28446b URL: https://github.com/kamailio/kamailio/commit/8df69ebca23bde071b08b0ed5b8cd34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-25T13:00:08+02:00 pv: docs for xavp_xparams_explode(...) --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8df69ebca23bde071b08b0ed5b8cd34… Patch: https://github.com/kamailio/kamailio/commit/8df69ebca23bde071b08b0ed5b8cd34… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 1f91e633a00..6a06bb717de 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -387,6 +387,39 @@ xavp_params_explode("a=b;c=d;e=d", "x"); # $xavp(x=>a) = "b"; # $xavp(x=>c) = "d"; # $xavp(x=>e) = "f"; +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_xparams_explode"> + <title> + <function moreinfo="none">xavp_xparams_explode(sparams, sep, xname)</function> + </title> + <para> + Convert a parameters string in xavp attributes. + </para> + <para> + The first parameter has to be a string in similar format of SIP header + parameters (name1=value1;...;nameN=valueN), but the separator can + be other character than ';'. The second parameter is the separator + for the parameters list. The third parameter is the name of the + root xavp to hold the pairs (nameX,valueX). + </para> + <para> + The values are stored as string type. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_xparams_explode</function> usage</title> + <programlisting format="linespecific"> +... +xavp_xparams_explode("a=b,c=d,e=d", ",", "x"); +# results in: +# $xavp(x=>a) = "b"; +# $xavp(x=>c) = "d"; +# $xavp(x=>e) = "f"; ... </programlisting> </example> @@ -1132,4 +1165,3 @@ $ &kamcmd; pv.shvGet debug </section> </chapter> -

5 months, 4 weeks

git:master:3d2849ae: pv: added xavp_xparams_explode(params, sep, xname)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3d2849aee788fd3b33d80d9d72ef0cdcdd1c9f87 URL: https://github.com/kamailio/kamailio/commit/3d2849aee788fd3b33d80d9d72ef0cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-25T12:53:32+02:00 pv: added xavp_xparams_explode(params, sep, xname) - option to specify the separator for parameters list --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/3d2849aee788fd3b33d80d9d72ef0cd… Patch: https://github.com/kamailio/kamailio/commit/3d2849aee788fd3b33d80d9d72ef0cd…

5 months, 4 weeks

git:master:d4ef9f26: core: parse_param2() - continue if the separator matches comma or bracket

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d4ef9f268fd1b645fc1846db1fd7a6e814792921 URL: https://github.com/kamailio/kamailio/commit/d4ef9f268fd1b645fc1846db1fd7a6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-25T12:48:28+02:00 core: parse_param2() - continue if the separator matches comma or bracket --- Modified: src/core/parser/parse_param.c --- Diff: https://github.com/kamailio/kamailio/commit/d4ef9f268fd1b645fc1846db1fd7a6e… Patch: https://github.com/kamailio/kamailio/commit/d4ef9f268fd1b645fc1846db1fd7a6e… --- diff --git a/src/core/parser/parse_param.c b/src/core/parser/parse_param.c index 698c0a9b47d..b7df14d9f88 100644 --- a/src/core/parser/parse_param.c +++ b/src/core/parser/parse_param.c @@ -508,9 +508,9 @@ static inline int parse_param2( t->len = t->name.len; } - if(_s->s[0] == ',') + if(separator != ',' && _s->s[0] == ',') goto ok; /* To be able to parse header parameters */ - if(_s->s[0] == '>') + if(separator != '>' && _s->s[0] == '>') goto ok; /* To be able to parse URI parameters */ if(_s->s[0] != separator) {

5 months, 4 weeks

git:master:e956ae7b: pv: support all spaces separator for {s.select}

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e956ae7b83971c50cbdf1a4db8db9929f02e3b19 URL: https://github.com/kamailio/kamailio/commit/e956ae7b83971c50cbdf1a4db8db992… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-25T11:03:01+02:00 pv: support all spaces separator for {s.select} --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/e956ae7b83971c50cbdf1a4db8db992… Patch: https://github.com/kamailio/kamailio/commit/e956ae7b83971c50cbdf1a4db8db992… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index dcf5479a105..b0eba93eed8 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -256,7 +256,8 @@ int tr_eval_string( for(i = 0; i < val->rs.len; i++) { if(val->rs.s[i] == '\r' || val->rs.s[i] == '\n') { c = 1; - } else if(c != 0 && (val->rs.s[i] == ' ' || val->rs.s[i] == '\t')) { + } else if(c != 0 + && (val->rs.s[i] == ' ' || val->rs.s[i] == '\t')) { if(c == 1) { _tr_buffer[j] = ' '; j++; @@ -284,7 +285,8 @@ int tr_eval_string( for(i = 0; i < val->rs.len; i++) { if(val->rs.s[i] == '\r' || val->rs.s[i] == '\n') { c = 1; - } else if(c != 0 && (val->rs.s[i] == ' ' || val->rs.s[i] == '\t')) { + } else if(c != 0 + && (val->rs.s[i] == ' ' || val->rs.s[i] == '\t')) { c = 2; } else { _tr_buffer[j] = val->rs.s[i]; @@ -816,6 +818,9 @@ int tr_eval_string( case 't': c = '\t'; break; + case 's': + c = ' '; + break; default: LM_ERR("invalid select escape char (cfg line: %d)\n", get_cfg_crt_line()); @@ -832,7 +837,10 @@ int tr_eval_string( i = -i; i--; while(p >= val->rs.s) { - if(*p == c) { + if(((c == 1) + && (*p == ' ' || *p == '\t' || *p == '\n' + || *p == '\r')) + || (*p == c)) { if(i == 0) break; s = p - 1; @@ -850,7 +858,10 @@ int tr_eval_string( s = val->rs.s; p = s; while(p < val->rs.s + val->rs.len) { - if(*p == c) { + if(((c == 1) + && (*p == ' ' || *p == '\t' || *p == '\n' + || *p == '\r')) + || (*p == c)) { if(i == 0) break; s = p + 1;

5 months, 4 weeks

git:master:e4a65922: rabbitmq: don't fail on init if connection fails

by Victor Seva

Module: kamailio Branch: master Commit: e4a65922649c1db8edcb8fa18b421620c899b25f URL: https://github.com/kamailio/kamailio/commit/e4a65922649c1db8edcb8fa18b42162… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-25T10:35:09+02:00 rabbitmq: don't fail on init if connection fails * there's a reconnect functionality already in place Change-Id: I88320fc64aef802a1bcdd753fe7d22402ca4b18c --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/e4a65922649c1db8edcb8fa18b42162… Patch: https://github.com/kamailio/kamailio/commit/e4a65922649c1db8edcb8fa18b42162… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index a1e95ad55b3..9b57e7a834c 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -178,8 +178,7 @@ static int mod_child_init(int rank) // routing process if(rabbitmq_connect(&amqp_conn) != RABBITMQ_OK) { - LM_ERR("FAIL rabbitmq_connect()"); - return -1; + LM_WARN("FAIL rabbitmq_connect()"); } LM_DBG("SUCCESS initialization of rabbitmq module in child [%d]\n", rank);

5 months, 4 weeks

git:master:75b5325c: pv: new transformation {s.rmhlws}

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 75b5325c3b125b8adc551591cd82b67cd3cab167 URL: https://github.com/kamailio/kamailio/commit/75b5325c3b125b8adc551591cd82b67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-25T09:41:56+02:00 pv: new transformation {s.rmhlws} - remove header line split white spaces (i.e., end of lines and following white spaces in a multi-line header value) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/75b5325c3b125b8adc551591cd82b67… Patch: https://github.com/kamailio/kamailio/commit/75b5325c3b125b8adc551591cd82b67… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 4418234ddb5..dcf5479a105 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -274,6 +274,30 @@ int tr_eval_string( val->rs.s = _tr_buffer; val->rs.len = j; break; + case TR_S_RMHLWS: + 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; + j = 0; + c = 0; + for(i = 0; i < val->rs.len; i++) { + if(val->rs.s[i] == '\r' || val->rs.s[i] == '\n') { + c = 1; + } else if(c != 0 && (val->rs.s[i] == ' ' || val->rs.s[i] == '\t')) { + c = 2; + } else { + _tr_buffer[j] = val->rs.s[i]; + j++; + c = 0; + } + } + _tr_buffer[j] = '\0'; + val->flags = PV_VAL_STR; + val->ri = 0; + val->rs.s = _tr_buffer; + val->rs.len = j; + break; case TR_S_MD5: if(!(val->flags & PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); @@ -2752,6 +2776,9 @@ char *tr_parse_string(str *in, trans_t *t) } else if(name.len == 6 && strncasecmp(name.s, "rmhdws", 6) == 0) { t->subtype = TR_S_RMHDWS; goto done; + } else if(name.len == 6 && strncasecmp(name.s, "rmhlws", 6) == 0) { + t->subtype = TR_S_RMHLWS; + goto done; } else if(name.len == 6 && strncasecmp(name.s, "sha256", 6) == 0) { t->subtype = TR_S_SHA256; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 9eebe1da9d1..6fab2c4233c 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -97,6 +97,7 @@ enum _tr_s_subtype TR_S_DECODEBASE64URLT, TR_S_RMWS, TR_S_RMHDWS, + TR_S_RMHLWS, TR_S_BEFORE, TR_S_AFTER, TR_S_RBEFORE,

6 months

git:master:31daee18: pv: new transformation {s.rmhdws}

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 31daee1800cb301d705524a56e7466abfa62e5d9 URL: https://github.com/kamailio/kamailio/commit/31daee1800cb301d705524a56e7466a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-24T11:38:14+02:00 pv: new transformation {s.rmhdws} - remove header-like duplicated whitespaces (i.e., end of line followed by whitespaces are replaced by a single whitespace) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/31daee1800cb301d705524a56e7466a… Patch: https://github.com/kamailio/kamailio/commit/31daee1800cb301d705524a56e7466a… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index a3ce0f0ace3..4418234ddb5 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -246,6 +246,34 @@ int tr_eval_string( val->rs.s = _tr_buffer; val->rs.len = j; break; + case TR_S_RMHDWS: + 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; + j = 0; + c = 0; + for(i = 0; i < val->rs.len; i++) { + if(val->rs.s[i] == '\r' || val->rs.s[i] == '\n') { + c = 1; + } else if(c != 0 && (val->rs.s[i] == ' ' || val->rs.s[i] == '\t')) { + if(c == 1) { + _tr_buffer[j] = ' '; + j++; + c = 2; + } + } else { + _tr_buffer[j] = val->rs.s[i]; + j++; + c = 0; + } + } + _tr_buffer[j] = '\0'; + val->flags = PV_VAL_STR; + val->ri = 0; + val->rs.s = _tr_buffer; + val->rs.len = j; + break; case TR_S_MD5: if(!(val->flags & PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); @@ -2721,6 +2749,9 @@ char *tr_parse_string(str *in, trans_t *t) } else if(name.len == 4 && strncasecmp(name.s, "rmws", 4) == 0) { t->subtype = TR_S_RMWS; goto done; + } else if(name.len == 6 && strncasecmp(name.s, "rmhdws", 6) == 0) { + t->subtype = TR_S_RMHDWS; + goto done; } else if(name.len == 6 && strncasecmp(name.s, "sha256", 6) == 0) { t->subtype = TR_S_SHA256; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 662d5a2b578..9eebe1da9d1 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -96,6 +96,7 @@ enum _tr_s_subtype TR_S_ENCODEBASE64URLT, TR_S_DECODEBASE64URLT, TR_S_RMWS, + TR_S_RMHDWS, TR_S_BEFORE, TR_S_AFTER, TR_S_RBEFORE,

6 months

git:master:588b9c71: core: removed duplicated break

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 588b9c710b6555371bc8bbee21e474466bb099dd URL: https://github.com/kamailio/kamailio/commit/588b9c710b6555371bc8bbee21e4744… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-24T10:22:25+02:00 core: removed duplicated break --- Modified: src/core/select.c --- Diff: https://github.com/kamailio/kamailio/commit/588b9c710b6555371bc8bbee21e4744… Patch: https://github.com/kamailio/kamailio/commit/588b9c710b6555371bc8bbee21e4744… --- diff --git a/src/core/select.c b/src/core/select.c index 01312d5e459..10526ff5c7c 100644 --- a/src/core/select.c +++ b/src/core/select.c @@ -335,7 +335,6 @@ int resolve_select(select_t *s) default: BUG("Unable to resolve select at level %d\n", param_idx); break; - break; } goto not_found;

6 months

[kamailio/kamailio] DNS google auto establish to kamailio service (Issue #3890)

by itpanda2024

I just study and work with Kamailio . I have a issue about listening port . Please help me. I install kamailio in centos 9 stream with version 5.6.5 when start call sometime, my system established connect from google dns (8.8.8.8:53) to kamailio with random port and it do call fail (not reply when receive invite ). please help me and i attatch screenshot ![kamailio issue](https://github.com/kamailio/kamailio/assets/154739080/d94aae72-e420-… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3890 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3890(a)github.com>

6 months

← Newer
1
...
4
5
6
7
8
9
10
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024