sr-dev September 2019

sr-dev@lists.kamailio.org

24 participants
368 discussions

git:5.1:79e75abb: msilo: fix documentation for expire_time and clean_period to values from code
by Henning Westerholt 14 Sep '19

14 Sep '19

Module: kamailio Branch: 5.1 Commit: 79e75abb34ebc0b2d6edf179b8403637bf637522 URL: https://github.com/kamailio/kamailio/commit/79e75abb34ebc0b2d6edf179b840363… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-14T16:41:00+02:00 msilo: fix documentation for expire_time and clean_period to values from code (cherry picked from commit 492f6e1584d4a2a51c584ab5a71fe43822acef72) --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/79e75abb34ebc0b2d6edf179b840363… Patch: https://github.com/kamailio/kamailio/commit/79e75abb34ebc0b2d6edf179b840363… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index d958d15f18..5605a239ac 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -465,7 +465,7 @@ modparam("msilo", "expire_time", 36000) </para> <para> <emphasis> - Default value is <quote>30</quote>. + Default value is <quote>60</quote>. </emphasis> </para> <example> @@ -509,7 +509,7 @@ modparam("msilo", "send_time", 60) </para> <para> <emphasis> - Default value is <quote>5</quote>. + Default value is <quote>10</quote>. </emphasis> </para> <example>

1 0

git:5.2:5ac8002c: msilo: fix documentation for expire_time and clean_period to values from code
by Henning Westerholt 14 Sep '19

14 Sep '19

Module: kamailio Branch: 5.2 Commit: 5ac8002cfe62bb825dbc2db75a47e38244b03404 URL: https://github.com/kamailio/kamailio/commit/5ac8002cfe62bb825dbc2db75a47e38… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-14T16:40:56+02:00 msilo: fix documentation for expire_time and clean_period to values from code (cherry picked from commit 492f6e1584d4a2a51c584ab5a71fe43822acef72) --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5ac8002cfe62bb825dbc2db75a47e38… Patch: https://github.com/kamailio/kamailio/commit/5ac8002cfe62bb825dbc2db75a47e38… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 7d53dba51b..885368ea36 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -465,7 +465,7 @@ modparam("msilo", "expire_time", 36000) </para> <para> <emphasis> - Default value is <quote>30</quote>. + Default value is <quote>60</quote>. </emphasis> </para> <example> @@ -509,7 +509,7 @@ modparam("msilo", "send_time", 60) </para> <para> <emphasis> - Default value is <quote>5</quote>. + Default value is <quote>10</quote>. </emphasis> </para> <example>

1 0

git:master:492f6e15: msilo: fix documentation for expire_time and clean_period to values from code
by Henning Westerholt 14 Sep '19

14 Sep '19

Module: kamailio Branch: master Commit: 492f6e1584d4a2a51c584ab5a71fe43822acef72 URL: https://github.com/kamailio/kamailio/commit/492f6e1584d4a2a51c584ab5a71fe43… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-14T16:40:25+02:00 msilo: fix documentation for expire_time and clean_period to values from code --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/492f6e1584d4a2a51c584ab5a71fe43… Patch: https://github.com/kamailio/kamailio/commit/492f6e1584d4a2a51c584ab5a71fe43… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 7d53dba51b..885368ea36 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -465,7 +465,7 @@ modparam("msilo", "expire_time", 36000) </para> <para> <emphasis> - Default value is <quote>30</quote>. + Default value is <quote>60</quote>. </emphasis> </para> <example> @@ -509,7 +509,7 @@ modparam("msilo", "send_time", 60) </para> <para> <emphasis> - Default value is <quote>5</quote>. + Default value is <quote>10</quote>. </emphasis> </para> <example>

1 0

git:master:059eb6f1: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 14 Sep '19

14 Sep '19

Module: kamailio Branch: master Commit: 059eb6f10d604d253f642db608dbfd54aafa30df URL: https://github.com/kamailio/kamailio/commit/059eb6f10d604d253f642db608dbfd5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-14T15:16:50+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/059eb6f10d604d253f642db608dbfd5… Patch: https://github.com/kamailio/kamailio/commit/059eb6f10d604d253f642db608dbfd5… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 46a4627a32..aecc47fb70 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -2248,8 +2248,8 @@ Chapter 2. Developer Guide NULL only for DLGCB_CREATED callback type, which is not a per dialog type. * int type - types of callbacks; more types may be register for the - same callback function; only DLGCB_CREATED must be register alone. - Possible types: + same callback function; only DLGCB_LOADED and DLGCB_CREATED must be + registered alone. Possible types: + DLGCB_LOADED + DLGCB_CREATED - called when a new dialog is created - it's a global type (not associated to any dialog)

1 0

git:master:0412210e: dialog: extend doc that DLGCB_LOADED needs to be loaded alone as well
by Henning Westerholt 14 Sep '19

14 Sep '19

