sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
489 discussions

git:master:c1fcb837: core: dset - asume udp if uri without transport for alias encoding

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c1fcb8379c24efed52f6dca2f3f00f6ee5d43706 URL: https://github.com/kamailio/kamailio/commit/c1fcb8379c24efed52f6dca2f3f00f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-30T11:58:11+02:00 core: dset - asume udp if uri without transport for alias encoding - set output length for udp proto --- Modified: src/core/dset.c --- Diff: https://github.com/kamailio/kamailio/commit/c1fcb8379c24efed52f6dca2f3f00f6… Patch: https://github.com/kamailio/kamailio/commit/c1fcb8379c24efed52f6dca2f3f00f6… --- diff --git a/src/core/dset.c b/src/core/dset.c index 1252135043..adabe7bba0 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -1153,7 +1153,7 @@ int ksr_uri_alias_encode(str *iuri, str *ualias) p += 4; } *p++ = '~'; - *p++ = puri.proto + '0'; + *p++ = ((puri.proto)?puri.proto:1) + '0'; ualias->len = p - ualias->s; ualias->s[ualias->len] = '\0'; @@ -1204,6 +1204,9 @@ int ksr_uri_alias_decode(str *ualias, str *ouri) goto error; } nproto = *p - '0'; + if(nproto == PROTO_NONE) { + nproto = PROTO_UDP; + } if (nproto != PROTO_UDP) { proto_type_to_str(nproto, &sproto); if (sproto.len == 0) { @@ -1214,11 +1217,13 @@ int ksr_uri_alias_decode(str *ualias, str *ouri) p += 10; memcpy(p, sproto.s, sproto.len); p += sproto.len; - *p = '\0'; - ouri->len = (int)(p - ouri->s); - ouri->s[ouri->len] = '\0'; - break; + } else { + /* go back one byte to overwrite ';' */ + p--; } + ouri->len = (int)(p - ouri->s); + ouri->s[ouri->len] = '\0'; + break; } else { LM_ERR("invalid number of separators (%d)\n", n); goto error;

3 years, 8 months

