sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

[kamailio/kamailio] topos and 183 replies without Contact header (#2344)

by Barry Flanagan

Further to the changes made in https://github.com/kamailio/kamailio/issues/1720 I am opening a new ticket regarding https://github.com/kamailio/kamailio/issues/1720#issuecomment-638158699 It is my understanding that 1xx replies do not require a Contact header, but commit https://github.com/kamailio/kamailio/commit/3b586d554740ae578283024c1508e91… specifically excludes 183 replies from passing without a Contact header. This is causing us some issues and I am wondering why 183 is set to require the Contact header. Thanks -- 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/issues/2344

3 years, 10 months

[kamailio/kamailio] 180 Ringing without Contact with TOPOS enabled (#1720)

by Sergey Basov

### Description Kamailio with TOPOS enabled acts as a proxy between SIP client and SBC. When client sends "180 Ringing" without Contact header - kamailio does not forward it to SBC. If Contact header exists in "180 Ringing" - all works as expected. ### Troubleshooting #### Reproduction Load and configure topos module Make call with "180 Ringing" without Contact header - kamailio will not forward it. #### Log Messages ``` ERROR: topos [tps_storage.c:340]: tps_storage_link_msg(): bad sip message or missing Contact hdr ``` #### SIP Traffic ``` SIP/2.0 180 Ringing Via: SIP/2.0/TLS 1.2.3.4:5061;branch=z9hG4bKef45.8c75f0bae8a59dfaec6ff533ff0f3b2d.0 From: <sip:1111@1.2.3.4:5061>;tag=02000879948559 To: <sip:2.2.2.2@5.6.7.8:5061;transport=tls;user=phone>;tag=SDbsq8499-y2pMOVV Call-ID: apdW7374315131g0bcGhEfDjFof CSeq: 988207425 INVITE User-Agent: agent Supported: replaces, outbound Content-Length: 0 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select ``` * **Operating System**: ``` Red Hat Enterprise Linux Server 7.3 3.10.0-514.el7.x86_64 #1 SMP Wed Oct 19 11:24:13 EDT 2016 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/issues/1720

3 years, 10 months

git:master:785326cd: topos: allow 183 without contact header

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 785326cdfbee849a8436e7c07003ff0539d259cd URL: https://github.com/kamailio/kamailio/commit/785326cdfbee849a8436e7c07003ff0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-05T09:47:32+02:00 topos: allow 183 without contact header - some UAs do not add it, even it can create the session for PRACK, which requires it --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/785326cdfbee849a8436e7c07003ff0… Patch: https://github.com/kamailio/kamailio/commit/785326cdfbee849a8436e7c07003ff0… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 8583f1b37c..9cdd9ff3d5 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -355,8 +355,7 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) } if(msg->first_line.type==SIP_REPLY) { if(msg->first_line.u.reply.statuscode>=100 - && msg->first_line.u.reply.statuscode<200 - && msg->first_line.u.reply.statuscode!=183) { + && msg->first_line.u.reply.statuscode<200) { /* provisional response with no mandatory contact header */ return 0; }

3 years, 10 months

git:master:974038f5: pv: vars to get the length for o-uri/r-uri/f-uri/t-uri username

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 974038f5f81382fe6fa6565f0ab9ea0f2cf9896f URL: https://github.com/kamailio/kamailio/commit/974038f5f81382fe6fa6565f0ab9ea0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-05T09:39:50+02:00 pv: vars to get the length for o-uri/r-uri/f-uri/t-uri username - $oUl, $rUl, $fUl. $tUl - the length is already available in the str value, optimizing a bit by no longer having to use {s.len} --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/974038f5f81382fe6fa6565f0ab9ea0… Patch: https://github.com/kamailio/kamailio/commit/974038f5f81382fe6fa6565f0ab9ea0… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 0308514e70..4d3d8b343c 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -272,6 +272,9 @@ static pv_export_t mod_pvs[] = { {{"from.user", (sizeof("from.user")-1)}, /* */ PVT_OTHER, pv_get_from_attr, pv_set_from_username, 0, 0, pv_init_iname, 2}, + {{"fUl", (sizeof("fUl")-1)}, /* */ + PVT_OTHER, pv_get_from_attr, 0, + 0, 0, pv_init_iname, 6}, {{"mb", (sizeof("mb")-1)}, /* */ PVT_OTHER, pv_get_msg_buf, 0, 0, 0, 0, 0}, @@ -314,6 +317,9 @@ static pv_export_t mod_pvs[] = { {{"oU", (sizeof("oU")-1)}, /* */ PVT_OTHER, pv_get_ouri_attr, 0, 0, 0, pv_init_iname, 1}, + {{"oUl", (sizeof("oUl")-1)}, /* */ + PVT_OTHER, pv_get_ouri_attr, 0, + 0, 0, pv_init_iname, 6}, {{"pd", (sizeof("pd")-1)}, /* */ PVT_OTHER, pv_get_ppi_attr, 0, 0, pv_parse_index, pv_init_iname, 3}, @@ -383,6 +389,9 @@ static pv_export_t mod_pvs[] = { {{"ruri.user", (sizeof("ruri.user")-1)}, /* */ PVT_RURI_USERNAME, pv_get_ruri_attr, pv_set_ruri_user, 0, 0, pv_init_iname, 1}, + {{"rUl", (sizeof("rUl")-1)}, /* */ + PVT_RURI_USERNAME, pv_get_ruri_attr, 0, + 0, 0, pv_init_iname, 6}, {{"rv", (sizeof("rv")-1)}, /* */ PVT_OTHER, pv_get_version, 0, 0, 0, 0, 0}, @@ -470,6 +479,9 @@ static pv_export_t mod_pvs[] = { {{"to.user", (sizeof("to.user")-1)}, /* */ PVT_OTHER, pv_get_to_attr, pv_set_to_username, 0, 0, pv_init_iname, 2}, + {{"tUl", (sizeof("tUl")-1)}, /* */ + PVT_OTHER, pv_get_to_attr, pv_set_to_username, + 0, 0, pv_init_iname, 6}, {{"true", (sizeof("true")-1)}, /* */ PVT_OTHER, pv_get_true, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index ae91aa9d82..7b28fb966e 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -323,6 +323,10 @@ int pv_get_xuri_attr(struct sip_msg *msg, struct sip_uri *parsed_uri, } else if(param->pvn.u.isname.name.n==5) /* uri scheme */ { return pv_get_strintval(msg, param, res, &pv_uri_scheme[parsed_uri->type], (int)parsed_uri->type); + } else if(param->pvn.u.isname.name.n==6) /* username length */ { + if(parsed_uri->user.s==NULL || parsed_uri->user.len<=0) + return pv_get_sintval(msg, param, res, 0); + return pv_get_sintval(msg, param, res, parsed_uri->user.len); } LM_ERR("unknown specifier\n"); return pv_get_null(msg, param, res); @@ -452,6 +456,11 @@ int pv_get_xto_attr(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); } return pv_get_strval(msg, param, res, &uri->host); + } else if(param->pvn.u.isname.name.n==6) /* username length */ { + if(uri->user.s==NULL || uri->user.len<=0) { + return pv_get_sintval(msg, param, res, 0); + } + return pv_get_sintval(msg, param, res, uri->user.len); } LM_ERR("unknown specifier\n");

3 years, 10 months

[kamailio/kamailio] core: PV_IDX_NONE to point that pv had no index (#2341)

by Victor Seva

#### 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) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally #### Description  if index is 0 there were no way to know if the index was there $x_hdr(A) = "value" needs to append a value $(x_hdr(A)[0]) = "value" needs to set the value pv_parse_spec(str *s, pv_spec_p p) was always setting p->pvp.pvi.type to 0 == PV_IDX_INT You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2341 -- Commit Summary -- * core: PV_IDX_NONE to point that pv had no index -- File Changes -- M src/core/pvapi.c (7) M src/core/pvar.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2341.patch https://github.com/kamailio/kamailio/pull/2341.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/2341

3 years, 10 months

git:master:6e96e8a9: pv: fix for new PV_IDX_NONE value

by Victor Seva

Module: kamailio Branch: master Commit: 6e96e8a9134ed204f4fcf3cd42f6f9f274ea7851 URL: https://github.com/kamailio/kamailio/commit/6e96e8a9134ed204f4fcf3cd42f6f9f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-05T08:54:17+02:00 pv: fix for new PV_IDX_NONE value --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/6e96e8a9134ed204f4fcf3cd42f6f9f… Patch: https://github.com/kamailio/kamailio/commit/6e96e8a9134ed204f4fcf3cd42f6f9f… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index e53db70c25..ae91aa9d82 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1823,7 +1823,7 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if ((avp=search_first_avp(name_type, avp_name, &avp_value, &state))==0) return pv_get_null(msg, param, res); res->flags = PV_VAL_STR; - if(idxf==0 && idx==0) + if(idx==0 && (idxf==PV_IDX_INT || idxf==PV_IDX_NONE)) { if(avp->flags & AVP_VAL_STR) { @@ -1981,7 +1981,7 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) /* get the value */ res->flags = PV_VAL_STR; - if(idxf==0 && idx==0) + if(idx==0 && (idxf==PV_IDX_INT || idxf==PV_IDX_NONE)) { res->rs = hf->body; return 0;

3 years, 10 months

git:master:7bb26695: core: PV_IDX_NONE to point that pv had no index

by Victor Seva

Module: kamailio Branch: master Commit: 7bb2669528a819ec29a8193eebc9c641edd69993 URL: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-05T08:54:17+02:00 core: PV_IDX_NONE to point that pv had no index if index is 0 there were no way to know if the index was there $x_hdr(A) = "value" needs to append a value $(x_hdr(A)[0]) = "value" needs to set the value pv_parse_spec(str *s, pv_spec_p p) was always setting p->pvp.pvi.type to 0 == PV_IDX_INT --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… Patch: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 0148578315..30b2a7cdfe 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -857,6 +857,7 @@ char* pv_parse_spec2(str *in, pv_spec_p e, int silent) tr = 0; pvstate = 0; memset(e, 0, sizeof(pv_spec_t)); + e->pvp.pvi.type = PV_IDX_NONE; p = in->s; p++; if(*p==PV_LNBRACKET) @@ -1369,6 +1370,12 @@ int pv_get_spec_index(struct sip_msg* msg, pv_param_p ip, int *idx, int *flags) *idx = ip->pvi.u.ival; return 0; } + if(ip->pvi.type == PV_IDX_NONE) + { + *flags = PV_IDX_NONE; + *idx = ip->pvi.u.ival; + return 0; + } /* pvar */ if(pv_get_spec_value(msg, (pv_spec_p)ip->pvi.u.dval, &tv)!=0) diff --git a/src/core/pvar.h b/src/core/pvar.h index 1415f84af0..155b0125fb 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -61,6 +61,7 @@ #define PV_IDX_PVAR 1 #define PV_IDX_ALL 2 #define PV_IDX_ITR 3 +#define PV_IDX_NONE 4 /*! if PV name is dynamic, integer, or str */ #define pv_has_dname(pv) ((pv)->pvp.pvn.type==PV_NAME_PVAR)

3 years, 10 months

git:master:dd28ea04: app_jsdt: duktape interpreter upgraded to v2.5.0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dd28ea040b78bf972a9b54177a8025eb8e885683 URL: https://github.com/kamailio/kamailio/commit/dd28ea040b78bf972a9b54177a8025e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-04T19:26:09+02:00 app_jsdt: duktape interpreter upgraded to v2.5.0 --- Modified: src/modules/app_jsdt/duk_config.h Modified: src/modules/app_jsdt/duktape.c Modified: src/modules/app_jsdt/duktape.h --- Diff: https://github.com/kamailio/kamailio/commit/dd28ea040b78bf972a9b54177a8025e… Patch: https://github.com/kamailio/kamailio/commit/dd28ea040b78bf972a9b54177a8025e…

3 years, 10 months

git:master:2b3c4130: corex: exported file read/write functions to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2b3c4130e717f1b92eeb351e3bfe72e189138136 URL: https://github.com/kamailio/kamailio/commit/2b3c4130e717f1b92eeb351e3bfe72e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-04T19:15:22+02:00 corex: exported file read/write functions to kemi --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2b3c4130e717f1b92eeb351e3bfe72e… Patch: https://github.com/kamailio/kamailio/commit/2b3c4130e717f1b92eeb351e3bfe72e…

3 years, 10 months

git:master:d581418b: crypto: check if netio crypto key is set if callbacks are enabled

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d581418bcc49ad30bd35910f988ac78c8d9047e0 URL: https://github.com/kamailio/kamailio/commit/d581418bcc49ad30bd35910f988ac78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-04T18:32:14+02:00 crypto: check if netio crypto key is set if callbacks are enabled --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d581418bcc49ad30bd35910f988ac78… Patch: https://github.com/kamailio/kamailio/commit/d581418bcc49ad30bd35910f988ac78… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index c2f7fe61e4..720042792b 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -137,6 +137,10 @@ static int mod_init(void) } if(_crypto_register_evcb!=0) { + if(_crypto_netio_key.s==NULL || _crypto_netio_key.len<=0) { + LM_ERR("crypto netio key parameter is not set\n"); + return -1; + } crypto_evcb_enable(); }

3 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020