sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
169 discussions

git:3.3: modules_k/dispatcher: Dispatcher reload MI command not returning errors correctly

by Peter Dunkley

Module: sip-router Branch: 3.3 Commit: 7795ef185365eab558ed2c98e8d995f47fa823bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7795ef1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Aug 3 14:38:49 2012 +0100 modules_k/dispatcher: Dispatcher reload MI command not returning errors correctly - Fix by Hugh Waite @ Crocodile RCS (cherry picked from commit 5c83492470e8d1a706933915fcfbf6cfe2e0fd55) --- modules_k/dispatcher/dispatch.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 7429e97..cc8b7bf 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -678,6 +678,11 @@ int init_ds_db(void) } ret = ds_load_db(); + if (ret == -2) + { + LM_WARN("failure while loading one or more dispatcher entries\n"); + ret = 0; + } ds_disconnect_db(); @@ -691,6 +696,7 @@ int ds_load_db(void) int flags; int priority; int nrcols; + int dest_errs = 0; str uri; str attrs = {0, 0}; db1_res_t * res; @@ -764,17 +770,20 @@ int ds_load_db(void) } if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn) != 0) + { + dest_errs++; LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); + } } - ds_dbf.free_result(ds_db_handle, res); - if(reindex_dests(*next_idx, setn)!=0) { LM_ERR("error on reindex\n"); goto err2; } + ds_dbf.free_result(ds_db_handle, res); + /* update data - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; @@ -782,6 +791,8 @@ int ds_load_db(void) ds_print_sets(); + if (dest_errs > 0) + return -2; return 0; err2:

11 years, 9 months

git:3.3: modules_k/rls: Fixed segmentation fault in RLS

by Peter Dunkley

Module: sip-router Branch: 3.3 Commit: a87a6a94e26176511cf2cc7e5260d5c1f0861add URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a87a6a9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Aug 3 14:39:49 2012 +0100 modules_k/rls: Fixed segmentation fault in RLS - Fix by Paul Pankhurst @ Crocodile RCS (cherry picked from commit 49f25c402871a619404b61e29ff496c71daad8be) --- modules_k/rls/notify.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 82324a9..b923add 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -101,6 +101,7 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, int len_est; res_param_t param; int resource_added = 0; /* Flag to indicate that we have added at least one resource */ + multipart_body = NULL; LM_DBG("start\n"); /* query in alfabetical order */

11 years, 9 months

git:master: modules/tm: Enhanced t_replicate so that if a NULL string is used it replicates to $du

by Peter Dunkley

Module: sip-router Branch: master Commit: 19aafcfc262c16f98793ef135900cd65fca44522 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19aafcf… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Aug 3 14:37:20 2012 +0100 modules/tm: Enhanced t_replicate so that if a NULL string is used it replicates to $du - Added by Hugh Waite @ Crocodile RCS --- modules/tm/tm.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 3c60bbe..861b5eb 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -1532,27 +1532,32 @@ inline static int w_t_relay_to_avp( struct sip_msg *p_msg , int t_replicate_uri(struct sip_msg *msg, str *suri) { - struct proxy_l *proxy; + struct proxy_l *proxy = NULL; struct sip_uri turi; int r = -1; - memset(&turi, 0, sizeof(struct sip_uri)); - if(parse_uri(suri->s, suri->len, &turi)!=0) + if (suri != NULL && suri->s != NULL) { - LM_ERR("bad replicate SIP address!\n"); - return -1; - } + memset(&turi, 0, sizeof(struct sip_uri)); + if(parse_uri(suri->s, suri->len, &turi)!=0) + { + LM_ERR("bad replicate SIP address!\n"); + return -1; + } - proxy=mk_proxy(&turi.host, turi.port_no, turi.proto); - if (proxy==0) { - LM_ERR("cannot create proxy from URI <%.*s>\n", - suri->len, suri->s ); - return -1; - } + proxy=mk_proxy(&turi.host, turi.port_no, turi.proto); + if (proxy==0) { + LM_ERR("cannot create proxy from URI <%.*s>\n", + suri->len, suri->s ); + return -1; + } - r = t_replicate(msg, proxy, proxy->proto); - free_proxy(proxy); - pkg_free(proxy); + r = t_replicate(msg, proxy, proxy->proto); + free_proxy(proxy); + pkg_free(proxy); + } else { + r = t_replicate(msg, NULL, 0); + } return r; }

11 years, 9 months

git:master: modules_k/dispatcher: Dispatcher reload MI command not returning errors correctly

by Peter Dunkley