git:master:e111de99: core: dset - helper function to encode/decode uri alias values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e111de999e22ed5d968ac50844e92f3f21dc0c2e URL: https://github.com/kamailio/kamailio/commit/e111de999e22ed5d968ac50844e92f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-30T11:06:02+02:00 core: dset - helper function to encode/decode uri alias values --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/e111de999e22ed5d968ac50844e92f3… Patch: https://github.com/kamailio/kamailio/commit/e111de999e22ed5d968ac50844e92f3… --- diff --git a/src/core/dset.c b/src/core/dset.c index 16e1cdc12e..1252135043 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -1113,6 +1113,125 @@ int uri_trim_rcv_alias(str *uri, str *nuri) return 1; } +/** + * encode sip uri to uri alias parameter format + * - param: iuri - input sip uri + * - param: ualias - output uri alias value in format: address~port~proto + * * ualias->s must point to a buffer of size ualias->len, at least iuri->len + * * ualias->len is adjusted to the output value length + * - return 0 on success, negative on error + */ +int ksr_uri_alias_encode(str *iuri, str *ualias) +{ + sip_uri_t puri; + char *p; + + if (parse_uri (iuri->s, iuri->len, &puri) < 0) { + LM_ERR("failed to parse uri [%.*s]\n", iuri->len, iuri->s); + return -1; + } + + /*host~port~proto*/ + if(puri.host.len + 16 >= ualias->len) { + LM_ERR("not enough space to build uri alias - buf size: %d\n", + ualias->len); + return -1; + } + p = ualias->s; + memcpy(p, puri.host.s, puri.host.len); + p += puri.host.len; + *p++ = '~'; + if(puri.port.len>0) { + memcpy(p, puri.port.s, puri.port.len); + p += puri.port.len; + } else { + if(puri.proto==PROTO_TLS || puri.proto==PROTO_WSS) { + memcpy(p, "5061", 4); + } else { + memcpy(p, "5060", 4); + } + p += 4; + } + *p++ = '~'; + *p++ = puri.proto + '0'; + ualias->len = p - ualias->s; + ualias->s[ualias->len] = '\0'; + + LM_DBG("encoded <%.*s> => [%.*s]\n", + iuri->len, iuri->s, ualias->len, ualias->s); + + return 0; +} + +/** + * decode uri alias parameter to a sip uri + * - param: ualias - uri alias value in format: address~port~proto + * - param: ouri - output uri - ouri->s must point to a buffer of size ouri->len + * * ouri->len is adjusted to the output value length + * - return 0 on success, negative on error + */ +int ksr_uri_alias_decode(str *ualias, str *ouri) +{ + int n; + char *p; + int nproto; + str sproto; + + /* 24 => sip:...;transport=sctp */ + if(ualias->len + 24 >= ouri->len) { + LM_ERR("received uri alias is too long: %d\n", ualias->len); + return -1; + } + + /* received=ip~port~proto */ + memcpy(ouri->s, "sip:", 4); + memcpy(ouri->s + 4, ualias->s, ualias->len); + ouri->s[4 + ualias->len] = '\0'; + p = ouri->s + 4; + n = 0; + while(*p!='\0') { + if(*p=='~') { + n++; + if(n==1) { + /* port */ + *p = ':'; + } else if(n==2) { + /* proto */ + *p = ';'; + p++; + if(*p=='\0') { + LM_ERR("invalid received format\n"); + goto error; + } + nproto = *p - '0'; + if (nproto != PROTO_UDP) { + proto_type_to_str(nproto, &sproto); + if (sproto.len == 0) { + LM_ERR("unknown proto in received param\n"); + goto error; + } + memcpy(p, "transport=", 10); + p += 10; + memcpy(p, sproto.s, sproto.len); + p += sproto.len; + *p = '\0'; + ouri->len = (int)(p - ouri->s); + ouri->s[ouri->len] = '\0'; + break; + } + } else { + LM_ERR("invalid number of separators (%d)\n", n); + goto error; + } + } + p++; + } + return 0; + +error: + return -1; +} + /* address of record (aor) management */ /* address of record considered case sensitive diff --git a/src/core/dset.h b/src/core/dset.h index 981f1a5d6a..cf19fdfe1b 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -285,6 +285,8 @@ int setbflagsval(unsigned int branch, flag_t val); int uri_add_rcv_alias(sip_msg_t *msg, str *uri, str *nuri); int uri_restore_rcv_alias(str *uri, str *nuri, str *suri); int uri_trim_rcv_alias(str *uri, str *nuri); +int ksr_uri_alias_encode(str *iuri, str *ualias); +int ksr_uri_alias_decode(str *ualias, str *ouri); int init_dst_set(void);

3 years, 8 months

git:master:bb2fd8c0: pv: new transformation class - urialias

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bb2fd8c0cd9909f87df7df6fa300a06c38259a10 URL: https://github.com/kamailio/kamailio/commit/bb2fd8c0cd9909f87df7df6fa300a06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-30T11:29:26+02:00 pv: new transformation class - urialias - encode/decode uri alias values (addr~port~proto) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/bb2fd8c0cd9909f87df7df6fa300a06… Patch: https://github.com/kamailio/kamailio/commit/bb2fd8c0cd9909f87df7df6fa300a06…

3 years, 8 months

git:5.3:00b6341b: carrierroute: replace faulty warning mechanism

by Lucian Balaceanu

Module: kamailio Branch: 5.3 Commit: 00b6341b361bdcd07b6fa901a652850e3dcd67be URL: https://github.com/kamailio/kamailio/commit/00b6341b361bdcd07b6fa901a652850… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2021-03-30T12:07:54+03:00 carrierroute: replace faulty warning mechanism - warning log for the same carrier/domain having routes with only 0 probability is now triggered through counting probabilities per carrier and domain - kudos also go to Huseyin Dikme - GH #2653 (cherry picked from commit 087c00a276623adad6b87242bc58f7c0b4d8ff33) --- Modified: src/modules/carrierroute/cr_data.c Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/cr_db.h Modified: src/modules/carrierroute/cr_domain.h --- Diff: https://github.com/kamailio/kamailio/commit/00b6341b361bdcd07b6fa901a652850… Patch: https://github.com/kamailio/kamailio/commit/00b6341b361bdcd07b6fa901a652850…

3 years, 8 months

git:5.4:f08e5814: carrierroute: replace faulty warning mechanism

by Lucian Balaceanu

Module: kamailio Branch: 5.4 Commit: f08e58145e93e57f2654ffcb901d49f9e898bcab URL: https://github.com/kamailio/kamailio/commit/f08e58145e93e57f2654ffcb901d49f… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2021-03-30T12:06:26+03:00 carrierroute: replace faulty warning mechanism - warning log for the same carrier/domain having routes with only 0 probability is now triggered through counting probabilities per carrier and domain - kudos also go to Huseyin Dikme - GH #2653 (cherry picked from commit 087c00a276623adad6b87242bc58f7c0b4d8ff33) --- Modified: src/modules/carrierroute/cr_data.c Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/cr_db.h Modified: src/modules/carrierroute/cr_domain.h --- Diff: https://github.com/kamailio/kamailio/commit/f08e58145e93e57f2654ffcb901d49f… Patch: https://github.com/kamailio/kamailio/commit/f08e58145e93e57f2654ffcb901d49f…

3 years, 8 months

git:5.3:518da782: core: use third array element when generating totag suffix

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: 518da782dc580aabd7fcddc7bea06b65ac7db232 URL: https://github.com/kamailio/kamailio/commit/518da782dc580aabd7fcddc7bea06b6… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-03-30T08:06:01Z core: use third array element when generating totag suffix (cherry picked from commit 895208ebb0f999365ded50a9ecfc0fb2ed2b1e01) --- Modified: src/core/tags.h --- Diff: https://github.com/kamailio/kamailio/commit/518da782dc580aabd7fcddc7bea06b6… Patch: https://github.com/kamailio/kamailio/commit/518da782dc580aabd7fcddc7bea06b6… --- diff --git a/src/core/tags.h b/src/core/tags.h index fff879cfab..b134dd3b01 100644 --- a/src/core/tags.h +++ b/src/core/tags.h @@ -51,17 +51,18 @@ static inline void calc_crc_suffix( struct sip_msg *msg, char *tag_suffix) suffix_source[0]=msg->via1->host; suffix_source[1]=msg->via1->port_str; if (msg->via1->branch) { - suffix_source[2]=msg->via1->branch->value; + suffix_source[ss_nr++]=msg->via1->branch->value; } else { suffix_source[2].s = NULL; suffix_source[2].len = 0; } crcitt_string_array( tag_suffix, suffix_source, ss_nr ); + ss_nr=2; suffix_source[0]=msg->via1->port_str; suffix_source[1]=msg->via1->host; if (msg->callid) { - suffix_source[2]=msg->callid->body; + suffix_source[ss_nr++]=msg->callid->body; } else { suffix_source[2].s = NULL; suffix_source[2].len = 0;

3 years, 8 months

git:5.4:740ecd3d: core: use third array element when generating totag suffix

by Henning Westerholt

