sr-dev

sr-dev@lists.kamailio.org

3 participants
45197 discussions

release branches
by Andrei Pelinescu-Onciul 29 Oct '09

29 Oct '09

To prepare for the kamailio 3.0 and sip-router 3.0 releases (according to what we discussed at the sr meeting last week) I've created the sr_3.0 and also enabled kamailio_3.0 (meaning that it can be created anytime). The "main" branches will look like: master | * --- sr_3.0 | * --- kamailio_3.0 Only fixes should be committed to sr_3.0. It should become a generic stable branch, so it should not contain any specific changes (e.g. name changes only for sr_3.0 a.s.o.). When we will release 3.0, we will just create a sr_3.0_release branch and we will do any specific changes there. To minimize backporting/forwardporting work, if a bug is discovered on master or on kamailio_3.0 it should be fixed in the sr_3.0 branch and then latter sr_3.0 can be pulled (in master or kamailio_3.0): fix | | (commit) | (merge) v (merge) master <-------- sr_3.0 --------> kamailio_3.0 If by mistake a sr_3.0 relevant fix is committed first to another branch, git cherry-pick -x can (and should) be used to backport it. E.g.: git checkout sr_3.0 git cherry-pick -x <fix_commit_id> git pull origin sr_3.0:sr_3.0 If in any doubt, please create another branch (e.g. tmp/3.0_update or <username>/3.0_proposed_updates) and request a pull/merge or commit it into master. Be especially carefully not to merge by mistake master or kamailio_3.0 into sr_3.0. It's ok only to merge sr_3.0 into master and sr_3.0 into kamailio_3.0. Any other merge combination is bad. The kamailio_3.0 branch is not yet created, but it can be created any time the kamailio release managers decide it's best. It should be created from sr_3.0. E.g.: git checkout -b kamailio_3.0 origin/sr_3.0 git push origin HEAD:kamailio_3.0 # this command will create it If you think we should have some commit restrictions on this branch (IMHO to avoid mistakes is better to restrict the people who are allowed to commit on release branches) or sr_3.0, let me know. It would be better to avoid deleting files on the kamailio_3.0 branch. If a file is deleted then any merge or git cherry-pick that would involve changes to the deleted file will fail, requiring manual patching. Andrei

4 7

git:sr_3.0: When string was in the form of 0= on\n\0 this function caused a segmentation fault(canaries where overwritten ).
by Henning Westerholt 29 Oct '09

29 Oct '09

