sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
311 discussions

git:master:7d1e1a34: pv: support for Record-Route in $hfl(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7d1e1a349d5590f3754976b2e169fd30795c7f1b URL: https://github.com/kamailio/kamailio/commit/7d1e1a349d5590f3754976b2e169fd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T12:23:40+02:00 pv: support for Record-Route in $hfl(...) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/7d1e1a349d5590f3754976b2e169fd3… Patch: https://github.com/kamailio/kamailio/commit/7d1e1a349d5590f3754976b2e169fd3… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 4dc6d56882..65afab14e9 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2190,6 +2190,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int idxf = 0; pv_value_t tv = {0}; via_body_t *vb = NULL; + rr_t *rrb = NULL; hdr_field_t *hf = NULL; int n = 0; str sval = STR_NULL; @@ -2228,7 +2229,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) if((tv.flags == 0) && (tv.ri==HDR_VIA_T)) { if(idx<0) { n = 1; - /* count Vua header bodies */ + /* count Via header bodies */ for(hf=msg->h_via1; hf!=NULL; hf=hf->next) { if(hf->type==HDR_VIA_T) { for(vb=(via_body_t*)hf->parsed; vb!=NULL; vb=vb->next) { @@ -2270,6 +2271,64 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_DBG("unexpected via index out of range\n"); return pv_get_null(msg, param, res); } + if((tv.flags == 0) && (tv.ri==HDR_RECORDROUTE_T)) { + if(idx<0) { + n = 1; + /* count Record-Route header bodies */ + for(hf=msg->record_route; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_RECORDROUTE_T) { + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + for(rrb=(rr_t*)hf->parsed; vb!=NULL; rrb=rrb->next) { + n++; + } + } + } + + idx = -idx; + if(idx>n) { + LM_DBG("index out of rr headers range\n"); + return pv_get_null(msg, param, res); + } + idx = n - idx; + } + if(idx==0) { + if(parse_rr(msg->record_route) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + rrb = (rr_t*)(msg->record_route->parsed); + sval.s = rrb->nameaddr.name.s; + sval.len = rrb->len; + trim(&sval); + res->rs = sval; + return 0; + } + n=0; + for(hf=msg->record_route; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_RECORDROUTE_T) { + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + for(rrb=(rr_t*)hf->parsed; vb!=NULL; rrb=rrb->next) { + if(n==idx) { + sval.s = rrb->nameaddr.name.s; + sval.len = rrb->len; + trim(&sval); + res->rs = sval; + return 0; + } + n++; + } + } + } + LM_DBG("unexpected record-route index out of range\n"); + return pv_get_null(msg, param, res); + } + return pv_get_hdr_helper(msg, param, res, &tv, idx, idxf); }

2 years, 11 months

git:5.4:be668987: ChangeLog: content updated for v5.4.6

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: be668987e9296232a00fa7bba82bc72abd72a743 URL: https://github.com/kamailio/kamailio/commit/be668987e9296232a00fa7bba82bc72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T11:27:34+02:00 ChangeLog: content updated for v5.4.6 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/be668987e9296232a00fa7bba82bc72… Patch: https://github.com/kamailio/kamailio/commit/be668987e9296232a00fa7bba82bc72…

2 years, 11 months

git:5.4:0546511e: pkg/kamailio/deb: version set 5.4.6

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 0546511ed7eb47004c2df2f0806dff413468a1c4 URL: https://github.com/kamailio/kamailio/commit/0546511ed7eb47004c2df2f0806dff4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T11:23:35+02:00 pkg/kamailio/deb: version set 5.4.6 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0546511ed7eb47004c2df2f0806dff4… Patch: https://github.com/kamailio/kamailio/commit/0546511ed7eb47004c2df2f0806dff4…

2 years, 11 months

git:5.4:a2b34363: Makefile.defs: version set to 5.4.6

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: a2b34363aa5e97f171d933b08dc57f8e7a1b3d58 URL: https://github.com/kamailio/kamailio/commit/a2b34363aa5e97f171d933b08dc57f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T10:44:48+02:00 Makefile.defs: version set to 5.4.6 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a2b34363aa5e97f171d933b08dc57f8… Patch: https://github.com/kamailio/kamailio/commit/a2b34363aa5e97f171d933b08dc57f8… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 621f646b23..40bbef82bc 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = # memory manager switcher

2 years, 11 months

git:5.4:aaa556f2: pkg: version set to 5.4.6 for rpms and apline

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: aaa556f2d5a80e7a0bfa609d2478a9b75a530d0b URL: https://github.com/kamailio/kamailio/commit/aaa556f2d5a80e7a0bfa609d2478a9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-02T10:12:15+02:00 pkg: version set to 5.4.6 for rpms and apline --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/aaa556f2d5a80e7a0bfa609d2478a9b… Patch: https://github.com/kamailio/kamailio/commit/aaa556f2d5a80e7a0bfa609d2478a9b… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index e6576c616a..f4ff87ce2d 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.5 +pkgver=5.4.6 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ba4cb80618..e73c048b22 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.5 +%define ver 5.4.6 %define rel dev1.0%{dist} %if 0%{?fedora}

2 years, 11 months

Releasing Kamailio v5.4.6

by Daniel-Constantin Mierla

Hello, I am considering to release Kamailio v5.4.6 sometime next week, likely on Wednesday or Thursday (June 2 or 3, 2021). This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

2 years, 11 months

param.count broken in latest master?

by Juha Heinanen

This used to work: $var(count) = $(var(servers){param.count,%}); but latest master gives: Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) INFO: pv [pv_shv.c:60]: shvar_init_locks(): locks array size 16 Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: pv [pv_trans.c:3254]: tr_parse_paramlist(): invalid count transformation: count,%}! Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: <core> [core/pvapi.c:1799]: tr_lookup(): error parsing [{param.count,%}] Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: <core> [core/pvapi.c:1106]: pv_parse_spec2(): bad tr in pvar name "var" Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) ERROR: <core> [core/pvapi.c:1131]: pv_parse_spec2(): invalid parsing in [$(var(servers){param.count,%})] at (4) Jun 1 16:02:04 lab sip-proxy[11965]: 0(12020) CRITICAL: <core> [core/cfg.y:3683]: yyerror_at(): parse error in config file /etc/sip-proxy/sip-proxy.cfg, line 7591, column 19-48: Can't get from cache: $(var(servers){param.count,%}) -- Juha