Module: kamailio Branch: master Commit: 0412210eeaf525359da614eb2f73ccf6e9291f7e URL: https://github.com/kamailio/kamailio/commit/0412210eeaf525359da614eb2f73ccf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-14T15:03:23+02:00 dialog: extend doc that DLGCB_LOADED needs to be loaded alone as well --- Modified: src/modules/dialog/doc/dialog_devel.xml --- Diff: https://github.com/kamailio/kamailio/commit/0412210eeaf525359da614eb2f73ccf… Patch: https://github.com/kamailio/kamailio/commit/0412210eeaf525359da614eb2f73ccf… --- diff --git a/src/modules/dialog/doc/dialog_devel.xml b/src/modules/dialog/doc/dialog_devel.xml index d00268b9b5..b29eb3af12 100644 --- a/src/modules/dialog/doc/dialog_devel.xml +++ b/src/modules/dialog/doc/dialog_devel.xml @@ -33,7 +33,7 @@ <listitem> <para><emphasis>int type</emphasis> - types of callbacks; more types may be register for the same callback function; only - DLGCB_CREATED must be register alone. Possible types: + DLGCB_LOADED and DLGCB_CREATED must be registered alone. Possible types: <itemizedlist> <listitem> <para><emphasis>DLGCB_LOADED</emphasis>

1 0

git:5.2:c6eab378: ims_isc: fixed the RURI trigger point match
by Henning Westerholt 13 Sep '19

13 Sep '19

Module: kamailio Branch: 5.2 Commit: c6eab3787b46f60e860ca7a90b6abf7c21be9f0e URL: https://github.com/kamailio/kamailio/commit/c6eab3787b46f60e860ca7a90b6abf7… Author: Jeff Gross <jeff(a)grosssoftware.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-13T21:32:55+02:00 ims_isc: fixed the RURI trigger point match - use the RURI from the SIP message in the regex compare, rather than the regex string from the trigger point (cherry picked from commit 36ee7fa70ee43cffc8e7f2c279fb97862daf3f9b) --- Modified: src/modules/ims_isc/checker.c --- Diff: https://github.com/kamailio/kamailio/commit/c6eab3787b46f60e860ca7a90b6abf7… Patch: https://github.com/kamailio/kamailio/commit/c6eab3787b46f60e860ca7a90b6abf7… --- diff --git a/src/modules/ims_isc/checker.c b/src/modules/ims_isc/checker.c index f02cf98bab..037d0507c7 100644 --- a/src/modules/ims_isc/checker.c +++ b/src/modules/ims_isc/checker.c @@ -189,22 +189,30 @@ static int isc_check_session_desc(ims_spt *spt, struct sip_msg *msg) { */ static int isc_check_ruri(ims_spt *spt, struct sip_msg *msg) { char buf[256]; + char buf2[256]; regex_t comp; if (spt->request_uri.len >= sizeof(buf)) { - LM_ERR("RURI \"%.*s\" is to long to be processed (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + LM_ERR("RURI regexp \"%.*s\" is too long to be compiled (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + + if (msg->first_line.u.request.uri.len >= sizeof(buf2)) { + LM_ERR("RURI \"%.*s\" is too long to be processed (max %d bytes)\n", msg->first_line.u.request.uri.len, msg->first_line.u.request.uri.s, (int) (sizeof(buf2) - 1)); return FALSE; } /* compile the regex for content */ memcpy(buf, spt->request_uri.s, spt->request_uri.len); buf[spt->request_uri.len] = 0; - if(regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + if (regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { LM_ERR("Error compiling the following regexp for RURI content: %.*s\n", spt->request_uri.len, spt->request_uri.s); return FALSE; } - if (regexec(&(comp), buf, 0, NULL, 0) == 0) //regex match + memcpy(buf2, msg->first_line.u.request.uri.s, msg->first_line.u.request.uri.len); + buf2[msg->first_line.u.request.uri.len] = 0; + if (regexec(&(comp), buf2, 0, NULL, 0) == 0) //regex match { regfree(&(comp)); return TRUE;

1 0

git:5.1:9e239575: ims_isc: fixed the RURI trigger point match
by Henning Westerholt 13 Sep '19

13 Sep '19

