sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:master:98436c73: dialog: update internal_get_dlg() after 0bde3ca changes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 98436c73e8519e96e3d167b7610cbb58b9939885 URL: https://github.com/kamailio/kamailio/commit/98436c73e8519e96e3d167b7610cbb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-28T10:32:50+01:00 dialog: update internal_get_dlg() after 0bde3ca changes - keep also direction value for no-totag dialog - reference and unlock only when returning, related to #2494 --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/98436c73e8519e96e3d167b7610cbb5… Patch: https://github.com/kamailio/kamailio/commit/98436c73e8519e96e3d167b7610cbb5… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 93d35f553b..2714c439e5 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -857,7 +857,7 @@ dlg_cell_t* dlg_get_by_iuid(dlg_iuid_t *diuid) * \param ftag from tag * \param ttag to tag * \param dir direction - * \param mode let hash table slot locked or not + * \param mode let hash table slot locked or not, even when dlg is not found * \return dialog structure on success, NULL on failure */ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, @@ -867,33 +867,47 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, struct dlg_cell *dlg; struct dlg_cell *dlg_no_totag=NULL; struct dlg_entry *d_entry; + unsigned int dir_no_totag = DLG_DIR_NONE; d_entry = &(d_table->entries[h_entry]); dlg_lock( d_table, d_entry); for( dlg = d_entry->first ; dlg ; dlg = dlg->next ) { - /* Check callid / fromtag / totag */ + /* check callid / fromtag / totag */ if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { - ref_dlg_unsafe(dlg, 1); - if(likely(mode==0)) dlg_unlock( d_table, d_entry); - - /* If to-tag is empty continue to search in case another dialog is found with a matching to-tag. */ - if (dlg->tag[1].len == 0) { - dlg_no_totag=dlg; - LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", - callid->len, callid->s,h_entry,*dir); + /* if to-tag is empty continue to search in case another dialog + * is found with a matching to-tag. */ + if (dlg->tag[DLG_CALLEE_LEG].len == 0) { + dlg_no_totag = dlg; + dir_no_totag = *dir; continue; } + + ref_dlg_unsafe(dlg, 1); + if(likely(mode==0)) { + dlg_unlock( d_table, d_entry); + } LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d to-tag='%.*s'\n", - callid->len, callid->s,h_entry,*dir, dlg->tag[1].len, dlg->tag[1].s); + callid->len, callid->s, h_entry, *dir, + dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s); return dlg; } } - if(likely(mode==0)) dlg_unlock( d_table, d_entry); - if (dlg_no_totag) return dlg_no_totag; + if (dlg_no_totag) { + ref_dlg_unsafe(dlg_no_totag, 1); + } + if(likely(mode==0)) { + dlg_unlock(d_table, d_entry); + } + if (dlg_no_totag) { + *dir = dir_no_totag; + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d no-to-tag\n", + callid->len, callid->s, h_entry, *dir); + return dlg_no_totag; + } LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0;

3 years, 8 months

git:master:f6a1f96a: xcap_server: use new search function to avoid zero-ending swapping

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f6a1f96af518ec10b09c4395166943a39eea19dd URL: https://github.com/kamailio/kamailio/commit/f6a1f96af518ec10b09c4395166943a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-28T08:27:37+01:00 xcap_server: use new search function to avoid zero-ending swapping --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f6a1f96af518ec10b09c4395166943a… Patch: https://github.com/kamailio/kamailio/commit/f6a1f96af518ec10b09c4395166943a… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 5c1ca9004b..20bb585e3a 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -304,15 +304,14 @@ int xcaps_xpath_hack(str *buf, int type) { char *match; char *repl; - char c; char *p; char *start; + char *end; if(buf==NULL || buf->len <=10) return 0; - if(type==0) - { + if(type==0) { match = " xmlns="; repl = " x____="; } else { @@ -321,12 +320,11 @@ int xcaps_xpath_hack(str *buf, int type) } start = buf->s; - STR_VTOZ(buf->s[buf->len-1], c); - while((start < buf->s + buf->len - 10) && (p = strstr(start, match))!=NULL) { + end = buf->s + buf->len - 10; + while((p = stre_search_strz(start, end, match))!=NULL) { memcpy(p, repl, 7); start = p + 7; } - STR_ZTOV(buf->s[buf->len-1], c); return 0; }

3 years, 8 months

git:master:ccbaf324: core: helper function to search a token before an end pointer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ccbaf324cf5481288f505dce5c694ca077911a04 URL: https://github.com/kamailio/kamailio/commit/ccbaf324cf5481288f505dce5c694ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-28T08:26:06+01:00 core: helper function to search a token before an end pointer --- Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/ccbaf324cf5481288f505dce5c694ca… Patch: https://github.com/kamailio/kamailio/commit/ccbaf324cf5481288f505dce5c694ca… --- diff --git a/src/core/ut.c b/src/core/ut.c index 0189b642ab..08edd2f24e 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -296,6 +296,29 @@ char *str_search(str *text, str *needle) return NULL; } +/** + * @brief search for occurence of needlez starting from vstart and before vend + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *stre_search_strz(char *vstart, char *vend, char *needlez) +{ + str text; + str needle; + + if(vend <= vstart) { + return NULL; + } + + text.s = vstart; + text.len = vend - vstart; + + needle.s = needlez; + needle.len = strlen(needlez); + + return str_search(&text, &needle); +} + /** * @brief case insensitive search for occurence of needle in text * @return pointer to start of needle in text or NULL if the needle diff --git a/src/core/ut.h b/src/core/ut.h index 5fcb245cd8..0251fb7ca2 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1057,6 +1057,8 @@ char* get_abs_pathname(str* base, str* file); */ char *str_search(str *text, str *needle); +char *stre_search_strz(char *vstart, char *vend, char *needlez); + char *str_casesearch(str *text, str *needle); char *strz_casesearch_strz(char *textz, char *needlez);

