sr-dev August 2016

sr-dev@lists.kamailio.org

25 participants
197 discussions

[kamailio/kamailio] uri_db: added function to check any sip uri (#737)

by Rick

- until now only from and to uri can be checked - so added a function check_uri to check any uri You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/737 -- Commit Summary -- * uri_db: added function to check any sip uri -- File Changes -- M modules/uri_db/checks.c (25) M modules/uri_db/checks.h (6) M modules/uri_db/doc/uri_db_admin.xml (32) M modules/uri_db/uri_db.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/737.patch https://github.com/kamailio/kamailio/pull/737.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/737

7 years, 8 months

git:master:8a87faca: Merge pull request #738 from kamailio/lazedo-patch-1

by GitHub

Module: kamailio Branch: master Commit: 8a87faca2b88fa390bf6bf4dca88ed8c85376783 URL: https://github.com/kamailio/kamailio/commit/8a87faca2b88fa390bf6bf4dca88ed8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-08T08:47:17+02:00 Merge pull request #738 from kamailio/lazedo-patch-1 presence: fix crash when field value is null --- Modified: modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/8a87faca2b88fa390bf6bf4dca88ed8… Patch: https://github.com/kamailio/kamailio/commit/8a87faca2b88fa390bf6bf4dca88ed8… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 2a9b4d7..82ebf6b 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -2127,7 +2127,7 @@ int add_waiting_watchers(watcher_t *watchers, str pres_uri, str event) #define EXTRACT_STRING(strng, chars)\ do {\ strng.s = (char *) chars;\ - strng.len = strlen(strng.s);\ + strng.len = strng.s == NULL ? 0 : strlen(strng.s);\ } while(0); static int unset_watchers_updated_winfo(str *pres_uri)

7 years, 8 months

git:master:26249603: presence: fix crash when field value is null

by GitHub

Module: kamailio Branch: master Commit: 26249603066a13cdb8cb11b45af8410cd7adb82b URL: https://github.com/kamailio/kamailio/commit/26249603066a13cdb8cb11b45af8410… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-07T13:32:50+01:00 presence: fix crash when field value is null --- Modified: modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/26249603066a13cdb8cb11b45af8410… Patch: https://github.com/kamailio/kamailio/commit/26249603066a13cdb8cb11b45af8410… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 2a9b4d7..82ebf6b 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -2127,7 +2127,7 @@ int add_waiting_watchers(watcher_t *watchers, str pres_uri, str event) #define EXTRACT_STRING(strng, chars)\ do {\ strng.s = (char *) chars;\ - strng.len = strlen(strng.s);\ + strng.len = strng.s == NULL ? 0 : strlen(strng.s);\ } while(0); static int unset_watchers_updated_winfo(str *pres_uri)

7 years, 8 months

[kamailio/kamailio] presence: fix crash when field value is null (#738)

by lazedo

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/738 -- Commit Summary -- * presence: fix crash when field value is null -- File Changes -- M modules/presence/notify.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/738.patch https://github.com/kamailio/kamailio/pull/738.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/738

7 years, 8 months

git:4.3:105a17db: kazoo: init cfg framework in child processes

by Luis Azedo

Module: kamailio Branch: 4.3 Commit: 105a17db0dfabedfe13a65c9b855ad25668bec37 URL: https://github.com/kamailio/kamailio/commit/105a17db0dfabedfe13a65c9b855ad2… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2016-08-06T13:05:45+01:00 kazoo: init cfg framework in child processes fixes crashing since commit c7bec3320f6907c4edd8416a5e5cfa89b071a411 (cherry picked from commit d63869cd31a0ac0a61f218b3144de7a9f400e0ae) --- Modified: modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/105a17db0dfabedfe13a65c9b855ad2… Patch: https://github.com/kamailio/kamailio/commit/105a17db0dfabedfe13a65c9b855ad2… --- diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index e8b6749..5aa5709 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -324,6 +324,7 @@ static int mod_child_init(int rank) if (pid<0) return -1; /* error */ if(pid==0){ + if (cfg_child_init()) return -1; kz_amqp_consumer_proc(1); } else { @@ -331,6 +332,7 @@ static int mod_child_init(int rank) if (pid<0) return -1; /* error */ if(pid==0){ + if (cfg_child_init()) return -1; kz_amqp_publisher_proc(0); } else { @@ -338,6 +340,7 @@ static int mod_child_init(int rank) if (pid<0) return -1; /* error */ if(pid==0){ + if (cfg_child_init()) return -1; kz_amqp_timeout_proc(2); } else { @@ -346,6 +349,7 @@ static int mod_child_init(int rank) if (pid<0) return -1; /* error */ if(pid==0){ + if (cfg_child_init()) return -1; mod_consumer_proc(i+3); } }

7 years, 8 months

git:4.4:ab940349: kazoo: init cfg framework in child processes

by Luis Azedo

Module: kamailio Branch: 4.4 Commit: ab9403494300d5a07a7fe307c3666df8dbc23847 URL: https://github.com/kamailio/kamailio/commit/ab9403494300d5a07a7fe307c3666df… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2016-08-06T12:51:46+01:00 kazoo: init cfg framework in child processes fixes crashing since commit c7bec3320f6907c4edd8416a5e5cfa89b071a411 (cherry picked from commit d63869cd31a0ac0a61f218b3144de7a9f400e0ae) --- Modified: modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/ab9403494300d5a07a7fe307c3666df… Patch: https://github.com/kamailio/kamailio/commit/ab9403494300d5a07a7fe307c3666df… --- diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index 28c97bd..060242d 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -393,6 +393,7 @@ static int mod_child_init(int rank) if (pid<0) return -1; /* error */ if(pid==0){ + if (cfg_child_init()) return -1; close(kz_worker_pipes_fds[i*2+1]); return(kz_amqp_consumer_worker_proc(kz_worker_pipes_fds[i*2])); } @@ -406,6 +407,7 @@ static int mod_child_init(int rank) if (pid<0) return -1; /* error */ if(pid==0){ + if (cfg_child_init()) return -1; return(kz_amqp_consumer_proc(s)); } } @@ -416,6 +418,7 @@ static int mod_child_init(int rank) if (pid<0) return -1; /* error */ if(pid==0){ + if (cfg_child_init()) return -1; close(kz_cmd_pipe_fds[1]); kz_amqp_publisher_proc(kz_cmd_pipe_fds[0]); }

7 years, 8 months

what to do when cherry-picking (backporting) doesn't apply nicely

by Luis Azedo

Hi, i needed this commit https://github.com/kamailio/kamailio/commit/d63869cd31a0ac0a61f218b3144de7a… because of https://github.com/kamailio/kamailio/commit/c7bec3320f6907c4edd8416a5e5cfa8… the tm commit was backported to 4.4 and 4.3 my commit applies directly to 4.4 and that's not a problem but there were some changes in kazoo module from 4.3 to 4.4 and the cherry-pick doesn't apply nicely. what should we do in these situations since 4.3 needs this update ? Thanks

7 years, 8 months

git:master:d63869cd: kazoo: init cfg framework in child processes

by GitHub

Module: kamailio Branch: master Commit: d63869cd31a0ac0a61f218b3144de7a9f400e0ae URL: https://github.com/kamailio/kamailio/commit/d63869cd31a0ac0a61f218b3144de7a… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-06T12:41:14+01:00 kazoo: init cfg framework in child processes fixes crashing since commit c7bec3320f6907c4edd8416a5e5cfa89b071a411 --- Modified: modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/d63869cd31a0ac0a61f218b3144de7a… Patch: https://github.com/kamailio/kamailio/commit/d63869cd31a0ac0a61f218b3144de7a… --- diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index 28c97bd..060242d 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -393,6 +393,7 @@ static int mod_child_init(int rank) if (pid<0) return -1; /* error */ if(pid==0){ + if (cfg_child_init()) return -1; close(kz_worker_pipes_fds[i*2+1]); return(kz_amqp_consumer_worker_proc(kz_worker_pipes_fds[i*2])); } @@ -406,6 +407,7 @@ static int mod_child_init(int rank) if (pid<0) return -1; /* error */ if(pid==0){ + if (cfg_child_init()) return -1; return(kz_amqp_consumer_proc(s)); } } @@ -416,6 +418,7 @@ static int mod_child_init(int rank) if (pid<0) return -1; /* error */ if(pid==0){ + if (cfg_child_init()) return -1; close(kz_cmd_pipe_fds[1]); kz_amqp_publisher_proc(kz_cmd_pipe_fds[0]); }

7 years, 8 months

git:master:65336276: topos: skip comma at the end when reinserting rr headers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 65336276f219454210556b36f3d37a0e957d9c1c URL: https://github.com/kamailio/kamailio/commit/65336276f219454210556b36f3d37a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-08-05T08:27:41+02:00 topos: skip comma at the end when reinserting rr headers - reported by GH #716 --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/65336276f219454210556b36f3d37a0… Patch: https://github.com/kamailio/kamailio/commit/65336276f219454210556b36f3d37a0… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index 2f398e8..ecc67ef 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -629,6 +629,7 @@ int tps_reappend_route(sip_msg_t *msg, tps_data_t *ptsd, str *hbody, int rev) c = 1; if(sb.len>0) { sb.s = hbody->s + i + 1; + if(sb.s[sb.len-1]==',') sb.len--; if(tps_add_headers(msg, &hname, &sb, 0)<0) { return -1; } @@ -640,6 +641,7 @@ int tps_reappend_route(sip_msg_t *msg, tps_data_t *ptsd, str *hbody, int rev) if(c==1) { if(sb.len>0) { sb.s = hbody->s; + if(sb.s[sb.len-1]==',') sb.len--; if(tps_add_headers(msg, &hname, &sb, 0)<0) { return -1; } @@ -648,7 +650,9 @@ int tps_reappend_route(sip_msg_t *msg, tps_data_t *ptsd, str *hbody, int rev) } } - if(tps_add_headers(msg, &hname, hbody, 0)<0) { + sb = *hbody; + if(sb.s[sb.len-1]==',') sb.len--; + if(tps_add_headers(msg, &hname, &sb, 0)<0) { return -1; }

7 years, 8 months

git:master:f0e9c4b8: modules: readme files regenerated - ims_qos ...

by Kamailio Dev

Module: kamailio Branch: master Commit: f0e9c4b89bb0e8155c881f6a3e5ba7656b7c3b48 URL: https://github.com/kamailio/kamailio/commit/f0e9c4b89bb0e8155c881f6a3e5ba76… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-08-04T13:01:23+02:00 modules: readme files regenerated - ims_qos ... --- Modified: modules/ims_qos/README --- Diff: https://github.com/kamailio/kamailio/commit/f0e9c4b89bb0e8155c881f6a3e5ba76… Patch: https://github.com/kamailio/kamailio/commit/f0e9c4b89bb0e8155c881f6a3e5ba76…

7 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2016