Module: kamailio Branch: 5.1 Commit: 9e239575dbee0a33beffe9a60a916dd99d9f364e URL: https://github.com/kamailio/kamailio/commit/9e239575dbee0a33beffe9a60a916dd… Author: Jeff Gross <jeff(a)grosssoftware.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-13T21:32:59+02:00 ims_isc: fixed the RURI trigger point match - use the RURI from the SIP message in the regex compare, rather than the regex string from the trigger point (cherry picked from commit 36ee7fa70ee43cffc8e7f2c279fb97862daf3f9b) --- Modified: src/modules/ims_isc/checker.c --- Diff: https://github.com/kamailio/kamailio/commit/9e239575dbee0a33beffe9a60a916dd… Patch: https://github.com/kamailio/kamailio/commit/9e239575dbee0a33beffe9a60a916dd… --- diff --git a/src/modules/ims_isc/checker.c b/src/modules/ims_isc/checker.c index f02cf98bab..037d0507c7 100644 --- a/src/modules/ims_isc/checker.c +++ b/src/modules/ims_isc/checker.c @@ -189,22 +189,30 @@ static int isc_check_session_desc(ims_spt *spt, struct sip_msg *msg) { */ static int isc_check_ruri(ims_spt *spt, struct sip_msg *msg) { char buf[256]; + char buf2[256]; regex_t comp; if (spt->request_uri.len >= sizeof(buf)) { - LM_ERR("RURI \"%.*s\" is to long to be processed (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + LM_ERR("RURI regexp \"%.*s\" is too long to be compiled (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + + if (msg->first_line.u.request.uri.len >= sizeof(buf2)) { + LM_ERR("RURI \"%.*s\" is too long to be processed (max %d bytes)\n", msg->first_line.u.request.uri.len, msg->first_line.u.request.uri.s, (int) (sizeof(buf2) - 1)); return FALSE; } /* compile the regex for content */ memcpy(buf, spt->request_uri.s, spt->request_uri.len); buf[spt->request_uri.len] = 0; - if(regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + if (regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { LM_ERR("Error compiling the following regexp for RURI content: %.*s\n", spt->request_uri.len, spt->request_uri.s); return FALSE; } - if (regexec(&(comp), buf, 0, NULL, 0) == 0) //regex match + memcpy(buf2, msg->first_line.u.request.uri.s, msg->first_line.u.request.uri.len); + buf2[msg->first_line.u.request.uri.len] = 0; + if (regexec(&(comp), buf2, 0, NULL, 0) == 0) //regex match { regfree(&(comp)); return TRUE;

1 0

[kamailio/kamailio] ims_isc: fixed the RURI trigger point match (#2065)
by grosssoftware 13 Sep '19

13 Sep '19

- use the RURI from the SIP message in the regex compare, rather than the regex string from the trigger point   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2065 -- Commit Summary -- * ims_isc: fixed the RURI trigger point match -- File Changes -- M src/modules/ims_isc/checker.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2065.patch https://github.com/kamailio/kamailio/pull/2065.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/2065

2 2

git:master:36ee7fa7: ims_isc: fixed the RURI trigger point match
by Henning Westerholt 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: 36ee7fa70ee43cffc8e7f2c279fb97862daf3f9b URL: https://github.com/kamailio/kamailio/commit/36ee7fa70ee43cffc8e7f2c279fb978… Author: Jeff Gross <jeff(a)grosssoftware.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-13T21:30:23+02:00 ims_isc: fixed the RURI trigger point match - use the RURI from the SIP message in the regex compare, rather than the regex string from the trigger point --- Modified: src/modules/ims_isc/checker.c --- Diff: https://github.com/kamailio/kamailio/commit/36ee7fa70ee43cffc8e7f2c279fb978… Patch: https://github.com/kamailio/kamailio/commit/36ee7fa70ee43cffc8e7f2c279fb978… --- diff --git a/src/modules/ims_isc/checker.c b/src/modules/ims_isc/checker.c index 07381c79ab..de325687c0 100644 --- a/src/modules/ims_isc/checker.c +++ b/src/modules/ims_isc/checker.c @@ -189,22 +189,30 @@ static int isc_check_session_desc(ims_spt *spt, struct sip_msg *msg) { */ static int isc_check_ruri(ims_spt *spt, struct sip_msg *msg) { char buf[256]; + char buf2[256]; regex_t comp; if (spt->request_uri.len >= sizeof(buf)) { - LM_ERR("RURI \"%.*s\" is to long to be processed (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + LM_ERR("RURI regexp \"%.*s\" is too long to be compiled (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + + if (msg->first_line.u.request.uri.len >= sizeof(buf2)) { + LM_ERR("RURI \"%.*s\" is too long to be processed (max %d bytes)\n", msg->first_line.u.request.uri.len, msg->first_line.u.request.uri.s, (int) (sizeof(buf2) - 1)); return FALSE; } /* compile the regex for content */ memcpy(buf, spt->request_uri.s, spt->request_uri.len); buf[spt->request_uri.len] = 0; - if(regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + if (regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { LM_ERR("Error compiling the following regexp for RURI content: %.*s\n", spt->request_uri.len, spt->request_uri.s); return FALSE; } - if (regexec(&(comp), buf, 0, NULL, 0) == 0) //regex match + memcpy(buf2, msg->first_line.u.request.uri.s, msg->first_line.u.request.uri.len); + buf2[msg->first_line.u.request.uri.len] = 0; + if (regexec(&(comp), buf2, 0, NULL, 0) == 0) //regex match { regfree(&(comp)); return TRUE;

1 0

git:master:57332eb6: pkg/kamailio/deb: version set 5.3.0~pre1 [skip ci]
by Victor Seva 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: 57332eb67ca2fc086c27b19332b16a1a826f03a7 URL: https://github.com/kamailio/kamailio/commit/57332eb67ca2fc086c27b19332b16a1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-09-13T14:30:30+02:00 pkg/kamailio/deb: version set 5.3.0~pre1 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/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/57332eb67ca2fc086c27b19332b16a1… Patch: https://github.com/kamailio/kamailio/commit/57332eb67ca2fc086c27b19332b16a1…

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2019