2 years, 11 months

git:master:6e8e5ed1: pv: fix {param.count} transformation broken by previous commit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6e8e5ed121028bd851d7de214271881a0bb1e4d3 URL: https://github.com/kamailio/kamailio/commit/6e8e5ed121028bd851d7de214271881… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T19:45:16+02:00 pv: fix {param.count} transformation broken by previous commit --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/6e8e5ed121028bd851d7de214271881… Patch: https://github.com/kamailio/kamailio/commit/6e8e5ed121028bd851d7de214271881… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 6ad760f19a..98cce7caa8 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -3203,6 +3203,28 @@ char* tr_parse_paramlist(str* in, trans_t *t) goto unknown; } + if(t->subtype == TR_PL_COUNT) { + if(*p==TR_PARAM_MARKER) { + start_pos = ++p; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + if (t->params->type != TR_PARAM_SPEC && p - start_pos != 1) { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; + } + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) { + LM_ERR("invalid name transformation: %.*s!\n", + in->len, in->s); + goto error; + } + } + goto done; + } + + /* now transformations with mandatory parameters */ if(*p!=TR_PARAM_MARKER) { LM_ERR("invalid %.*s transformation: %.*s\n", @@ -3223,29 +3245,15 @@ char* tr_parse_paramlist(str* in, trans_t *t) while(is_in_str(p, in) && (*p==' ' || *p=='\t' || *p=='\n')) p++; } - if(t->subtype == TR_PL_COUNT) { - if(*p==TR_PARAM_MARKER) { - start_pos = ++p; - _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); - t->params = tp; - tp = 0; - if (tp->type != TR_PARAM_SPEC && p - start_pos != 1) { - LM_ERR("invalid separator in transformation: " - "%.*s\n", in->len, in->s); - goto error; - } - } - } else { - if(*p==TR_PARAM_MARKER) { - start_pos = ++p; - _tr_parse_sparam(p, p0, tp, spec, ps, in, s); - t->params->next = tp; - tp = 0; - if (p - start_pos != 1) { - LM_ERR("invalid separator in transformation: " - "%.*s\n", in->len, in->s); - goto error; - } + if(*p==TR_PARAM_MARKER) { + start_pos = ++p; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params->next = tp; + tp = 0; + if (p - start_pos != 1) { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; } } @@ -3256,6 +3264,7 @@ char* tr_parse_paramlist(str* in, trans_t *t) goto error; } +done: t->name = name; return p;