Module: sip-router Branch: master Commit: 5c83492470e8d1a706933915fcfbf6cfe2e0fd55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c83492… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Aug 3 14:38:49 2012 +0100 modules_k/dispatcher: Dispatcher reload MI command not returning errors correctly - Fix by Hugh Waite @ Crocodile RCS --- modules_k/dispatcher/dispatch.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 7429e97..cc8b7bf 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -678,6 +678,11 @@ int init_ds_db(void) } ret = ds_load_db(); + if (ret == -2) + { + LM_WARN("failure while loading one or more dispatcher entries\n"); + ret = 0; + } ds_disconnect_db(); @@ -691,6 +696,7 @@ int ds_load_db(void) int flags; int priority; int nrcols; + int dest_errs = 0; str uri; str attrs = {0, 0}; db1_res_t * res; @@ -764,17 +770,20 @@ int ds_load_db(void) } if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn) != 0) + { + dest_errs++; LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); + } } - ds_dbf.free_result(ds_db_handle, res); - if(reindex_dests(*next_idx, setn)!=0) { LM_ERR("error on reindex\n"); goto err2; } + ds_dbf.free_result(ds_db_handle, res); + /* update data - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; @@ -782,6 +791,8 @@ int ds_load_db(void) ds_print_sets(); + if (dest_errs > 0) + return -2; return 0; err2:

11 years, 9 months

git:master: modules_k/rls: Fixed segmentation fault in RLS

by Peter Dunkley

Module: sip-router Branch: master Commit: 49f25c402871a619404b61e29ff496c71daad8be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49f25c4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Aug 3 14:39:49 2012 +0100 modules_k/rls: Fixed segmentation fault in RLS - Fix by Paul Pankhurst @ Crocodile RCS --- modules_k/rls/notify.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 82324a9..b923add 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -101,6 +101,7 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, int len_est; res_param_t param; int resource_added = 0; /* Flag to indicate that we have added at least one resource */ + multipart_body = NULL; LM_DBG("start\n"); /* query in alfabetical order */

11 years, 9 months

git:3.3: pkg/kamailio/fedora/16: Updated version in .spec file

by Peter Dunkley

Module: sip-router Branch: 3.3 Commit: 1bd1c77b7c35cbdf88a09020954f4b780e08697d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1bd1c77… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Aug 3 11:34:31 2012 +0100 pkg/kamailio/fedora/16: Updated version in .spec file --- pkg/kamailio/fedora/16/kamailio.spec | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 46b0228..3b3704c 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.3.0 +%define ver 3.3.1 %define rel 0%{dist} @@ -940,6 +940,8 @@ fi %changelog +* Fri Aug 3 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Updated ver to 3.3.1 * Sat Jun 30 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Removed %_sharedir and replaced with standard macro %_datadir * Mon Jun 17 2012 Peter Dunkley <peter(a)dunkley.me.uk>

11 years, 9 months

git:3.3: pkg/kamailio/fedora/17: Fixed typo in appliance files

by Peter Dunkley

Module: sip-router Branch: 3.3 Commit: d7de94a452185fca7ae4ea1cb5bb9bd775b73d5e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d7de94a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Aug 3 11:32:28 2012 +0100 pkg/kamailio/fedora/17: Fixed typo in appliance files (cherry picked from commit 79a614ced2283264e3746cfcfd32fe4245f6496b) --- pkg/kamailio/fedora/17/kamailio-build.appl | 2 +- pkg/kamailio/fedora/17/kamailio.appl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kamailio/fedora/17/kamailio-build.appl b/pkg/kamailio/fedora/17/kamailio-build.appl index 1619699..216dceb 100644 --- a/pkg/kamailio/fedora/17/kamailio-build.appl +++ b/pkg/kamailio/fedora/17/kamailio-build.appl @@ -11,7 +11,7 @@ hardware: size: 6 packages: - @core - - @base + - @Base - bison # kamailio - db4-devel # kamailio-bdb - expat-devel # kamailio-xmpp diff --git a/pkg/kamailio/fedora/17/kamailio.appl b/pkg/kamailio/fedora/17/kamailio.appl index 76dd466..800931c 100644 --- a/pkg/kamailio/fedora/17/kamailio.appl +++ b/pkg/kamailio/fedora/17/kamailio.appl @@ -11,7 +11,7 @@ hardware: size: 2 packages: - @core - - @base + - @Base - db4 # kamailio-bdb - expat # kamailio-xmpp - GeoIP # kamailio-GeoIP

11 years, 9 months

git:master: pkg/kamailio/fedora/17: Fixed typo in appliance files

by Peter Dunkley

Module: sip-router Branch: master Commit: 79a614ced2283264e3746cfcfd32fe4245f6496b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79a614c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Aug 3 11:32:28 2012 +0100 pkg/kamailio/fedora/17: Fixed typo in appliance files --- pkg/kamailio/fedora/17/kamailio-build.appl | 2 +- pkg/kamailio/fedora/17/kamailio.appl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kamailio/fedora/17/kamailio-build.appl b/pkg/kamailio/fedora/17/kamailio-build.appl index ccb1257..4b97f0f 100644 --- a/pkg/kamailio/fedora/17/kamailio-build.appl +++ b/pkg/kamailio/fedora/17/kamailio-build.appl @@ -11,7 +11,7 @@ hardware: size: 6 packages: - @core - - @base + - @Base - bison # kamailio - db4-devel # kamailio-bdb - expat-devel # kamailio-xmpp diff --git a/pkg/kamailio/fedora/17/kamailio.appl b/pkg/kamailio/fedora/17/kamailio.appl index 1b46a1d..92970a8 100644 --- a/pkg/kamailio/fedora/17/kamailio.appl +++ b/pkg/kamailio/fedora/17/kamailio.appl @@ -11,7 +11,7 @@ hardware: size: 2 packages: - @core - - @base + - @Base - db4 # kamailio-bdb - expat # kamailio-xmpp - GeoIP # kamailio-GeoIP

