sr-dev July 2021

sr-dev@lists.kamailio.org

13 participants
226 discussions

git:master:126f89e7: modules: readme files regenerated - ruxc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 126f89e72212cee96d0ef3e7b43c249ab9c4429c URL: https://github.com/kamailio/kamailio/commit/126f89e72212cee96d0ef3e7b43c249… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-19T17:31:13+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/126f89e72212cee96d0ef3e7b43c249… Patch: https://github.com/kamailio/kamailio/commit/126f89e72212cee96d0ef3e7b43c249… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index e950003124..e3c9dae852 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2021 http://www.asipto.com + Copyright Â© 2021 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -109,7 +109,7 @@ modparam("ruxc", "http_timeout", 2000) 4.1. ruxc_http_get(url, hdrs, respv) 4.2. ruxc_http_post(url, body, hdrs, respv) -4.1. ruxc_http_get(url, hdrs, respv) +4.1. ruxc_http_get(url, hdrs, respv) Perform a HTTP GET request to "url", storing the response body in the "respv" variable. The "hdrs" can be empty string to skip setting them. @@ -123,15 +123,15 @@ modparam("ruxc", "http_timeout", 2000) Example 1.2. ruxc_http_get() usage ... -http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu -{s.escape.param})", +ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s +.escape.param})", "", "X-Token: abc", "$var(result)"); switch ($rc) { ... } ... -4.2. ruxc_http_post(url, body, hdrs, respv) +4.2. ruxc_http_post(url, body, hdrs, respv) Perform a HTTP POST request to "url", storing the response body in the "respv" variable. The "body" and "hdrs" can be empty strings to skip

2 years, 9 months

git:master:cbc38427: ruxc: docs - fixed typo in function name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cbc3842771393c71fe81f8eae87c1a7dbfd38974 URL: https://github.com/kamailio/kamailio/commit/cbc3842771393c71fe81f8eae87c1a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T16:35:36+02:00 ruxc: docs - fixed typo in function name --- Modified: src/modules/ruxc/doc/ruxc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cbc3842771393c71fe81f8eae87c1a7… Patch: https://github.com/kamailio/kamailio/commit/cbc3842771393c71fe81f8eae87c1a7… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index af6ac8a0de..059b64854a 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -104,7 +104,7 @@ modparam("ruxc", "http_timeout", 2000) <title><function>ruxc_http_get()</function> usage</title> <programlisting format="linespecific"> ... -http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", +ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", "", "X-Token: abc", "$var(result)"); switch ($rc) { ...

2 years, 9 months

Why sip_msg_apply_changes can't be executed from BRANCH_FAILURE_ROUTE?

by Ivan Ribakov

Hi all, I need to modify headers and body of the ingress INVITE in the BRANCH_FAILURE_ROUTE block to reflect failure to deliver message to the first destination and include some additional information. However checking the documentation of the “sip_msg_apply_changes” (https://github.com/kamailio/kamailio/blob/master/src/core/msg_translator.c#…) I can see that it can only be executed from request and reply routes. That seems overly restrictive. Can someone shine some light on why is that and whether it’s safe to patch this part of the code to allow function execution from BRANCH_FAILURE_ROUTE as well? Thanks in advance, Ivan

2 years, 9 months

git:master:abba6969: ruxc: set response variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: abba69691efad80d208aeb000bf0382f94dfec71 URL: https://github.com/kamailio/kamailio/commit/abba69691efad80d208aeb000bf0382… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T10:19:14+02:00 ruxc: set response variable --- Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/abba69691efad80d208aeb000bf0382… Patch: https://github.com/kamailio/kamailio/commit/abba69691efad80d208aeb000bf0382… --- diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 2f5e6ae86a..2d100d373c 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -122,6 +122,7 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, { RuxcHTTPRequest v_http_request = {0}; RuxcHTTPResponse v_http_response = {0}; + pv_value_t val = {0}; int ret; v_http_request.timeout = _ruxc_http_timeout; @@ -147,6 +148,14 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, LM_DBG("response code: %d - data len: %d - data: [%.*s]\n", v_http_response.rescode, v_http_response.resdata_len, v_http_response.resdata_len, v_http_response.resdata); + val.rs.s = v_http_response.resdata; + val.rs.len = v_http_response.resdata_len; + val.flags = PV_VAL_STR; + if(dst->setf) { + dst->setf(_msg, &dst->pvp, (int)EQ_T, &val); + } else { + LM_WARN("target pv is not writable\n"); + } } ret = v_http_response.rescode; } @@ -209,6 +218,7 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h { RuxcHTTPRequest v_http_request = {0}; RuxcHTTPResponse v_http_response = {0}; + pv_value_t val = {0}; int ret; v_http_request.timeout = _ruxc_http_timeout; @@ -239,6 +249,14 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h LM_DBG("response code: %d - data len: %d - data: [%.*s]\n", v_http_response.rescode, v_http_response.resdata_len, v_http_response.resdata_len, v_http_response.resdata); + val.rs.s = v_http_response.resdata; + val.rs.len = v_http_response.resdata_len; + val.flags = PV_VAL_STR; + if(dst->setf) { + dst->setf(_msg, &dst->pvp, (int)EQ_T, &val); + } else { + LM_WARN("target pv is not writable\n"); + } } ret = v_http_response.rescode; }

2 years, 9 months

git:master:6be39f68: Makefile.groups: added group for ruxc module

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6be39f6864a56a5ff56dab3be1bb5fd749df387e URL: https://github.com/kamailio/kamailio/commit/6be39f6864a56a5ff56dab3be1bb5fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T08:38:55+02:00 Makefile.groups: added group for ruxc module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/6be39f6864a56a5ff56dab3be1bb5fd… Patch: https://github.com/kamailio/kamailio/commit/6be39f6864a56a5ff56dab3be1bb5fd… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 4eea749671..99a990ad83 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -226,6 +226,9 @@ mod_list_mqtt=mqtt # - modules depending on nats and ev library mod_list_nats=nats +# - modules depending on ruxc library +mod_list_ruxc=ruxc + # - modules depending on secsipid library mod_list_secsipid=secsipid secsipid_proc @@ -268,6 +271,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_kafka) \ $(mod_list_mqtt) \ $(mod_list_nats) \ + $(mod_list_ruxc) \ $(mod_list_secsipid) \ $(mod_list_jwt) \ $(mod_list_lwsc) \ @@ -504,6 +508,9 @@ module_group_kmqtt=$(mod_list_mqtt) # K nats modules module_group_knats=$(mod_list_nats) +# K ruxc modules +module_group_kruxc=$(mod_list_ruxc) + # K secsipid modules module_group_ksecsipid=$(mod_list_secsipid)

2 years, 9 months

git:master:81de7878: ruxc: new module with utility functions from libruxc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 81de7878ff4706ba331fa787cc63dea562e6a814 URL: https://github.com/kamailio/kamailio/commit/81de7878ff4706ba331fa787cc63dea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T08:32:48+02:00 ruxc: new module with utility functions from libruxc - first target is to provide http get/post functions that do not depend on libcurl+libssl --- Added: src/modules/ruxc/Makefile Added: src/modules/ruxc/README Added: src/modules/ruxc/doc/Makefile Added: src/modules/ruxc/doc/ruxc.xml Added: src/modules/ruxc/doc/ruxc_admin.xml Added: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/81de7878ff4706ba331fa787cc63dea… Patch: https://github.com/kamailio/kamailio/commit/81de7878ff4706ba331fa787cc63dea…

2 years, 9 months

git:master:851a8c0f: kemix: added KSR.kx.ifdef() and KSR.kx.ifndef()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 851a8c0f0c8f7cc7ab22cb905bdb3987e9fa461b URL: https://github.com/kamailio/kamailio/commit/851a8c0f0c8f7cc7ab22cb905bdb398… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-14T10:08:50+02:00 kemix: added KSR.kx.ifdef() and KSR.kx.ifndef() - return true/false if a specified id is defined or not --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/851a8c0f0c8f7cc7ab22cb905bdb398… Patch: https://github.com/kamailio/kamailio/commit/851a8c0f0c8f7cc7ab22cb905bdb398… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 1633188089..2b6f6ec9c2 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -1138,6 +1138,36 @@ static int ki_kx_get_defn(sip_msg_t *msg, str *dname) return n; } +/** + * + */ +static int ki_kx_ifdef(sip_msg_t *msg, str *dname) +{ + str *val; + + val = pp_define_get(dname->len, dname->s); + + if (val!=NULL) { + return SR_KEMI_TRUE; + } + return SR_KEMI_FALSE; +} + +/** + * + */ +static int ki_kx_ifndef(sip_msg_t *msg, str *dname) +{ + str *val; + + val = pp_define_get(dname->len, dname->s); + + if (val==NULL) { + return SR_KEMI_TRUE; + } + return SR_KEMI_FALSE; +} + /** * */ @@ -1505,6 +1535,16 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("ifdef"), + SR_KEMIP_BOOL, ki_kx_ifdef, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("ifndef"), + SR_KEMIP_BOOL, ki_kx_ifndef, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_env"), SR_KEMIP_XVAL, ki_kx_get_env, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

2 years, 9 months

git:master:ed518fd6: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: ed518fd6fa4652e2a06a09e6d54ce5b19d0b9493 URL: https://github.com/kamailio/kamailio/commit/ed518fd6fa4652e2a06a09e6d54ce5b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-13T15:16:15+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/ed518fd6fa4652e2a06a09e6d54ce5b… Patch: https://github.com/kamailio/kamailio/commit/ed518fd6fa4652e2a06a09e6d54ce5b… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 24d02d1c5d..8a1abb2643 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -648,9 +648,11 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) 4.5. rtpengine_allow_op (integer) Enable this setting to allow finishing the current sessions while - denying new sessions for the manually deactivated nodes via kamctl - command i.e. "disabled(permanent)" nodes. Probably the manually - deactivated machine is still running(did not crash). + denying new sessions for deactivated nodes. + + Nodes can be manually deactivated via kamctl command i.e. + "disabled(permanent)" nodes. Probably the manually deactivated machine + is still running(did not crash). This is useful when deactivating a node for maintenance and reject new sessions but allow current ones to finish. @@ -664,6 +666,12 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) Default value is “0” to keep the current behaviour. + If value set to “1” it will send commands to all disabled nodes for the + existing call. + + If value set to “2” it will send commands only to manually disabled + nodes. (Not when timeout is disabled or node broken) + Example 1.5. Set rtpengine_allow_op parameter ... modparam("rtpengine", "rtpengine_allow_op", 1)

2 years, 9 months

[kamailio/kamailio] rtpengine: rtpengine_allow_op return node logic (#2800)

by descartin

When using rtpengine_allow_op param, return node for ongoing calls only if rtpengine is manually disabled. When a rtpengine instance is disabled, rtpengine_allow_op will allow the indialog requests to be processed through that rtpengine. But it's not desirable to return the node when the rtpengine has unexpectedly crashed or has any undesired issues, because the rtp commands attempted cause congestion problem in the kamailio. So with this patch we only return the node if the rtpengine has been manually disabled and it's still supposed to be working.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2800 -- Commit Summary -- * rtpengine: On rtpengine_allow_op, return node only if rtpengine is manually disabled -- File Changes -- M src/modules/rtpengine/rtpengine.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2800.patch https://github.com/kamailio/kamailio/pull/2800.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/2800

2 years, 9 months

git:master:3f7a6240: rtpengine: small debug log fix after merge of #2800

by Henning Westerholt

Module: kamailio Branch: master Commit: 3f7a6240215a76e9584e34459a1fcfe78a794611 URL: https://github.com/kamailio/kamailio/commit/3f7a6240215a76e9584e34459a1fcfe… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-13T13:04:10Z rtpengine: small debug log fix after merge of #2800 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/3f7a6240215a76e9584e34459a1fcfe… Patch: https://github.com/kamailio/kamailio/commit/3f7a6240215a76e9584e34459a1fcfe… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 28c058c2ee..86b5dc484c 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3345,9 +3345,10 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); return node; } else { - LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled! Return it\n", + LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled!\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); if (rtpengine_allow_op == 1) { + LM_DBG("Return it\n"); return node; } }

2 years, 9 months

← Newer
1
...
15
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2021