2 years, 11 months

git:5.4:30b33f77: async: safety check for async ms list

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 30b33f772739c593f1b58a2b871e127effd12f58 URL: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:12:37+02:00 async: safety check for async ms list (cherry picked from commit 5b0e74c1832d2d09fe36424e1e1aaaacde920b31) (cherry picked from commit 93dc038f3f1f854b1e0987ec28e49d8a70293e19) --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… Patch: https://github.com/kamailio/kamailio/commit/30b33f772739c593f1b58a2b871e127… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 1e81d3318c..bd17b0e1d9 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -370,6 +370,10 @@ int async_ms_sleep(sip_msg_t *msg, int milliseconds, cfg_action_t *act, str *cbn async_task_param_t *atp; async_task_t *at; + if (_async_ms_list==NULL) { + LM_ERR("async timer list not initialized - check modparams\n"); + return -1; + } if(milliseconds <= 0) { LM_ERR("negative or zero sleep time (%d)\n", milliseconds); return -1;

2 years, 11 months

git:5.4:b5ae51af: core: parse via - fixed whitespacing

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: b5ae51af479d4e54e5d8c3f5e85908e68183e9d4 URL: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-01T11:12:22+02:00 core: parse via - fixed whitespacing (cherry picked from commit 01664d1d82dcfe952fce29033b4fcd5e44cf2319) (cherry picked from commit 19901d0cdb6cf06a84315c19a27986bca7a05025) --- Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… Patch: https://github.com/kamailio/kamailio/commit/b5ae51af479d4e54e5d8c3f5e85908e… --- diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index fca486e358..e4957961f1 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -32,11 +32,11 @@ struct sip_msg; /* via param types - * WARNING: keep in sync with parse_via.c FIN_HIDDEN... + * WARNING: keep in sync with parse_via.c FIN_HIDDEN... * and with tm/sip_msg.c via_body_cloner */ enum { - PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, + PARAM_HIDDEN=230, PARAM_TTL, PARAM_BRANCH, PARAM_MADDR, PARAM_RECEIVED, PARAM_RPORT, PARAM_I, PARAM_ALIAS, #ifdef USE_COMP PARAM_COMP, @@ -60,12 +60,12 @@ typedef struct via_param { /* Format: name/version/transport host:port;params comment */ - /* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ -typedef struct via_body { +/* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ +typedef struct via_body { int error; str hdr; /* Contains "Via" or "v" */ str name; - str version; + str version; str transport; str host; short proto; /* transport */ @@ -80,7 +80,7 @@ typedef struct via_body { struct via_param* param_lst; /* list of parameters*/ struct via_param* last_param; /*last via parameter, internal use*/ - /* shortcuts to "important" params*/ + /* shortcuts to "important" params*/ struct via_param* branch; str tid; /* transaction id, part of branch */ struct via_param* received; @@ -90,8 +90,8 @@ typedef struct via_body { #ifdef USE_COMP struct via_param* comp; /* see rfc3486 */ #endif - struct via_body* next; /* pointer to next via body string if - compact via or null */ + struct via_body* next; /* pointer to next via body string + if compact via or null */ } via_body_t;

2 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021