3 years, 8 months

Kamailio v5.4.2 Released

by Daniel-Constantin Mierla

Hello, Kamailio SIP Server v5.4.2 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.1. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.1. For more details about version 5.4.2 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2020/10/kamailio-v5-4-2-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 years, 8 months

git:5.4:c3b91f7d: ChangeLog: content updated for v5.4.2

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: c3b91f7ded0d16e76fe60b3f56237681d62d9290 URL: https://github.com/kamailio/kamailio/commit/c3b91f7ded0d16e76fe60b3f5623768… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-27T12:30:50+01:00 ChangeLog: content updated for v5.4.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/c3b91f7ded0d16e76fe60b3f5623768… Patch: https://github.com/kamailio/kamailio/commit/c3b91f7ded0d16e76fe60b3f5623768…

3 years, 8 months

git:5.4:44e95a77: Makefile.defs: version set to 5.4.2

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 44e95a7723aa71612050ad321a282c2bad04f2ea URL: https://github.com/kamailio/kamailio/commit/44e95a7723aa71612050ad321a282c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-27T12:06:12+01:00 Makefile.defs: version set to 5.4.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/44e95a7723aa71612050ad321a282c2… Patch: https://github.com/kamailio/kamailio/commit/44e95a7723aa71612050ad321a282c2… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 05e47cdfa2..34df5d7295 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher

3 years, 8 months

git:5.4:c4186b78: pkg/kamailio/deb: version set 5.4.2

by Victor Seva

Module: kamailio Branch: 5.4 Commit: c4186b78463899b044dd18dfca6f023b763ea502 URL: https://github.com/kamailio/kamailio/commit/c4186b78463899b044dd18dfca6f023… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-10-27T11:45:17+01:00 pkg/kamailio/deb: version set 5.4.2 --- 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/c4186b78463899b044dd18dfca6f023… Patch: https://github.com/kamailio/kamailio/commit/c4186b78463899b044dd18dfca6f023…

3 years, 8 months

git:5.4:6114e2fc: pkg: version set to 5.4 for rpm and alpine specs

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 6114e2fc8bc00cc8875720322fbacd35312628c3 URL: https://github.com/kamailio/kamailio/commit/6114e2fc8bc00cc8875720322fbacd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-27T09:55:02+01:00 pkg: version set to 5.4 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/6114e2fc8bc00cc8875720322fbacd3… Patch: https://github.com/kamailio/kamailio/commit/6114e2fc8bc00cc8875720322fbacd3… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index d243876d82..8427721ea3 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.1 +pkgver=5.4.2 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 42a9c88db9..6b22aefa59 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.1 +%define ver 5.4.2 %define rel dev1.0%{dist} %if 0%{?fedora}

3 years, 8 months

git:5.4:c8d42b32: xcap_server: shorten a bit the search range for xcaps_xpath_hack()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: c8d42b328302e18c7b915b3760c5089910a1ad49 URL: https://github.com/kamailio/kamailio/commit/c8d42b328302e18c7b915b3760c5089… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-27T09:53:40+01:00 xcap_server: shorten a bit the search range for xcaps_xpath_hack() - match on the buffer len min size, xmlns is expected to have a value, plus the ending of the xml tag (cherry picked from commit 3be41802c7c670cce0d3e08462e23ca3f3fbe2d4) --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/c8d42b328302e18c7b915b3760c5089… Patch: https://github.com/kamailio/kamailio/commit/c8d42b328302e18c7b915b3760c5089… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 1556aa14b9..5c1ca9004b 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -322,7 +322,7 @@ int xcaps_xpath_hack(str *buf, int type) start = buf->s; STR_VTOZ(buf->s[buf->len-1], c); - while((start < buf->s + buf->len - 8) && (p = strstr(start, match))!=NULL) { + while((start < buf->s + buf->len - 10) && (p = strstr(start, match))!=NULL) { memcpy(p, repl, 7); start = p + 7; }

3 years, 8 months

git:master:3be41802: xcap_server: shorten a bit the search range for xcaps_xpath_hack()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3be41802c7c670cce0d3e08462e23ca3f3fbe2d4 URL: https://github.com/kamailio/kamailio/commit/3be41802c7c670cce0d3e08462e23ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-27T09:36:38+01:00 xcap_server: shorten a bit the search range for xcaps_xpath_hack() - match on the buffer len min size, xmlns is expected to have a value, plus the ending of the xml tag --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/3be41802c7c670cce0d3e08462e23ca… Patch: https://github.com/kamailio/kamailio/commit/3be41802c7c670cce0d3e08462e23ca… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 1556aa14b9..5c1ca9004b 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -322,7 +322,7 @@ int xcaps_xpath_hack(str *buf, int type) start = buf->s; STR_VTOZ(buf->s[buf->len-1], c); - while((start < buf->s + buf->len - 8) && (p = strstr(start, match))!=NULL) { + while((start < buf->s + buf->len - 10) && (p = strstr(start, match))!=NULL) { memcpy(p, repl, 7); start = p + 7; }

3 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020