sr-dev

sr-dev@lists.kamailio.org

20 participants
45159 discussions

git:master:1bc33f1a: rtpengine: added kemi support for block/unblock media/dtmf, and play/stop media functions
by Yufei Tao 08 Jul '20

08 Jul '20

Module: kamailio Branch: master Commit: 1bc33f1a4e4ba4c6c43cd74fb8336c2f6846092d URL: https://github.com/kamailio/kamailio/commit/1bc33f1a4e4ba4c6c43cd74fb8336c2… Author: Yufei Tao <yt100(a)hotmail.com> Committer: Yufei Tao <yt100(a)hotmail.com> Date: 2020-07-07T09:09:29+01:00 rtpengine: added kemi support for block/unblock media/dtmf, and play/stop media functions --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/1bc33f1a4e4ba4c6c43cd74fb8336c2… Patch: https://github.com/kamailio/kamailio/commit/1bc33f1a4e4ba4c6c43cd74fb8336c2…

1 0

[kamailio/kamailio] nathelper: add optional set_contact_alias([trim]) parameter (#2390)
by Emmanuel Schmidbauer 08 Jul '20

08 Jul '20

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] 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) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2308 #### Description add support for trimming an already existing alias parameter when calling `set_contact_alias()` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2390 -- Commit Summary -- * nathelper: add optional set_contact_alias([trim]) parameter -- File Changes -- M src/core/dset.c (85) M src/core/dset.h (1) M src/modules/nathelper/doc/nathelper_admin.xml (12) M src/modules/nathelper/nathelper.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2390.patch https://github.com/kamailio/kamailio/pull/2390.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/2390

2 11

git:master:a6652652: Merge pull request #2390 from kamailio/nathelper-set_contact_alias-trim
by GitHub 08 Jul '20

08 Jul '20

Module: kamailio Branch: master Commit: a6652652b9bbf5e89c1368c9c33aefa965f45c31 URL: https://github.com/kamailio/kamailio/commit/a6652652b9bbf5e89c1368c9c33aefa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-07-08T17:57:58+02:00 Merge pull request #2390 from kamailio/nathelper-set_contact_alias-trim nathelper: add optional set_contact_alias([trim]) parameter --- Modified: src/core/dset.c Modified: src/core/dset.h Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/a6652652b9bbf5e89c1368c9c33aefa… Patch: https://github.com/kamailio/kamailio/commit/a6652652b9bbf5e89c1368c9c33aefa…

1 0

git:master:bfdcef8e: core: add function uri_trim_rcv_alias() to trim alias uri param from header
by Emmanuel Schmidbauer 08 Jul '20

08 Jul '20

Module: kamailio Branch: master Commit: bfdcef8ef550b74fecc38b1bdb8fcb20ccb279b7 URL: https://github.com/kamailio/kamailio/commit/bfdcef8ef550b74fecc38b1bdb8fcb2… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2020-07-03T13:33:08-04:00 core: add function uri_trim_rcv_alias() to trim alias uri param from header --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/bfdcef8ef550b74fecc38b1bdb8fcb2… Patch: https://github.com/kamailio/kamailio/commit/bfdcef8ef550b74fecc38b1bdb8fcb2… --- diff --git a/src/core/dset.c b/src/core/dset.c index faa61db72b..db2de4cfc7 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -1029,6 +1029,91 @@ int uri_restore_rcv_alias(str *uri, str *nuri, str *suri) return 0; } + +/** + * trim alias parameter from uri + * - nuri->s must point to a buffer of nuri->len size + */ +int uri_trim_rcv_alias(str *uri, str *nuri) +{ + char *p; + str skip; + str ip, port; + int proto; + + if(uri == NULL || nuri == NULL) { + LM_ERR("invalid parameter value\n"); + return -1; + } + + /* sip:x;alias=1.1.1.1~0~0 */ + if(uri->len < 23) { + /* no alias possible */ + return 0; + } + p = uri->s + uri->len - 18; + skip.s = 0; + while(p > uri->s + 5) { + if(strncmp(p, ";alias=", 7) == 0) { + skip.s = p; + break; + } + p--; + } + if(skip.s == 0) { + /* alias parameter not found */ + return 0; + } + p += 7; + ip.s = p; + p = (char *)memchr(ip.s, '~', (size_t)(uri->s + uri->len - ip.s)); + if(p == NULL) { + /* proper alias parameter not found */ + return 0; + } + ip.len = p - ip.s; + p++; + if(p >= uri->s + uri->len) { + /* proper alias parameter not found */ + return 0; + } + port.s = p; + p = (char *)memchr(port.s, '~', (size_t)(uri->s + uri->len - port.s)); + if(p == NULL) { + /* proper alias parameter not found */ + return 0; + } + port.len = p - port.s; + p++; + if(p >= uri->s + uri->len) { + /* proper alias parameter not found */ + return 0; + } + proto = (int)(*p - '0'); + p++; + + if(p != uri->s + uri->len && *p != ';') { + /* proper alias parameter not found */ + return 0; + } + skip.len = (int)(p - skip.s); + if(nuri->len <= uri->len - skip.len) { + LM_ERR("uri buffer too small\n"); + return -1; + } + + p = nuri->s; + memcpy(p, uri->s, (size_t)(skip.s - uri->s)); + p += skip.s - uri->s; + memcpy(p, skip.s + skip.len, + (size_t)(uri->s + uri->len - skip.s - skip.len)); + p += uri->s + uri->len - skip.s - skip.len; + nuri->len = p - nuri->s; + + LM_DBG("decoded <%.*s> => [%.*s]\n", uri->len, uri->s, nuri->len, nuri->s); + 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 ccb0f669c9..981f1a5d6a 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -284,6 +284,7 @@ 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 init_dst_set(void);