Module: sip-router Branch: sr_3.0 Commit: 4e49d033a49131a763b604c0d1f009d2a7c558fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e49d03… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 26 17:16:37 2009 +0200 When string was in the form of 0=on\n\0 this function caused a segmentation fault(canaries where overwritten). (cherry picked from commit e6f4dafdc43d90e9679ad4695e9729379245984d) --- modules/utils/conf.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/utils/conf.c b/modules/utils/conf.c index cb4380d..0ba4feb 100644 --- a/modules/utils/conf.c +++ b/modules/utils/conf.c @@ -76,11 +76,10 @@ static void remove_spaces(char *s) { char *p, *dst; - for (p = s, dst = s; *p != '\0'; ++p, ++dst) { + for (p = s, dst = s; *dst != '\0'; ++p, ++dst) { while (isspace(*p)) ++p; *dst = *p; } - *dst = '\0'; }

1 0

git:sr_3.0: Removed unused var (added last commit)
by Henning Westerholt 29 Oct '09

29 Oct '09

Module: sip-router Branch: sr_3.0 Commit: 0ab9d15ba34313387af9a08fdf0e233abe04089e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ab9d15… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 26 14:23:25 2009 +0200 Removed unused var (added last commit) (cherry picked from commit 60548b6b3475d82e5d4d8c9a4be53c8dfb32df5e) --- modules/avpops/avpops_impl.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index ab0ec91..3817cd8 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -660,7 +660,6 @@ int ops_dbstore_avps (struct sip_msg* msg, struct fis_param *sp, n =0 ; memset(&st, 0, sizeof(struct search_state)); - int counter = 1; if ((dbp->a.opd&AVPOPS_VAL_NONE)==0) { /* avp name is known ->set it and its type */

1 0

git:sr_3.0: Declared pua_send_publish , as it was only defined (extern)
by Henning Westerholt 29 Oct '09

29 Oct '09

Module: sip-router Branch: sr_3.0 Commit: 9cda8fa4a8d0634efc3b5933fa6eb3c18aea8e18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cda8fa… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 22 16:32:43 2009 +0300 Declared pua_send_publish ,as it was only defined (extern) (cherry picked from commit 981e9ba6cee17268ce761ee04d35b897a0fbd47e) --- modules_k/pua_dialoginfo/pua_dialoginfo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/pua_dialoginfo/pua_dialoginfo.c b/modules_k/pua_dialoginfo/pua_dialoginfo.c index c940548..eab17d1 100644 --- a/modules_k/pua_dialoginfo/pua_dialoginfo.c +++ b/modules_k/pua_dialoginfo/pua_dialoginfo.c @@ -75,6 +75,7 @@ int override_lifetime = DEF_OVERRIDE_LIFETIME; int caller_confirmed = DEF_CALLER_ALWAYS_CONFIRMED; +send_publish_t pua_send_publish; /** module functions */ static int mod_init(void);

1 0

git:sr_3.0: Rewritten this small helper function
by Henning Westerholt 29 Oct '09

29 Oct '09

Module: sip-router Branch: sr_3.0 Commit: 895e166d730efe6a975136b69171a9f097243771 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=895e166… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Oct 27 13:26:55 2009 +0200 Rewritten this small helper function (cherry picked from commit 4fed4c7b9db9ca8ad1b034d5afbd86fea4ebd6ba) --- modules/utils/conf.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/utils/conf.c b/modules/utils/conf.c index 0ba4feb..5df2a16 100644 --- a/modules/utils/conf.c +++ b/modules/utils/conf.c @@ -75,11 +75,11 @@ static int fwd_max_id = 0; static void remove_spaces(char *s) { char *p, *dst; - - for (p = s, dst = s; *dst != '\0'; ++p, ++dst) { - while (isspace(*p)) ++p; - *dst = *p; + for (p = s, dst = s; *p != '\0'; ++p) { + if (!isspace(*p)) *dst++ = *p; } + *dst = '\0'; + }

1 0

git:sr_3.0: Fixed avpops avp_db_store as before no state was used and it caused to loop endessly .
by Henning Westerholt 29 Oct '09

29 Oct '09

Module: sip-router Branch: sr_3.0 Commit: bbf9bcd1ca6a7f75f3b9f7a82c9ed606a4b990db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bbf9bcd… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 26 13:37:43 2009 +0200 Fixed avpops avp_db_store as before no state was used and it caused to loop endessly. (cherry picked from commit ffca34a67b64079cf66a0d4c0cd5419fff3f2255) --- modules/avpops/avpops_impl.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index c6fa543..ab0ec91 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -659,13 +659,14 @@ int ops_dbstore_avps (struct sip_msg* msg, struct fis_param *sp, /* set uuid/(username and domain) fields */ n =0 ; - + memset(&st, 0, sizeof(struct search_state)); + int counter = 1; if ((dbp->a.opd&AVPOPS_VAL_NONE)==0) { /* avp name is known ->set it and its type */ store_vals[1].val.str_val = dbp->sa; /*attr name*/ - avp = search_first_avp( name_type, avp_name, &i_s, 0); - for( ; avp; avp=search_first_avp( name_type, avp_name, &i_s, &st)) + avp = search_first_avp( name_type, avp_name, &i_s, &st); + for( ; avp; avp=search_next_avp( &st, &i_s)) { /* don't insert avps which were loaded */ if (avp->flags&AVP_IS_IN_DB)

1 0

git:sr_3.0: If the user parameter is "<null>" (e. g a empty username in the request URI), do not copy this value to the rewritten uri.
by Henning Westerholt 29 Oct '09

29 Oct '09

Module: sip-router Branch: sr_3.0 Commit: 084ad8a010db913785d23ccaeba654464cfd05f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=084ad8a… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 12 15:10:55 2009 +0300 If the user parameter is "<null>" (e.g a empty username in the request URI), do not copy this value to the rewritten uri. This is the case of a REGISTER request. Added statements that the parameters to the actually_rewrite func may not be null. (cherry picked from commit e06a69d625d4c1293fceef13f9eca22e14662f9f) --- modules/carrierroute/cr_func.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 607d7a2..316fde4 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -267,11 +267,10 @@ static struct route_rule * get_rule_by_hash(const struct route_flags * rf, /** * does the work for rewrite_on_rule, writes the new URI into dest * - * @param rs the route rule used for rewriting - * @param dest the returned new destination URI - * @param msg the sip message - * @param user the localpart of the uri to be rewritten - * @param descavp the name of the AVP where the description is stored + * @param rs the route rule used for rewriting, not NULL + * @param dest the returned new destination URI, not NULL + * @param msg the sip message, not NULL + * @param user the localpart of the uri to be rewritten, not NULL * * @return 0 on success, -1 on failure * @@ -284,11 +283,23 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, int_str avp_val; int strip = 0; + str l_user = *user; + strip = (rs->strip > user->len ? user->len : rs->strip); strip = (strip < 0 ? 0 : strip); - len = rs->local_prefix.len + user->len + rs->local_suffix.len + - AT_SIGN.len + rs->host.len - strip; + if ( strcmp(user->s, "<null>") == 0 || user->len == 0) + { + l_user.s = NULL; + l_user.len = 0; + len = rs->host.len; + strip = 0; + } + else{ + len = rs->local_prefix.len + l_user.len + rs->local_suffix.len + + AT_SIGN.len + rs->host.len - strip; + } + if (msg->parsed_uri.type == SIPS_URI_T) { len += SIPS_URI.len; } else { @@ -309,11 +320,11 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, memcpy(p, SIP_URI.s, SIP_URI.len); p += SIP_URI.len; } - if (user->len) { + if (l_user.len) { memcpy(p, rs->local_prefix.s, rs->local_prefix.len); p += rs->local_prefix.len; - memcpy(p, user->s + strip, user->len - strip); - p += user->len - strip; + memcpy(p, l_user.s + strip, l_user.len - strip); + p += l_user.len - strip; memcpy(p, rs->local_suffix.s, rs->local_suffix.len); p += rs->local_suffix.len; memcpy(p, AT_SIGN.s, AT_SIGN.len);

1 0

git:sr_3.0: Added kmi module to linkage (because of ../../modules_k/ xcap_client/xcap_client.so: undefined symbol: register_mi_mod )
by Henning Westerholt 29 Oct '09

29 Oct '09

Module: sip-router Branch: sr_3.0 Commit: 4a3712da5b3e7c8ed20748d9b57931690813af47 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a3712d… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 22 15:20:46 2009 +0300 Added kmi module to linkage (because of ../../modules_k/xcap_client/xcap_client.so: undefined symbol: register_mi_mod ) (cherry picked from commit b5dd92caf75c3cc9076a0fc59149fbf80bcb0949) --- modules_k/xcap_client/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/xcap_client/Makefile b/modules_k/xcap_client/Makefile index 8548d49..74843e5 100644 --- a/modules_k/xcap_client/Makefile +++ b/modules_k/xcap_client/Makefile @@ -18,4 +18,6 @@ DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 +SER_LIBS+=$(SERLIBPATH)/kmi/kmi + include ../../Makefile.modules

1 0

git:sr_3.0: Fixed include guard
by Henning Westerholt 29 Oct '09

29 Oct '09

Module: sip-router Branch: sr_3.0 Commit: f53daa928b52414cd910ea32e77892ddfa4d9fcd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f53daa9… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 22 16:14:06 2009 +0300 Fixed include guard Defined pua_send_* symbols as they where not defined when module was loaded (cherry picked from commit 3a2477ec529f87a51a6f1c0238ab8c12790b1807) --- modules_k/pua_usrloc/pua_usrloc.c | 2 ++ modules_k/pua_usrloc/pua_usrloc.h | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/pua_usrloc/pua_usrloc.c b/modules_k/pua_usrloc/pua_usrloc.c index ac5b637..a8bfda7 100644 --- a/modules_k/pua_usrloc/pua_usrloc.c +++ b/modules_k/pua_usrloc/pua_usrloc.c @@ -63,6 +63,8 @@ static int mod_init(void); int pua_set_publish(struct sip_msg* , char*, char*); +send_publish_t pua_send_publish; +send_subscribe_t pua_send_subscribe; static cmd_export_t cmds[]= { diff --git a/modules_k/pua_usrloc/pua_usrloc.h b/modules_k/pua_usrloc/pua_usrloc.h index ba50c75..673b02a 100644 --- a/modules_k/pua_usrloc/pua_usrloc.h +++ b/modules_k/pua_usrloc/pua_usrloc.h @@ -23,7 +23,7 @@ */ #ifndef _PUA_UL_ -#define _PUA_UL +#define _PUA_UL_ #include "../pua/pua_bind.h" extern send_publish_t pua_send_publish;

1 0

git:sr_3.0: Fixed tm_load import ( It would be advisable to use tm_load_api instead )
by Henning Westerholt 29 Oct '09

29 Oct '09

Module: sip-router Branch: sr_3.0 Commit: 8854c7446dc60f7133c58aa7b498c47a406d5574 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8854c74… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 22 16:31:35 2009 +0300 Fixed tm_load import (It would be advisable to use tm_load_api instead ) (cherry picked from commit 12d008ca184460755f09bf4090f0298d4a092e84) --- modules_k/pua_xmpp/pua_xmpp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/pua_xmpp/pua_xmpp.c b/modules_k/pua_xmpp/pua_xmpp.c index bc60bfc..3212c8d 100644 --- a/modules_k/pua_xmpp/pua_xmpp.c +++ b/modules_k/pua_xmpp/pua_xmpp.c @@ -136,11 +136,12 @@ static int mod_init(void) server_address.len= strlen(server_address.s); /* import the TM auto-loading function */ - if((load_tm=(load_tm_f)find_export("load_tm", 0, 0))==NULL) + if((load_tm=(load_tm_f)find_export("load_tm", NO_SCRIPT, 0))==NULL) { LM_ERR("can't import load_tm\n"); return -1; } + /* let the auto-loading function load all TM stuff */ if(load_tm(&tmb)==-1)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev