sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

git:master:3467291d: siputils: new function uri_param_any(param)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3467291d80dba021e8684d203c50fb5a6b546bd8 URL: https://github.com/kamailio/kamailio/commit/3467291d80dba021e8684d203c50fb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T08:33:27+02:00 siputils: new function uri_param_any(param) - check if r-uri has the param, with or without value --- 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/3467291d80dba021e8684d203c50fb5… Patch: https://github.com/kamailio/kamailio/commit/3467291d80dba021e8684d203c50fb5… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 0c6b545abb..3e01eb9782 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -289,6 +289,73 @@ int ki_uri_param(sip_msg_t *_msg, str *sparam) return ki_uri_param_value(_msg, sparam, NULL); } +/* + * Check if param with or without value exists in Request URI + */ +int ki_uri_param_any(sip_msg_t *msg, str *sparam) +{ + str t; + str ouri; + sip_uri_t puri; + param_hooks_t hooks; + param_t* params, *pit; + + if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) { + ouri = msg->first_line.u.request.uri; + if(ouri.s == NULL) { + LM_ERR("r-uri not found\n"); + return -1; + } + } else { + ouri = msg->new_uri; + } + + if (parse_uri(ouri.s, ouri.len, &puri) < 0) { + LM_ERR("failed to parse r-uri [%.*s]\n", ouri.len, ouri.s); + return -1; + } + if(puri.sip_params.len>0) { + t = puri.sip_params; + } else if(puri.params.len>0) { + t = puri.params; + } else { + LM_DBG("no uri params [%.*s]\n", ouri.len, ouri.s); + return -1; + } + + if (parse_params(&t, CLASS_ANY, &hooks, &params) < 0) { + LM_ERR("ruri parameter parsing failed\n"); + return -1; + } + + for (pit = params; pit; pit = pit->next) { + if ((pit->name.len == sparam->len) + && (strncasecmp(pit->name.s, sparam->s, sparam->len) == 0)) { + break; + } + } + if(pit==NULL) { + free_params(params); + return -1; + } + + free_params(params); + return 1; +} + +/* + * Find if Request URI has a given parameter with or without value + */ +int w_uri_param_any(struct sip_msg* _msg, char* _param, char* _str2) +{ + str sparam; + if(fixup_get_svalue(_msg, (gparam_t*)_param, &sparam)<0) { + LM_ERR("failed to get parameter\n"); + return -1; + } + return ki_uri_param_any(_msg, &sparam); +} + /* * Adds a new parameter to Request URI */ diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 202ca47ed2..2a05bdd53d 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -157,4 +157,8 @@ int ki_uri_param_rm(sip_msg_t *msg, str *sparam); int w_uri_param_rm(struct sip_msg* _msg, char* _param, char* _str2); +int ki_uri_param_any(sip_msg_t *msg, str *sparam); + +int w_uri_param_any(struct sip_msg* _msg, char* _param, char* _str2); + #endif /* CHECKS_H */ diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index abeeb98eaf..33a3c40a61 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -137,6 +137,8 @@ static cmd_export_t cmds[]={ 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, {"uri_param", (cmd_function)uri_param_2, 2, fixup_spve_spve, 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, + {"uri_param_any", (cmd_function)w_uri_param_any, 1, fixup_spve_null, + 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, {"add_uri_param", (cmd_function)add_uri_param, 1, fixup_str_null, 0, REQUEST_ROUTE}, {"get_uri_param", (cmd_function)get_uri_param, 2, fixup_get_uri_param, @@ -589,6 +591,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("uri_param_any"), + SR_KEMIP_INT, ki_uri_param_any, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("uri_param_rm"), SR_KEMIP_INT, ki_uri_param_rm, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

4 years