Module: kamailio Branch: 5.4 Commit: 740ecd3d54da2905142c3171292a00c3576a650f URL: https://github.com/kamailio/kamailio/commit/740ecd3d54da2905142c3171292a00c… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-03-30T08:05:40Z core: use third array element when generating totag suffix (cherry picked from commit 895208ebb0f999365ded50a9ecfc0fb2ed2b1e01) --- Modified: src/core/tags.h --- Diff: https://github.com/kamailio/kamailio/commit/740ecd3d54da2905142c3171292a00c… Patch: https://github.com/kamailio/kamailio/commit/740ecd3d54da2905142c3171292a00c… --- diff --git a/src/core/tags.h b/src/core/tags.h index fff879cfab..b134dd3b01 100644 --- a/src/core/tags.h +++ b/src/core/tags.h @@ -51,17 +51,18 @@ static inline void calc_crc_suffix( struct sip_msg *msg, char *tag_suffix) suffix_source[0]=msg->via1->host; suffix_source[1]=msg->via1->port_str; if (msg->via1->branch) { - suffix_source[2]=msg->via1->branch->value; + suffix_source[ss_nr++]=msg->via1->branch->value; } else { suffix_source[2].s = NULL; suffix_source[2].len = 0; } crcitt_string_array( tag_suffix, suffix_source, ss_nr ); + ss_nr=2; suffix_source[0]=msg->via1->port_str; suffix_source[1]=msg->via1->host; if (msg->callid) { - suffix_source[2]=msg->callid->body; + suffix_source[ss_nr++]=msg->callid->body; } else { suffix_source[2].s = NULL; suffix_source[2].len = 0;

3 years, 8 months

[kamailio/kamailio] core: use third array element when generating totag suffix (#2696)

by Charles Chance

#### 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 - [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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Since totag suffix generation was updated in 5.3 to increase randomness, the third element of the array in both parts - via1 branch and call-id - have never been included. The result is that for any given host/port the generated totag is always the same, causing issues with some UAs - specifically relating to presence subscriptions in the cases identified. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2696 -- Commit Summary -- * core: use third array element when generating totag suffix -- File Changes -- M src/core/tags.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2696.patch https://github.com/kamailio/kamailio/pull/2696.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/2696

3 years, 8 months

git:master:895208eb: core: use third array element when generating totag suffix

by Henning Westerholt

Module: kamailio Branch: master Commit: 895208ebb0f999365ded50a9ecfc0fb2ed2b1e01 URL: https://github.com/kamailio/kamailio/commit/895208ebb0f999365ded50a9ecfc0fb… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-03-30T09:32:38+02:00 core: use third array element when generating totag suffix --- Modified: src/core/tags.h --- Diff: https://github.com/kamailio/kamailio/commit/895208ebb0f999365ded50a9ecfc0fb… Patch: https://github.com/kamailio/kamailio/commit/895208ebb0f999365ded50a9ecfc0fb… --- diff --git a/src/core/tags.h b/src/core/tags.h index fff879cfab..b134dd3b01 100644 --- a/src/core/tags.h +++ b/src/core/tags.h @@ -51,17 +51,18 @@ static inline void calc_crc_suffix( struct sip_msg *msg, char *tag_suffix) suffix_source[0]=msg->via1->host; suffix_source[1]=msg->via1->port_str; if (msg->via1->branch) { - suffix_source[2]=msg->via1->branch->value; + suffix_source[ss_nr++]=msg->via1->branch->value; } else { suffix_source[2].s = NULL; suffix_source[2].len = 0; } crcitt_string_array( tag_suffix, suffix_source, ss_nr ); + ss_nr=2; suffix_source[0]=msg->via1->port_str; suffix_source[1]=msg->via1->host; if (msg->callid) { - suffix_source[2]=msg->callid->body; + suffix_source[ss_nr++]=msg->callid->body; } else { suffix_source[2].s = NULL; suffix_source[2].len = 0;

3 years, 8 months

git:master:e36ea1fd: modules: readme files regenerated - textops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e36ea1fd0ad6e7d2814e8f07eff89a89ecd14469 URL: https://github.com/kamailio/kamailio/commit/e36ea1fd0ad6e7d2814e8f07eff89a8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-30T09:31:24+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/e36ea1fd0ad6e7d2814e8f07eff89a8… Patch: https://github.com/kamailio/kamailio/commit/e36ea1fd0ad6e7d2814e8f07eff89a8…

3 years, 8 months

← Newer
1
...
12
13
14
15
16
17
18
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021