1 0

git:master:3c02c11d: nathelper: add optional set_contact_alias([trim]) parameter
by Emmanuel Schmidbauer 08 Jul '20

08 Jul '20

Module: kamailio Branch: master Commit: 3c02c11d66c95102698ee52187952bd98a51510c URL: https://github.com/kamailio/kamailio/commit/3c02c11d66c95102698ee52187952bd… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2020-07-03T14:00:57-04:00 nathelper: add optional set_contact_alias([trim]) parameter --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/3c02c11d66c95102698ee52187952bd… Patch: https://github.com/kamailio/kamailio/commit/3c02c11d66c95102698ee52187952bd…

1 0

Re: [sr-dev] [kamailio/kamailio] db_redis: allow deletion of all rows (bf2ecd4)
by Henning Westerholt 08 Jul '20

08 Jul '20

@rfuchs I think this sounds more like a bug in the patch, not taking in account your mode of operation. If you can create a patch that fix to the original problem that does not break your operation, this would be great. -- 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/commit/bf2ecd4dec55d5009e0904392d083e1…

1 0

Re: [sr-dev] [kamailio/kamailio] db_redis: allow deletion of all rows (bf2ecd4)
by Richard Fuchs 08 Jul '20

08 Jul '20

Yes, but did it actually break the delete operation, or was it just a performance optimisation? In either case I can probably come up with an alternative patch that doesn't break the set indexes. -- 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/commit/bf2ecd4dec55d5009e0904392d083e1…

1 0

Re: [sr-dev] [kamailio/kamailio] db_redis: allow deletion of all rows (bf2ecd4)
by Henning Westerholt 08 Jul '20

08 Jul '20

>From the original issue "Former code always assumed filters would be involved so this change skips the filter matching if no filter is applied." -- 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/commit/bf2ecd4dec55d5009e0904392d083e1…

1 0

Re: [sr-dev] [kamailio/kamailio] db_redis: allow deletion of all rows (bf2ecd4)
by Richard Fuchs 08 Jul '20

08 Jul '20

@rdboisvert it should already do this. Which part was not working for you? -- 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/commit/bf2ecd4dec55d5009e0904392d083e1…

1 0

Re: [sr-dev] [kamailio/kamailio] db_redis: allow deletion of all rows (bf2ecd4)
by rdboisvert 08 Jul '20

08 Jul '20

We would like to have a delete row function as described in in section [9.2.9](http://www.asipto.com/pub/kamailio-devel-guide/#c09f_delete) of the Kamailio SIP Server v3.2.0 Development Guide. If I implemented the feature incorrectly then we would appreciate someone fixing this. 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/commit/bf2ecd4dec55d5009e0904392d083e1…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev