sr-dev October 2009

sr-dev@lists.kamailio.org

30 participants
468 discussions

by Maxim Sobolev

sobomax 2009/10/30 10:34:14 CET SER CVS Repository Modified files: (Branch: RELENG_1_2) . rtpp_command.c Log: MFt: fix reference to a local variable before assignment. Revision Changes Path 1.24.2.3 +2 -1 rtpproxy/rtpp_command.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_command.c.diff?…

14 years, 5 months

CVS:commitlog: rtpproxy rtpp_command.c

by Maxim Sobolev

sobomax 2009/10/30 10:32:55 CET SER CVS Repository Modified files: . rtpp_command.c Log: Fix reference to local variable before assignment. Revision Changes Path 1.32 +2 -1 rtpproxy/rtpp_command.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_command.c.diff?…

14 years, 5 months

release branches

by Andrei Pelinescu-Onciul

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

14 years, 6 months

git:sr_3.0: Fixed avpops avp_db_store as before no state was used and it caused to loop endessly .

by Henning Westerholt

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)

14 years, 6 months

git:sr_3.0: Rewritten this small helper function

by Henning Westerholt

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'; + }

14 years, 6 months

git:sr_3.0: Declared pua_send_publish , as it was only defined (extern)

by Henning Westerholt

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);

14 years, 6 months

git:sr_3.0: Removed unused var (added last commit)

by Henning Westerholt

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 */

14 years, 6 months

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

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'; }

14 years, 6 months

git:sr_3.0: Fixed carrierroute module exports.

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 16f622e118daeffa2547243eeaf4d42c03f84b05 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16f622e… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 19 12:46:17 2009 +0300 Fixed carrierroute module exports. See http://lists.sip-router.org/pipermail/sr-dev/2009-October/004393.html thread for a complete description (cherry picked from commit ca28401667bcf8d65d942fdb29033eadb6bb82b2) --- modules/carrierroute/carrierroute.c | 6 +++--- modules/carrierroute/cr_func.c | 23 +++++++++++++++++++++++ modules/carrierroute/cr_func.h | 9 +++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/modules/carrierroute/carrierroute.c b/modules/carrierroute/carrierroute.c index ab91609..56a76ea 100644 --- a/modules/carrierroute/carrierroute.c +++ b/modules/carrierroute/carrierroute.c @@ -87,11 +87,11 @@ static void mod_destroy(void); /************* Module Exports **********************************************/ static cmd_export_t cmds[]={ {"cr_user_carrier", (cmd_function)cr_load_user_carrier, 3, cr_load_user_carrier_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"cr_route", (cmd_function)cr_route, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"cr_route", (cmd_function)cr_route5, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_route", (cmd_function)cr_route, 6, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"cr_prime_route", (cmd_function)cr_prime_route, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"cr_prime_route", (cmd_function)cr_prime_route5, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_prime_route", (cmd_function)cr_prime_route, 6, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"cr_nofallback_route",(cmd_function)cr_nofallback_route, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"cr_nofallback_route",(cmd_function)cr_nofallback_route5, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_nofallback_route",(cmd_function)cr_nofallback_route, 6, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_next_domain", (cmd_function)cr_load_next_domain, 6, cr_load_next_domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {0, 0, 0, 0, 0, 0} diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 316fde4..425bb0c 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -677,6 +677,14 @@ int cr_route(struct sip_msg * _msg, gparam_t *_carrier, _rewrite_user, _hsrc, alg_crc32, _descavp); } +int cr_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc) +{ + return cr_do_route(_msg, _carrier, _domain, _prefix_matching, + _rewrite_user, _hsrc, alg_crc32, NULL); +} + /** * rewrites the request URI of msg after determining the @@ -701,6 +709,13 @@ int cr_prime_route(struct sip_msg * _msg, gparam_t *_carrier, _rewrite_user, _hsrc, alg_prime, _descavp); } +int cr_prime_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc) +{ + return cr_do_route(_msg, _carrier, _domain, _prefix_matching, + _rewrite_user, _hsrc, alg_prime, NULL); +} /** * rewrites the request URI of msg after determining the * new destination URI with the crc32 hash algorithm. The difference @@ -726,6 +741,14 @@ int cr_nofallback_route(struct sip_msg * _msg, gparam_t *_carrier, _rewrite_user, _hsrc, alg_crc32_nofallback, _dstavp); } +int cr_nofallback_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc) +{ + return cr_do_route(_msg, _carrier, _domain, _prefix_matching, + _rewrite_user, _hsrc, alg_crc32_nofallback, NULL); +} + /** * Loads next domain from failure routing table and stores it in an AVP. diff --git a/modules/carrierroute/cr_func.h b/modules/carrierroute/cr_func.h index 9db6131..2fa9960 100644 --- a/modules/carrierroute/cr_func.h +++ b/modules/carrierroute/cr_func.h @@ -69,6 +69,9 @@ int cr_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, gparam_t *_descavp); +int cr_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc); /** @@ -89,6 +92,9 @@ int cr_prime_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, gparam_t *_descavp); +int cr_prime_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc); /** * @@ -111,6 +117,9 @@ int cr_nofallback_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, gparam_t *_dstavp); +int cr_nofallback_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc); /**

