sr-dev July 2016

sr-dev@lists.kamailio.org

29 participants
297 discussions

modules/ipops: matching subnet with mask /0

by Michael Furmur

There is a bug in ipops module related to matching subnet with mask /0 modules/ipops/ipops_mod.c: > 533 static int w_ip_is_in_subnet(struct sip_msg* _msg, char* _s1, char* _s2) > ... > 538 int netmask = 0; > ... > 589 if (netmask == 0) > 590 { > 591 if (_compare_ips(string1.s, string1.len, ip1_type, string2.s, string2.len, ip2_type)) the code above has collision for cases when mask is not specified or specified as zero. for example: checking if 127.0.0.1 in 0.0.0.0/0 will give negative result because of exact ip matching instead of subnet matching and this is definitely not expected behavior if we speak about CIDR. the simplest fix is to init 'netmask' variable with -1 and check against -1 on branching: > 538 int netmask = -1; > 589 if (netmask == -1) please, check and fix -- Regards Michael Furmur

8 years, 4 months

git:master:fb369945: Merge pull request #703 from snen/module_parameter_regexp_fix

by GitHub

Module: kamailio Branch: master Commit: fb3699456115ca0196ee38646ddf431f7a73cf54 URL: https://github.com/kamailio/kamailio/commit/fb3699456115ca0196ee38646ddf431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-11T09:08:41+02:00 Merge pull request #703 from snen/module_parameter_regexp_fix core: fix regex error for modules parameters --- Modified: modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/fb3699456115ca0196ee38646ddf431… Patch: https://github.com/kamailio/kamailio/commit/fb3699456115ca0196ee38646ddf431… --- diff --git a/modparam.c b/modparam.c index 087f11e..851a5ce 100644 --- a/modparam.c +++ b/modparam.c @@ -59,15 +59,17 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) } len = strlen(regex); - reg = pkg_malloc(len + 2 + 1); + reg = pkg_malloc(len + 4 + 1); if (reg == 0) { LM_ERR("No memory left\n"); return -1; } reg[0] = '^'; - memcpy(reg + 1, regex, len); - reg[len + 1] = '$'; - reg[len + 2] = '\0'; + reg[1] = '('; + memcpy(reg + 2, regex, len); + reg[len + 2] = ')'; + reg[len + 3] = '$'; + reg[len + 4] = '\0'; if (regcomp(&preg, reg, REG_EXTENDED | REG_NOSUB | REG_ICASE)) { LM_ERR("Error while compiling regular expression\n");

8 years, 4 months

git:master:198b116b: core: fix regex error for modules parameters

by Dmitri Savolainen

Module: kamailio Branch: master Commit: 198b116b0d58e61d9c35fdd0988ce97192b8f61e URL: https://github.com/kamailio/kamailio/commit/198b116b0d58e61d9c35fdd0988ce97… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2016-07-10T17:37:51+03:00 core: fix regex error for modules parameters Ambiguous was possible in params for multiple modules in one config line. --- Modified: modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/198b116b0d58e61d9c35fdd0988ce97… Patch: https://github.com/kamailio/kamailio/commit/198b116b0d58e61d9c35fdd0988ce97… --- diff --git a/modparam.c b/modparam.c index 087f11e..851a5ce 100644 --- a/modparam.c +++ b/modparam.c @@ -59,15 +59,17 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) } len = strlen(regex); - reg = pkg_malloc(len + 2 + 1); + reg = pkg_malloc(len + 4 + 1); if (reg == 0) { LM_ERR("No memory left\n"); return -1; } reg[0] = '^'; - memcpy(reg + 1, regex, len); - reg[len + 1] = '$'; - reg[len + 2] = '\0'; + reg[1] = '('; + memcpy(reg + 2, regex, len); + reg[len + 2] = ')'; + reg[len + 3] = '$'; + reg[len + 4] = '\0'; if (regcomp(&preg, reg, REG_EXTENDED | REG_NOSUB | REG_ICASE)) { LM_ERR("Error while compiling regular expression\n");

8 years, 4 months

[kamailio/kamailio] core: fix regex error for modules parameters (#703)

by Dmitri Savolainen

Ambiguous was possible in params for multiple modules in one config line. For example ``` loadmodule "presence_dialoginfo.so" modparam("presence|dialplan", "db_url", "mysql://DBUSER:DBPASSWORD@localhost/DBNAME") ``` produced error `parameter <db_url> of type <1> not found in module <presence_dialoginfo>` because of ["presence_dialoginfo" =~ /^presence|dialplan$/] => True You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/703 -- Commit Summary -- * core: fix regex error for modules parameters -- File Changes -- M modparam.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/703.patch https://github.com/kamailio/kamailio/pull/703.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/703

8 years, 4 months

git:master:c3acb864: rtpproxy: comment about child init rank filtering

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c3acb864688656ef57d5a0a5263556fcf67d09d4 URL: https://github.com/kamailio/kamailio/commit/c3acb864688656ef57d5a0a5263556f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-08T13:48:48+02:00 rtpproxy: comment about child init rank filtering --- Modified: modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/c3acb864688656ef57d5a0a5263556f… Patch: https://github.com/kamailio/kamailio/commit/c3acb864688656ef57d5a0a5263556f… --- diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index a36d323..8e12bcc 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -862,6 +862,7 @@ child_init(int rank) if(rtpp_set_list==NULL ) return 0; + /* do not init sockets for PROC_INIT and main process when fork=yes */ if(rank==PROC_INIT || (rank==PROC_MAIN && dont_fork==0)) { return 0; }

8 years, 4 months

git:4.3:68141ae0: tm: check branch uri against current uri when deciding if append a new branch

by Federico Cabiddu

Module: kamailio Branch: 4.3 Commit: 68141ae0610faefafe3de25d98fcc09f9ffb2524 URL: https://github.com/kamailio/kamailio/commit/68141ae0610faefafe3de25d98fcc09… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2016-07-08T10:57:04+02:00 tm: check branch uri against current uri when deciding if append a new branch (cherry picked from commit 335e44635aa69ab73ec76f713a7d5ce7ce06748c) --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/68141ae0610faefafe3de25d98fcc09… Patch: https://github.com/kamailio/kamailio/commit/68141ae0610faefafe3de25d98fcc09… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index 7a928f7..01aacbc 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -127,7 +127,9 @@ int t_append_branches(void) { found = 0; for (i=0; i<outgoings; i++) { if (t->uac[i].ruid.len == ruid.len - && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len)) { + && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len) + && t->uac[i].uri.len == current_uri.len + && !memcmp(t->uac[i].uri.s, current_uri.s, current_uri.len)) { LM_DBG("branch already added [%.*s]\n", ruid.len, ruid.s); found = 1; break;

8 years, 4 months

git:4.4:0a274283: tm: check branch uri against current uri when deciding if append a new branch

by Federico Cabiddu

Module: kamailio Branch: 4.4 Commit: 0a274283514a34525daa471cf8e781fb339a870c URL: https://github.com/kamailio/kamailio/commit/0a274283514a34525daa471cf8e781f… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2016-07-08T10:56:44+02:00 tm: check branch uri against current uri when deciding if append a new branch (cherry picked from commit 335e44635aa69ab73ec76f713a7d5ce7ce06748c) --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/0a274283514a34525daa471cf8e781f… Patch: https://github.com/kamailio/kamailio/commit/0a274283514a34525daa471cf8e781f… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index f38a0a2..f745e75 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -127,7 +127,9 @@ int t_append_branches(void) { found = 0; for (i=0; i<outgoings; i++) { if (t->uac[i].ruid.len == ruid.len - && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len)) { + && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len) + && t->uac[i].uri.len == current_uri.len + && !memcmp(t->uac[i].uri.s, current_uri.s, current_uri.len)) { LM_DBG("branch already added [%.*s]\n", ruid.len, ruid.s); found = 1; break;

8 years, 4 months

git:master:76f1f06d: Merge pull request #702 from kamailio/grumvalski/ts_append-instance

by GitHub

Module: kamailio Branch: master Commit: 76f1f06d1edab3f4fd530ec28a6834adaf3d3e1a URL: https://github.com/kamailio/kamailio/commit/76f1f06d1edab3f4fd530ec28a6834a… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-08T10:54:18+02:00 Merge pull request #702 from kamailio/grumvalski/ts_append-instance tm: check branch uri against current uri when deciding if append a neâ¦ --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/76f1f06d1edab3f4fd530ec28a6834a… Patch: https://github.com/kamailio/kamailio/commit/76f1f06d1edab3f4fd530ec28a6834a… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index f38a0a2..f745e75 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -127,7 +127,9 @@ int t_append_branches(void) { found = 0; for (i=0; i<outgoings; i++) { if (t->uac[i].ruid.len == ruid.len - && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len)) { + && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len) + && t->uac[i].uri.len == current_uri.len + && !memcmp(t->uac[i].uri.s, current_uri.s, current_uri.len)) { LM_DBG("branch already added [%.*s]\n", ruid.len, ruid.s); found = 1; break;

8 years, 4 months

git:master:335e4463: tm: check branch uri against current uri when deciding if append a new branch

by grumvalski

Module: kamailio Branch: master Commit: 335e44635aa69ab73ec76f713a7d5ce7ce06748c URL: https://github.com/kamailio/kamailio/commit/335e44635aa69ab73ec76f713a7d5ce… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2016-07-07T16:06:51+02:00 tm: check branch uri against current uri when deciding if append a new branch --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/335e44635aa69ab73ec76f713a7d5ce… Patch: https://github.com/kamailio/kamailio/commit/335e44635aa69ab73ec76f713a7d5ce… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index f38a0a2..f745e75 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -127,7 +127,9 @@ int t_append_branches(void) { found = 0; for (i=0; i<outgoings; i++) { if (t->uac[i].ruid.len == ruid.len - && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len)) { + && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len) + && t->uac[i].uri.len == current_uri.len + && !memcmp(t->uac[i].uri.s, current_uri.s, current_uri.len)) { LM_DBG("branch already added [%.*s]\n", ruid.len, ruid.s); found = 1; break;

8 years, 4 months

[kamailio/kamailio] Conflict between tls module and mongo-c-driver with ssl enabled (#660)

by Daniel-Constantin Mierla

Crashes has been reported when using mongodb modules compiled with mongo-c-driver having ssl enabled. Using mongo-c-driver without ssl enabled doesn't expose the issue. To investigate mongo-c-driver sources and see if it is messing up with the memory manager set for libssl. --- 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/660

8 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2016