11 years, 9 months

git:3.2: rr(k): add missing '<' in Route header for strict routing

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.2 Commit: cbb62f8619b513605498d00abc5d4c8b2f5654d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbb62f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 3 09:20:03 2012 +0200 rr(k): add missing '<' in Route header for strict routing - if next hop is strict router after loose routing, moving the r-uri to last Route header was missing '<' in front of the address - reported by Varsha Venkatraramani (cherry picked from commit 090be2532da73f51043f9ba5f4b221fe338d60fa) (cherry picked from commit a0ffdb7eb2b1478a98422123c78e15ce2b21449f) --- modules_k/rr/loose.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index 7d2c0e2..0dee913 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -49,6 +49,9 @@ #define RR_DRIVEN 1 /*!< The next hop is determined from the route set */ #define NOT_RR_DRIVEN -1 /*!< The next hop is not determined from the route set */ +#define RR_ROUTE_PREFIX ROUTE_PREFIX "<" +#define RR_ROUTE_PREFIX_LEN (sizeof(RR_ROUTE_PREFIX)-1) + #define ROUTE_SUFFIX ">\r\n" /*!< SIP header suffix */ #define ROUTE_SUFFIX_LEN (sizeof(ROUTE_SUFFIX)-1) @@ -304,7 +307,8 @@ static inline int save_ruri(struct sip_msg* _m) } /* Create buffer for new lump */ - len = ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len + ROUTE_SUFFIX_LEN; + len = RR_ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len + + ROUTE_SUFFIX_LEN; s = (char*)pkg_malloc(len); if (!s) { LM_ERR("No memory pkg left\n"); @@ -312,9 +316,11 @@ static inline int save_ruri(struct sip_msg* _m) } /* Create new header field */ - memcpy(s, ROUTE_PREFIX, ROUTE_PREFIX_LEN); - memcpy(s + ROUTE_PREFIX_LEN, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - memcpy(s + ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len, ROUTE_SUFFIX, ROUTE_SUFFIX_LEN); + memcpy(s, RR_ROUTE_PREFIX, RR_ROUTE_PREFIX_LEN); + memcpy(s + RR_ROUTE_PREFIX_LEN, _m->first_line.u.request.uri.s, + _m->first_line.u.request.uri.len); + memcpy(s + ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len, + ROUTE_SUFFIX, ROUTE_SUFFIX_LEN); LM_DBG("New header: '%.*s'\n", len, ZSW(s));

11 years, 9 months

git:3.3: rr(k): add missing '<' in Route header for strict routing

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: a0ffdb7eb2b1478a98422123c78e15ce2b21449f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0ffdb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 3 09:20:03 2012 +0200 rr(k): add missing '<' in Route header for strict routing - if next hop is strict router after loose routing, moving the r-uri to last Route header was missing '<' in front of the address - reported by Varsha Venkatraramani (cherry picked from commit 090be2532da73f51043f9ba5f4b221fe338d60fa) --- modules_k/rr/loose.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index b74797f..22360df 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -49,6 +49,9 @@ #define RR_DRIVEN 1 /*!< The next hop is determined from the route set */ #define NOT_RR_DRIVEN -1 /*!< The next hop is not determined from the route set */ +#define RR_ROUTE_PREFIX ROUTE_PREFIX "<" +#define RR_ROUTE_PREFIX_LEN (sizeof(RR_ROUTE_PREFIX)-1) + #define ROUTE_SUFFIX ">\r\n" /*!< SIP header suffix */ #define ROUTE_SUFFIX_LEN (sizeof(ROUTE_SUFFIX)-1) @@ -307,7 +310,8 @@ static inline int save_ruri(struct sip_msg* _m) } /* Create buffer for new lump */ - len = ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len + ROUTE_SUFFIX_LEN; + len = RR_ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len + + ROUTE_SUFFIX_LEN; s = (char*)pkg_malloc(len); if (!s) { LM_ERR("No memory pkg left\n"); @@ -315,9 +319,11 @@ static inline int save_ruri(struct sip_msg* _m) } /* Create new header field */ - memcpy(s, ROUTE_PREFIX, ROUTE_PREFIX_LEN); - memcpy(s + ROUTE_PREFIX_LEN, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - memcpy(s + ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len, ROUTE_SUFFIX, ROUTE_SUFFIX_LEN); + memcpy(s, RR_ROUTE_PREFIX, RR_ROUTE_PREFIX_LEN); + memcpy(s + RR_ROUTE_PREFIX_LEN, _m->first_line.u.request.uri.s, + _m->first_line.u.request.uri.len); + memcpy(s + ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len, + ROUTE_SUFFIX, ROUTE_SUFFIX_LEN); LM_DBG("New header: '%.*s'\n", len, ZSW(s));

11 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2012