sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
239 discussions

[kamailio/kamailio] pv: hfl(name)[N] for negative index bug (Issue #3653)
by Xenofon Karamanos 08 Jan '24

08 Jan '24

### Description I am working on extending $hfl and $hflc to support some more headers. During some experimentation, I stumbled into some weird behavior regarding $(hfl(Route)[-1]) and negative indexing of $hfl pseudo-variable (also for Via, Contact). Per the [docs ](https://www.kamailio.org/wikidocs/cookbooks/devel/pseudovariables/#hflname-header-field-with-list-of-bodies ): -1 index should print the last header found and so on (as stated by $hdr $hfl). Right now, -1 produces null, and from -2 and onwards it prints correctly from the last one to the first one. ### Troubleshooting #### Reproduction ``` #kamailio.cfg ... request_route { xlog("L_INFO", "Route headers hdr: $hdr(Route)\n"); xlog("L_INFO", "Route headers hfl: $hfl(Route)\n"); xlog("L_INFO", "Route headers count: $hflc(Route)\n"); xlog("L_INFO", "Route headers 0: $(hfl(Route)[0])\n"); xlog("L_INFO", "Route headers 1: $(hfl(Route)[1])\n"); xlog("L_INFO", "Route headers 4: $(hfl(Route)[4])\n"); xlog("L_INFO", "Route headers -1: $(hfl(Route)[-1])\n"); xlog("L_INFO", "Route headers -2: $(hfl(Route)[-2])\n"); xlog("L_INFO", "Route headers -3: $(hfl(Route)[-3])\n"); ... } ``` Seng a SIP message containing Route (but also applicable for VIA, Contact headers): ``` OPTIONS_MSG_2CONTACTS="OPTIONS sip:example.com SIP/2.0 Via: SIP/2.0/UDP 192.168.1.100:5060;branch=z9hG4bK123456789 Max-Forwards: 70 From: <sip:bob@example.com>;tag=123456789 To: <sip:alice@example.com> Call-ID: 987654321(a)192.168.1.100 CSeq: 1 OPTIONS Contact: <sip:bob@example.com>;expires=3600,<sip:bob2@example.com>;expires=3600,<sip:bob3@example.com>;expires=3600 Route: <sip:server1.example.com;lr;ftag=1234>, <sip:server2.example.com;lr;ftag=5678>, <sip:server3.example.com;lr;ftag=9012> Route: <sip:server4.example.com;lr;ftag=1234>, <sip:server5.example.com;lr;ftag=5678> Content-Length: 0 " echo -e "$OPTIONS_MSG_2CONTACTS" | nc -u localhost 5060 ``` See logs for logging details. #### Log Messages  ``` INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers hdr: <sip:server1.example.com;lr;ftag=1234>, <sip:server2.example.com;lr;ftag=5678>, <sip:server3.example.com;lr;ftag=9012> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers hfl: <sip:server1.example.com;lr;ftag=1234> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers count: 5 INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 0: <sip:server1.example.com;lr;ftag=1234> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 1: <sip:server2.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 4: <sip:server5.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -1: <null> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -2: <sip:server5.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -3: <sip:server4.example.com;lr;ftag=1234> ``` ### Possible Solutions  In https://github.com/kamailio/kamailio/blob/e59c4415707f0995a0d5315b5601ae518…, the count should start at 0 ie. ``` n=0; // not n=1; ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3653 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3653(a)github.com>

2 2

git:master:619c7fe6: domainpolicy: removed constant condition
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: 619c7fe6db9c090ef9645ec8a39d43d00ba215bf URL: https://github.com/kamailio/kamailio/commit/619c7fe6db9c090ef9645ec8a39d43d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-31T14:06:40+01:00 domainpolicy: removed constant condition --- Modified: src/modules/domainpolicy/domainpolicy.c --- Diff: https://github.com/kamailio/kamailio/commit/619c7fe6db9c090ef9645ec8a39d43d… Patch: https://github.com/kamailio/kamailio/commit/619c7fe6db9c090ef9645ec8a39d43d… --- diff --git a/src/modules/domainpolicy/domainpolicy.c b/src/modules/domainpolicy/domainpolicy.c index 0fb0c43f617..cacd97fa627 100644 --- a/src/modules/domainpolicy/domainpolicy.c +++ b/src/modules/domainpolicy/domainpolicy.c @@ -900,14 +900,9 @@ int dp_apply_policy(struct sip_msg *_msg, char *_s1, char *_s2) } at = (char *)&(duri[0]); - len = 0; - if((len + 4) > MAX_URI_SIZE) { - LM_ERR("duri buffer to small to add uri schema\n"); - return -1; - } + len = 4; memcpy(at, "sip:", 4); at = at + 4; - len = len + 4; domain = &(_msg->parsed_uri.host); LM_DBG("domain is %.*s.\n", domain->len, ZSW(domain->s));

1 0

git:master:5bbff26c: sca: removed if on rc before being set
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: 5bbff26ce6e95b841e69f2dffc2214318a748c36 URL: https://github.com/kamailio/kamailio/commit/5bbff26ce6e95b841e69f2dffc22143… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-31T09:35:08+01:00 sca: removed if on rc before being set - reorder some conditions on range --- Modified: src/modules/sca/sca_appearance.c Modified: src/modules/sca/sca_rpc.c Modified: src/modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/5bbff26ce6e95b841e69f2dffc22143… Patch: https://github.com/kamailio/kamailio/commit/5bbff26ce6e95b841e69f2dffc22143… --- diff --git a/src/modules/sca/sca_appearance.c b/src/modules/sca/sca_appearance.c index c467137a8d7..fcc94c4c2b6 100644 --- a/src/modules/sca/sca_appearance.c +++ b/src/modules/sca/sca_appearance.c @@ -60,7 +60,7 @@ void sca_appearance_state_to_str(int state, str *state_str) { assert(state_str != NULL); - if(state >= SCA_APPEARANCE_STATE_NAME_COUNT || state < 0) { + if(state < 0 || state >= SCA_APPEARANCE_STATE_NAME_COUNT) { state_str->len = SCA_APPEARANCE_STATE_STR_UNKNOWN.len; state_str->s = SCA_APPEARANCE_STATE_STR_UNKNOWN.s; diff --git a/src/modules/sca/sca_rpc.c b/src/modules/sca/sca_rpc.c index c3b9b0f2bae..bedfdaa0162 100644 --- a/src/modules/sca/sca_rpc.c +++ b/src/modules/sca/sca_rpc.c @@ -199,10 +199,6 @@ void sca_rpc_deactivate_all_subscriptions(rpc_t *rpc, void *ctx) rpc->rpl_printf(ctx, "Deactivating %s subscription from %.*s", sca_event_name_from_type(sub->event), STR_FMT(&sub->subscriber)); - if(rc < 0) { - // make sure we unlock below - break; - } rc = sca_notify_subscriber( sca, sub, SCA_CALL_INFO_APPEARANCE_INDEX_ANY); diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index 6e9949a5d78..895141e1e25 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -1426,7 +1426,7 @@ int sca_subscription_reply(sca_mod *scam, int status_code, char *status_msg, extra_headers.s = hdr_buf; len = snprintf(extra_headers.s, sizeof(hdr_buf), "Event: %s%s", sca_event_name_from_type(event_type), CRLF); - if(len >= sizeof(hdr_buf) || len < 0) { + if(len < 0 || len >= sizeof(hdr_buf)) { LM_ERR("sca_subscription_reply: extra headers too long\n"); return (-1); } @@ -1446,7 +1446,7 @@ int sca_subscription_reply(sca_mod *scam, int status_code, char *status_msg, len = snprintf(extra_headers.s + extra_headers.len, sizeof(hdr_buf) - extra_headers.len, "Expires: %d%s", expires, CRLF); - if(len >= (sizeof(hdr_buf) - extra_headers.len) || len < 0) { + if(len < 0 || len >= (sizeof(hdr_buf) - extra_headers.len)) { LM_ERR("sca_subscription_reply: extra headers too long\n"); return (-1); }

1 0

git:master:6c129bdc: ratelimit: removed unnecessary condition
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: 6c129bdc87352d0d883cc46fce0b78444e619084 URL: https://github.com/kamailio/kamailio/commit/6c129bdc87352d0d883cc46fce0b784… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-31T09:22:28+01:00 ratelimit: removed unnecessary condition --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/6c129bdc87352d0d883cc46fce0b784… Patch: https://github.com/kamailio/kamailio/commit/6c129bdc87352d0d883cc46fce0b784… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index d993bbd6e98..4e327460044 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -1256,7 +1256,7 @@ static void rpc_set_queue(rpc_t *rpc, void *c) if(rpc->scan(c, "dSd", &queue_no, &method, &pipe_no) < 3) return; - if(pipe_no >= MAX_PIPES || (int)pipe_no < 0) { + if(pipe_no >= MAX_PIPES) { LM_ERR("Invalid pipe number: %d\n", pipe_no); rpc->fault(c, 400, "Invalid pipe number"); return;

1 0

git:master:a268f073: core: main - typos in log messages
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: a268f073bc9716fefc35248687d793bdcc6d66b9 URL: https://github.com/kamailio/kamailio/commit/a268f073bc9716fefc35248687d793b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-30T10:15:04+01:00 core: main - typos in log messages --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/a268f073bc9716fefc35248687d793b… Patch: https://github.com/kamailio/kamailio/commit/a268f073bc9716fefc35248687d793b… --- diff --git a/src/main.c b/src/main.c index c107f354672..fc1570c3b7a 100644 --- a/src/main.c +++ b/src/main.c @@ -2193,7 +2193,7 @@ int main(int argc, char **argv) /* safety check for upper limit of 1TB */ if(l1 <= 0 || l1 > 1024L * 1024) { fprintf(stderr, - "our of limits private mem size number: -M %s\n", + "out of limits private mem size number: -M %s\n", optarg); goto error; } @@ -2333,7 +2333,7 @@ int main(int argc, char **argv) } /* safety check for upper limit of 16TB */ if(l1 <= 0 || l1 > 16L * 1024 * 1024) { - fprintf(stderr, "our of limits shmem size number: -m %s\n", + fprintf(stderr, "out of limits shmem size number: -m %s\n", optarg); goto error; }

1 0

git:master:9410ce38: core: cfg.y - check limit for shm size
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: 9410ce3848c1ab7fa8b7ded47d090342fd4cf1c0 URL: https://github.com/kamailio/kamailio/commit/9410ce3848c1ab7fa8b7ded47d09034… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-30T10:05:29+01:00 core: cfg.y - check limit for shm size --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/9410ce3848c1ab7fa8b7ded47d09034… Patch: https://github.com/kamailio/kamailio/commit/9410ce3848c1ab7fa8b7ded47d09034… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 545ca7fdc66..c357faa927d 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1865,11 +1865,18 @@ assign_stm: | OPEN_FD_LIMIT EQUAL NUMBER { open_files_limit=$3; } | OPEN_FD_LIMIT EQUAL error { yyerror("number expected"); } | SHM_MEM_SZ EQUAL NUMBER { - if (shm_initialized()) + if (shm_initialized()) { yyerror("shm/shm_mem_size must be before any modparam or the" " route blocks"); - else if (shm_mem_size == 0 || shm_mem_size == SHM_MEM_POOL_SIZE) + } else if (shm_mem_size == 0 || shm_mem_size == SHM_MEM_POOL_SIZE) { + /* safety check for upper limit of 16TB */ + if($3 <= 0 || $3 > 16L * 1024 * 1024) { + LM_ERR("out of limits shmem size number: %ld\n", (long int)$3); + yyerror("invalid config option"); + YYABORT; + } shm_mem_size=$3 * 1024 * 1024; + } } | SHM_MEM_SZ EQUAL error { yyerror("number expected"); } | SHM_FORCE_ALLOC EQUAL NUMBER {

1 0

git:master:b59607bb: debugger: explicit cast for pointer arithmetic operation
by Daniel-Constantin Mierla 31 Dec '23

31 Dec '23

Module: kamailio Branch: master Commit: b59607bbcf6ca872e190dfcd9abf8fc5c0f64359 URL: https://github.com/kamailio/kamailio/commit/b59607bbcf6ca872e190dfcd9abf8fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-30T09:01:21+01:00 debugger: explicit cast for pointer arithmetic operation --- Modified: src/modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b59607bbcf6ca872e190dfcd9abf8fc… Patch: https://github.com/kamailio/kamailio/commit/b59607bbcf6ca872e190dfcd9abf8fc… --- diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index b6248644d65..c2d2dda79af 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -324,7 +324,7 @@ static struct action *dbg_fixup_get_action(void **param, int param_no) action_u_t *au; /* param points to au->u.string, get pointer to au */ au = ksr_container_of(param, action_u_t, u.string); - au = au - 1 - param_no; + au = (action_u_t *)au - 1 - param_no; /* au points to ac->val, get pointer to ac */ ac = ksr_container_of(au, cfg_action_t, val); return ac;

1 0

git:master:3d2bae35: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 29 Dec '23

29 Dec '23

Module: kamailio Branch: master Commit: 3d2bae3532e496648a902dac853edf013434672f URL: https://github.com/kamailio/kamailio/commit/3d2bae3532e496648a902dac853edf0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-12-29T10:01:51+01:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/3d2bae3532e496648a902dac853edf0… Patch: https://github.com/kamailio/kamailio/commit/3d2bae3532e496648a902dac853edf0…

1 0

git:master:3d6fecc6: siputils: docs for tel2sip2() function
by Daniel-Constantin Mierla 29 Dec '23

29 Dec '23

Module: kamailio Branch: master Commit: 3d6fecc6bc6d52f56d0fdd4e075a15032da91421 URL: https://github.com/kamailio/kamailio/commit/3d6fecc6bc6d52f56d0fdd4e075a150… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-29T09:55:33+01:00 siputils: docs for tel2sip2() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3d6fecc6bc6d52f56d0fdd4e075a150… Patch: https://github.com/kamailio/kamailio/commit/3d6fecc6bc6d52f56d0fdd4e075a150… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 63984c60c67..d2197b1c3f4 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -539,13 +539,15 @@ if (uri_param_rm("param1")) { <para> The conversion follows the rules in RFC 3261 section 19.1.6: <itemizedlist> - <listitem> - <para>Visual separators ( "-", ".", "(", ")" ) are removed from tel URI number before converting it to SIP URI userinfo.</para> + <listitem> + <para>Visual separators ( "-", ".", "(", ")" ) are removed + from tel URI number before converting it to SIP URI userinfo.</para> </listitem> <listitem> - <para>tel URI parameters are downcased before appending them to SIP URI userinfo</para> - </listitem> - </itemizedlist> + <para>tel URI parameters are downcased before appending them + to SIP URI userinfo</para> + </listitem> + </itemizedlist> </para> <para> The SIP URI hostpart is taken from second param @@ -569,6 +571,36 @@ tel2sip("$ru", $fd", "$ru"); tel2sip("$ru", $fd", "$ru"); # $ru: sip:+12345678;ext=200;isub=+123-456@foo.com;user=phone ... +</programlisting> + </example> + </section> + <section id="siputils.f.tel2sip2"> + <title> + <function moreinfo="none">tel2sip2(uri, hostpart, result)</function> + </title> + <para> + Alternative to sip2tel() function that tries to follow closer the RFC + requrements (e.g., sort tel: uri parameters copied to the sip: uri in + the manner defined in the standard; deletes the phone-context parameter + if it is a domain, and, takes visual separators from the phone-context + parameter if it is a telephone number). + </para> + <para> + Its parameters have the same meaning as for tel2sip(). + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + BRANCH_ROUTE, or ONREPLY_ROUTE. + </para> + <example> + <title><function>tel2sip2</function> usage</title> + <programlisting format="linespecific"> +... +# $ru: tel:+(34)-999-888-777 +# $fu: sip:test@foo.com +tel2sip2("$ru", $fd", "$ru"); +# $ru: sip:+34999888777@foo.com;user=phone +... </programlisting> </example> </section>

1 0

git:master:366e2862: siputils: added tel2sip2() function
by Daniel-Constantin Mierla 29 Dec '23

29 Dec '23

Module: kamailio Branch: master Commit: 366e28627dc7047d4dce2aefe67b5e97b5ae6682 URL: https://github.com/kamailio/kamailio/commit/366e28627dc7047d4dce2aefe67b5e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-29T09:43:10+01:00 siputils: added tel2sip2() function - based on proposal presented at: https://github.com/kamailio/kamailio/issues/1173#issuecomment-315198949 - alternative to tel2sip() which has a simpler approach, but it does not follow all the RFC requirements. This is still kept as it proved to be useful over the years Co-authored-by: Donald Carr <doncarr(a)gmail.com> Co-authored-by: Supreeth Herle <herlesupreeth(a)gmail.com> --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/366e28627dc7047d4dce2aefe67b5e9… Patch: https://github.com/kamailio/kamailio/commit/366e28627dc7047d4dce2aefe67b5e9…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2023