[kamailio/kamailio] dispatcher : better distribution when using hash and destination is not available (#2362)

by Kalki70

#### Pre-Submission Checklist    - [ X] Commit message has the format required by CONTRIBUTING guide - [ X] Commits are split per component (core, individual modules, libs, utils, ...) - [ X] Each component has a single commit (if not, squash them into one commit) - [ X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ X] Tested changes locally - [ X] Related to issue #2361 #### Description When a destination is selected using one of the hash algorithms (over Call-ID, From, etc.) and destination is not available, then the next is selected. This causes the following problem : All messages to the unavailable destination will be sent to the same unique destination. This will cause that one destination will receive double load and the rest will continue with the same. Solution : To better distribute messages, while also guaranteeing the same distribution of the hash, a re-hash of the hash is made. As the rehash could select the same or other failed destination, it can rehash several times. The number of rehashes made is controlled by : modparam("dispatcher", "ds_rehash_max", -1) Which can take the following values : -1 : The total count of destinations is used 0 : Disabled. Reverts to original implementation. Positive number. Maximum number of rehashes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2362 -- Commit Summary -- * dispatcher : better distribution when using hash and destination is not available. -- File Changes -- M src/modules/dispatcher/dispatch.c (192) M src/modules/dispatcher/dispatcher.c (103) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2362.patch https://github.com/kamailio/kamailio/pull/2362.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2362

4 years

git:master:b31c885e: modules: readme files regenerated - siputils ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b31c885e5cb5331963f7d02d8a9d4cde9c6b57ef URL: https://github.com/kamailio/kamailio/commit/b31c885e5cb5331963f7d02d8a9d4cd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-17T08:31:23+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/b31c885e5cb5331963f7d02d8a9d4cd… Patch: https://github.com/kamailio/kamailio/commit/b31c885e5cb5331963f7d02d8a9d4cd…

4 years

Freezing development for Kamailio v5.4.0

by Daniel-Constantin Mierla

Hello, based on the discussions during the last online devel meeting, the plan is to release the next major version (Kamailio v5.4.0) around the mid of this summer. Therefore I propose to freeze the development on Thursday, June 18, 2020. Then we will have about 4-6 weeks of testing before the release is out. Master will be unfrozen when the branch 5.4 is created (usually that was done after 3-4 weeks in the testing phase). If you are planning to introduce new features in the 5.4 release series, be sure you push them to master branch or create a pull request till the freezing date. If anyone else wants a different time line for 5.4.0 release, let us know and we can discuss to match the best for everyone. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

4 years

git:master:1a96e1a1: siputils: docs for uri_param_rm() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1a96e1a17a65233a9cff946a1a0ef8237f63cf0c URL: https://github.com/kamailio/kamailio/commit/1a96e1a17a65233a9cff946a1a0ef82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-17T08:20:52+02:00 siputils: docs for uri_param_rm() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1a96e1a17a65233a9cff946a1a0ef82… Patch: https://github.com/kamailio/kamailio/commit/1a96e1a17a65233a9cff946a1a0ef82… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 6054ddf300..8dd72319c0 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -502,6 +502,34 @@ add_uri_param("nat=yes"); ... get_uri_param("nat", "$var(nat)"); ... +</programlisting> + </example> + </section> + <section> + <title id="siputils.f.uri_param_rm"> + <function moreinfo="none">uri_param_rm(param)</function> + </title> + <para> + Remove parameter from Request URI. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>param</emphasis> - parameter name. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE. + </para> + <example> + <title><function>uri_param_rm</function> usage</title> + <programlisting format="linespecific"> +... +if (uri_param_rm("param1")) { + ... +} +... </programlisting> </example> </section>

4 years

git:master:91235686: siputils: new function uri_param_rm(pname)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 912356869b7edcf569ebc3367650e238acf01eec URL: https://github.com/kamailio/kamailio/commit/912356869b7edcf569ebc3367650e23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-17T08:20:52+02:00 siputils: new function uri_param_rm(pname) - remove parameter from r-uri --- 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/912356869b7edcf569ebc3367650e23… Patch: https://github.com/kamailio/kamailio/commit/912356869b7edcf569ebc3367650e23…

4 years

git:master:916c56df: siputils: use rewrite_uri() to update decoded r-uri

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 916c56df9f8c633ba4c4d4a173e35eea8c23a343 URL: https://github.com/kamailio/kamailio/commit/916c56df9f8c633ba4c4d4a173e35ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-17T08:20:52+02:00 siputils: use rewrite_uri() to update decoded r-uri --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/916c56df9f8c633ba4c4d4a173e35ee… Patch: https://github.com/kamailio/kamailio/commit/916c56df9f8c633ba4c4d4a173e35ee… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 796656ea52..a299db32e5 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -902,26 +902,13 @@ int ki_contact_param_decode_ruri(sip_msg_t *msg, str *nparam) LM_ERR("failed to decode uri [%.*s]\n", uri.len, uri.s); return -1; } - nval.s = (char*)pkg_malloc((nval.len+1)*sizeof(char)); - if(nval.s==NULL) { - free_params(params); - PKG_MEM_ERROR; - return -1; - } - memcpy(nval.s, bnval, nval.len); - nval.s[nval.len] = '\0'; + nval.s = bnval; + free_params(params); LM_DBG("decoded new uri [%.*s] (%d)\n", nval.len, nval.s, nval.len); - - if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) { - msg->new_uri = nval; - } else { - pkg_free(msg->new_uri.s); - msg->new_uri = nval; + if(rewrite_uri(msg, &nval) < 0) { + return -1; } - ruri_mark_new(); /* re-use uri for serial forking */ - - free_params(params); return 1; }

4 years

New feature : feature/rehash_of_hash

by Luis Rojas

Hello, guys, I developed a feature, which I called "feature/rehash_of_hash" and wanted to push to github, for the maintainers to review it and see if it could be accepted into kamailio. it is related to the following post, which no one responded :-( https://lists.kamailio.org/pipermail/sr-users/2020-June/109516.html I wrote to that list with my work email. It seems, confirmation emails for subscription to this list are been blocked by my work's email servers, so I subscribed now with my personal email. Basically, this is the issue, related to the dispatcher module . If distribution is based on a hash of a header (Call-ID, From, etc) and destination is not available, just a "next" is selected. That causes that all calls are sent to the same destination. I opened an issue with this : https://github.com/kamailio/kamailio/issues/2361 I also opened a pull request with the solution. https://github.com/kamailio/kamailio/pull/2362 I don't understand why it shows so many changes on my two modified files. I forked, cloned to my notebook and pushed back. For instance, lines 82 to 97 in src/modules/dispatcher/dispatch.c , which I did not modify. What did I do wrong? Best regards, Luis

4 years

git:master:cadcdd7c: modules: readme files regenerated - ims_charging ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: cadcdd7c9e8f893110958d1445f1a1d546a4174e URL: https://github.com/kamailio/kamailio/commit/cadcdd7c9e8f893110958d1445f1a1d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-16T22:01:10+02:00 modules: readme files regenerated - ims_charging ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/cadcdd7c9e8f893110958d1445f1a1d… Patch: https://github.com/kamailio/kamailio/commit/cadcdd7c9e8f893110958d1445f1a1d…

4 years

git:master:f28b172a: ims_charging: add support for Application-Provided-Called-Party-Address AVP

by Henning Westerholt

Module: kamailio Branch: master Commit: f28b172aaf951c49a57f97f8fa48ce4b4287a2ac URL: https://github.com/kamailio/kamailio/commit/f28b172aaf951c49a57f97f8fa48ce4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-16T19:49:17Z ims_charging: add support for Application-Provided-Called-Party-Address AVP --- Modified: src/modules/ims_charging/Ro_data.c Modified: src/modules/ims_charging/Ro_data.h Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/doc/ims_charging_admin.xml Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ims_ro.h Modified: src/modules/ims_charging/ro_session_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/f28b172aaf951c49a57f97f8fa48ce4… Patch: https://github.com/kamailio/kamailio/commit/f28b172aaf951c49a57f97f8fa48ce4…

4 years

← Newer
1
...
20
21
22
23
24
25
26
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020