14 years, 6 months

git:sr_3.0: Fixed userblacklist exported function

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 988552519122e992911ac9e803c439fc7cbbddc5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9885525… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 19 11:27:25 2009 +0300 Fixed userblacklist exported function See http://lists.sip-router.org/pipermail/sr-dev/2009-October/004393.html thread for a complete description (cherry picked from commit ae18879b65d1a005639559ff689657b1cc2777d8) --- modules_k/userblacklist/userblacklist.c | 33 +++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/modules_k/userblacklist/userblacklist.c b/modules_k/userblacklist/userblacklist.c index 83a4f6e..57b2b84 100644 --- a/modules_k/userblacklist/userblacklist.c +++ b/modules_k/userblacklist/userblacklist.c @@ -82,6 +82,10 @@ static int check_user_blacklist_fixup(void** param, int param_no); /* ---- exported commands: */ static int check_user_blacklist(struct sip_msg *msg, char* str1, char* str2, char* str3, char* str4); static int check_user_whitelist(struct sip_msg *msg, char* str1, char* str2, char* str3, char* str4); +static int check_user_blacklist2(struct sip_msg *msg, char* str1, char* str2); +static int check_user_whitelist2(struct sip_msg *msg, char* str1, char* str2); +static int check_user_blacklist3(struct sip_msg *msg, char* str1, char* str2, char* str3); +static int check_user_whitelist3(struct sip_msg *msg, char* str1, char* str2, char* str3); static int check_blacklist(struct sip_msg *msg, struct check_blacklist_fs_t *arg1); /* ---- module init functions: */ @@ -95,10 +99,10 @@ struct mi_root * mi_reload_blacklist(struct mi_root* cmd, void* param); /* usag static cmd_export_t cmds[]={ - { "check_user_blacklist", (cmd_function)check_user_blacklist, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - { "check_user_whitelist", (cmd_function)check_user_whitelist, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - { "check_user_blacklist", (cmd_function)check_user_blacklist, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - { "check_user_whitelist", (cmd_function)check_user_whitelist, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_blacklist", (cmd_function)check_user_blacklist2, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_whitelist", (cmd_function)check_user_whitelist2, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_blacklist", (cmd_function)check_user_blacklist3, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_whitelist", (cmd_function)check_user_whitelist3, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_user_blacklist", (cmd_function)check_user_blacklist, 4, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_user_whitelist", (cmd_function)check_user_whitelist, 4, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_blacklist", (cmd_function)check_blacklist, 1, check_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, @@ -313,6 +317,27 @@ static int check_user_blacklist(struct sip_msg *msg, char* str1, char* str2, cha return check_user_list(msg, str1, str2, str3, str4, 0); } +static int check_user_whitelist2(struct sip_msg *msg, char* str1, char* str2) +{ + return check_user_list(msg, str1, str2, NULL, NULL, 1); +} + + +static int check_user_blacklist2(struct sip_msg *msg, char* str1, char* str2) +{ + return check_user_list(msg, str1, str2, NULL, NULL, 0); +} + +static int check_user_whitelist3(struct sip_msg *msg, char* str1, char* str2, char* str3) +{ + return check_user_list(msg, str1, str2, str3, NULL, 1); +} + + +static int check_user_blacklist3(struct sip_msg *msg, char* str1, char* str2, char* str3) +{ + return check_user_list(msg, str1, str2, str3, NULL, 0); +} /**

14 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2009