sr-dev July 2021

sr-dev@lists.kamailio.org

13 participants
228 discussions

[kamailio/kamailio] rtpengine: rtpengine_allow_op return node logic (#2800)
by descartin 13 Jul '21

13 Jul '21

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 … [View More]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 [View Less]

3 10

git:master:3f7a6240: rtpengine: small debug log fix after merge of #2800
by Henning Westerholt 13 Jul '21

13 Jul '21

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: … [View More]

1 0

git:master:f653ea8c: rtpengine: add mode 2 for rtpengine_allow_op to return only manually disabled nodes
by Henning Westerholt 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: f653ea8c05e6916ff14e7da491bcd68f928b97af URL: https://github.com/kamailio/kamailio/commit/f653ea8c05e6916ff14e7da491bcd68… Author: david <you(a)example.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-13T15:01:15+02:00 rtpengine: add mode 2 for rtpengine_allow_op to return only manually disabled nodes --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: … [View More]https://github.com/kamailio/kamailio/commit/f653ea8c05e6916ff14e7da491bcd68… Patch: https://github.com/kamailio/kamailio/commit/f653ea8c05e6916ff14e7da491bcd68… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index ef7d5a4fd7..731e4c6d56 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -259,8 +259,9 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) <section id="rtpengine.p.rtpengine_allow_op"> <title><varname>rtpengine_allow_op</varname> (integer)</title> <para> - Enable this setting to allow finishing the current sessions while denying new sessions for the - <emphasis>manually deactivated nodes </emphasis> via kamctl command i.e. "disabled(permanent)" nodes. + Enable this setting to allow finishing the current sessions while denying new sessions for deactivated nodes. + </para> + <para>Nodes can be <emphasis>manually deactivated </emphasis> via kamctl command i.e. "disabled(permanent)" nodes. Probably the manually deactivated machine is still running(did not crash). </para> <para> @@ -279,6 +280,18 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) Default value is <quote>0</quote> to keep the current behaviour. </emphasis> </para> + <para> + <emphasis> + If value set to <quote>1</quote> it will send commands to all disabled nodes for the + existing call. + </emphasis> + </para> + <para> + <emphasis> + If value set to <quote>2</quote> it will send commands only to manually disabled + nodes. (Not when timeout is disabled or node broken) + </emphasis> + </para> <example> <title>Set <varname>rtpengine_allow_op</varname> parameter</title> <programlisting format="linespecific"> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 1777ebc98f..28c058c2ee 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3347,8 +3347,10 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer } else { LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled! Return it\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); + if (rtpengine_allow_op == 1) { + return node; + } } - /*return node;*/ } return NULL; [View Less]

1 0

git:master:97620f9e: rtpengine: On rtpengine_allow_op, return node only if rtpengine is manually disabled
by Henning Westerholt 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: 97620f9ed633e8e5e9d719cb023e60a890ebb3f8 URL: https://github.com/kamailio/kamailio/commit/97620f9ed633e8e5e9d719cb023e60a… Author: david <you(a)example.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-13T15:01:15+02:00 rtpengine: On rtpengine_allow_op, return node only if rtpengine is manually disabled --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:84e3191c: pv: added $via1(...) - return attributes of 2nd via
by Daniel-Constantin Mierla 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: 84e3191c165f00aaba61174dd627d7e67b57f8c7 URL: https://github.com/kamailio/kamailio/commit/84e3191c165f00aaba61174dd627d7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-13T09:12:17+02:00 pv: added $via1(...) - return attributes of 2nd via --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https:/… [View More]

1 0

[kamailio/kamailio] warning_builder(): buffer size exceeded (probably too long URI) (#2799)
by Andrew Webster 13 Jul '21

13 Jul '21

Jul 12 10:43:50 host-sbc /usr/local/sbin/kamailio[4587]: ALERT: <script>: ALERT: route failure INVITE from sip:anonymous@anonymous.invalid (IP:52.114.148.0:6529) : <null> Jul 12 10:43:50 host-sbc /usr/local/sbin/kamailio[4587]: NOTICE: <core> [core/msg_translator.c:314]: warning_builder(): buffer size exceeded (probably too long URI) Jul 12 10:43:50 host-sbc /usr/local/sbin/kamailio[4587]: WARNING: <core> [core/msg_translator.c:2483]: build_res_buf_from_sip_req(): … [View More]

2 4

git:5.5:1f9f6fff: core: set MAX_WARNING_LEN to 1024
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 1f9f6fff6e0ab21e460538ffd1e54b6c60f54f7e URL: https://github.com/kamailio/kamailio/commit/1f9f6fff6e0ab21e460538ffd1e54b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:36:24+02:00 core: set MAX_WARNING_LEN to 1024 - 256 can be too short - close GH #2799 (cherry picked from commit 0d06e164efa720d91d49995585e80c9082ce3b21) --- Modified: src/core/config.h -… [View More]

1 0

git:5.5:304ac124: topos: fix missing xavu_field_contact_host evaluation for contact_mode 0
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 304ac124e6ad86b60071b6c5ecf861e03b7e492b URL: https://github.com/kamailio/kamailio/commit/304ac124e6ad86b60071b6c5ecf861e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:36:10+02:00 topos: fix missing xavu_field_contact_host evaluation for contact_mode 0 - fix missing xavu_field_contact_host evaluation for contact_mode 0 - it works currently only for contact_mode 1 … [View More]

1 0

git:5.5:65249c18: core: fix building quoted value for #!subsdefs
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 65249c184f5fd54b3ea16edbda518ac7ff442d86 URL: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:34:42+02:00 core: fix building quoted value for #!subsdefs (cherry picked from commit 879f8c4e52ab7f7f489107f18e2c80795c788bdd) --- Modified: src/core/cfg.lex Modified: src/core/cfg.y … [View More]Modified: src/core/ppcfg.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… Patch: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index ff8096d9f2..a6115a7599 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2049,11 +2049,12 @@ int pp_define_set(int len, char *text, int mode) pp_defines[ppos].value.len = len; pp_defines[ppos].value.s = text; - LM_DBG("### setting define ID [%.*s] value [%.*s]\n", + LM_DBG("### setting define ID [%.*s] value [%.*s] (mode: %d)\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s, pp_defines[ppos].value.len, - pp_defines[ppos].value.s); + pp_defines[ppos].value.s, + mode); return 0; } diff --git a/src/core/cfg.y b/src/core/cfg.y index be0a664dce..5b205fd230 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2213,9 +2213,9 @@ event_route_stm: preprocess_stm: SUBST STRING { if(pp_subst_add($2)<0) YYERROR; } | SUBST error { yyerror("invalid subst preprocess statement"); } - | SUBSTDEF STRING { if(pp_substdef_add($2, 0)<0) YYERROR; } + | SUBSTDEF STRING { if(pp_substdef_add($2, KSR_PPDEF_NORMAL)<0) YYERROR; } | SUBSTDEF error { yyerror("invalid substdef preprocess statement"); } - | SUBSTDEFS STRING { if(pp_substdef_add($2, 1)<0) YYERROR; } + | SUBSTDEFS STRING { if(pp_substdef_add($2, KSR_PPDEF_QUOTED)<0) YYERROR; } | SUBSTDEFS error { yyerror("invalid substdefs preprocess statement"); } ; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 73c0a2ef3c..67391557f8 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "pvapi.h" #include "str_list.h" #include "dprint.h" @@ -149,25 +150,40 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); - if(sb==NULL) { - LM_ERR("failed to handle substdef: [%s]\n", data); - return -1; + if(mode!=KSR_PPDEF_QUOTED) { + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } else { + defvalue = newval; } - defvalue = sb->s; } } - if(pp_define_set(defvalue.len, defvalue.s, - (mode==1)?KSR_PPDEF_QUOTED:KSR_PPDEF_NORMAL)<0) { + if(mode==KSR_PPDEF_QUOTED) { + if(pv_get_buffer_size() < defvalue.len + 4) { + LM_ERR("defined value is too large\n"); + return -1; + } + newval.s = pv_get_buffer(); + newval.s[0] = '"'; + memcpy(newval.s + 1, defvalue.s, defvalue.len); + newval.s[defvalue.len + 1] = '"'; + newval.s[defvalue.len + 2] = '\0'; + newval.len = defvalue.len + 2; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } + if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_QUOTED)<0) { LM_ERR("cannot set define value\n"); goto error; } - if(mode==1) { - defvalue.s++; - defvalue.len -= 2; - *(defvalue.s-1) = c; - defvalue.s[defvalue.len] = c; - } LM_DBG("### added substdef: [%.*s]=[%.*s] (%d)\n", defname.len, defname.s, defvalue.len, defvalue.s, mode); diff --git a/src/main.c b/src/main.c index a391f57afb..7630fcfeff 100644 --- a/src/main.c +++ b/src/main.c @@ -2330,7 +2330,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdef parameter\n"); goto error; } - if(pp_substdef_add(optarg, 0)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_NORMAL)<0) { LM_ERR("failed to add substdef expression: %s\n", optarg); goto error; } @@ -2340,7 +2340,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdefs parameter\n"); goto error; } - if(pp_substdef_add(optarg, 1)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_QUOTED)<0) { LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; } [View Less]

1 0

git:5.5:6bf1c6af: core: ppcfg - clone value for substdef
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 6bf1c6af774f6b26597e639e90ce7cb584b626a3 URL: https://github.com/kamailio/kamailio/commit/6bf1c6af774f6b26597e639e90ce7cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:34:30+02:00 core: ppcfg - clone value for substdef - GH #2788 (cherry picked from commit 56d41f6238f39d0046c97527abcb23b8dd7924be) --- Modified: src/core/ppcfg.c --- Diff: https://… [View More]

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2021