sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

git:andrei/path: core: append_branch & next_branch api changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/path Commit: c43dc0cd35eff000a2eb7e40c65d85367c58e412 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c43dc0c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 4 15:09:08 2009 +0200 core: append_branch & next_branch api changes - added path, branch flags support and switched the parameters to str for append_branch and next_branch. append_branch is now exactly the same as km_append_branch. - added ser_append_branch for compatibility with ser modules which don't need the extra parameters. - updated core code to use the modified api. --- action.c | 2 +- dset.c | 152 ++++++++++++++++----------------------------------------- dset.h | 46 +++++++++++++---- select_core.c | 6 +- 4 files changed, 83 insertions(+), 123 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c43…

15 years, 4 months

git:master: cr: bug fix in new introduced function, cr_nofallback_routing

by Henning Westerholt

Module: sip-router Branch: master Commit: 4fece01ed8687e1be8678dd4de63cebd2095d95b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fece01… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Sep 8 18:03:50 2009 +0200 cr: bug fix in new introduced function, cr_nofallback_routing --- modules/carrierroute/cr_func.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index fc16b0c..607d7a2 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -425,11 +425,11 @@ static int rewrite_on_rule(struct route_flags *rf_head, flag_t flags, str * dest } break; case alg_crc32_nofallback: - if(rf->dice_max == 0) { + if(rf->max_targets == 0) { LM_ERR("invalid dice_max value\n"); return -1; } - if ((prob = hash_func(msg, hash_source, rf->dice_max)) < 0) { + if ((prob = (hash_func(msg, hash_source, rf->dice_max) + 1)) < 0) { LM_ERR("could not hash message with CRC32"); return -1; }

15 years, 4 months

git:master: cr: protect against user error when backup is the same as initial host, port from r5924

by Henning Westerholt

Module: sip-router Branch: master Commit: cb632b338cad0e7229372bec7eb1cd0d97a63014 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb632b3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Sep 8 17:42:14 2009 +0200 cr: protect against user error when backup is the same as initial host, port from r5924 --- modules/carrierroute/cr_fifo.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/carrierroute/cr_fifo.c b/modules/carrierroute/cr_fifo.c index 6d1c271..073579d 100644 --- a/modules/carrierroute/cr_fifo.c +++ b/modules/carrierroute/cr_fifo.c @@ -781,6 +781,11 @@ static int update_route_data_recursor(struct dtrie_node_t *node, str * act_domai } if (opts->new_host.len > 0) { LM_INFO("deactivating host %.*s\n", rr->host.len, rr->host.s); + if ( opts->new_host.s && (strcmp(opts->new_host.s, rr->host.s) == 0)){ + LM_ERR("Backup host the same as initial host %.*s",rr->host.len, rr->host.s); + FIFO_ERR(E_WRONGOPT); + return -1; + } if (opts->new_host.len == 1 && opts->new_host.s[0] == 'a') { if ((backup = find_auto_backup(rf, rr)) == NULL) { LM_ERR("didn't find auto backup route\n");

15 years, 4 months

SF.net SVN: openser:[5924] branches/1.5/modules/carrierroute/cr_fifo.c

by Henning Westerholt

Revision: 5924 http://openser.svn.sourceforge.net/openser/?rev=5924&view=rev Author: henningw Date: 2009-09-07 10:36:27 +0000 (Mon, 07 Sep 2009) Log Message: ----------- - bug fix: protect against user error when backup is the same as initial host - patch from Marius Zbihlei Modified Paths: -------------- branches/1.5/modules/carrierroute/cr_fifo.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 4 months

git:master: modules_k/imc: degraded log message

by Juha Heinanen

Module: sip-router Branch: master Commit: c576a5a2e638aa05d31305d11ec05994af7584d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c576a5a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Sep 7 13:15:44 2009 +0300 modules_k/imc: degraded log message * Degraded log message from info to dbg in imc_parse_cmd function. --- modules_k/imc/imc_cmd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/imc/imc_cmd.c b/modules_k/imc/imc_cmd.c index f947451..e42595a 100644 --- a/modules_k/imc/imc_cmd.c +++ b/modules_k/imc/imc_cmd.c @@ -144,7 +144,7 @@ int imc_parse_cmd(char *buf, int len, imc_cmd_p cmd) } while(1); done: - LM_ERR("command: [%.*s]\n", cmd->name.len, cmd->name.s); + LM_DBG("command: [%.*s]\n", cmd->name.len, cmd->name.s); for(i=0; i<IMC_CMD_MAX_PARAM; i++) { if(cmd->param[i].len<=0)

15 years, 4 months

git:master: cr: new function 'cr_nofallback_route'

by Henning Westerholt

Module: sip-router Branch: master Commit: 8dc53feb5a6b72d9f3ebf934fed9564d4e884ed5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8dc53fe… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 7 10:34:58 2009 +0200 cr: new function 'cr_nofallback_route' - add new function 'cr_nofallback_route' which behaves exactly like the existing 'cr_prime_route' function but uses the standard CRC32 hash instead of this prime function to provide an path away from this function - mark 'cr_prime_route' function as obselete in docs - patch from Carsten Gross, carsten dot gross at 1und1 dot de --- modules/carrierroute/README | 1211 +++++++++++++---------- modules/carrierroute/carrierroute.c | 14 +- modules/carrierroute/cr_func.c | 47 +- modules/carrierroute/cr_func.h | 22 + modules/carrierroute/doc/carrierroute_admin.xml | 75 ++ 5 files changed, 812 insertions(+), 557 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8dc…

15 years, 4 months

git:master: cr: add random distribution function

by Henning Westerholt

Module: sip-router Branch: master Commit: 3b70140725f180026e30d327a0fb81b3e8902905 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b70140… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 7 10:19:38 2009 +0200 cr: add random distribution function - add a random distribution function to cr - patch from Marius Zbihlei, marius dot zbihlei at 1and1 dot ro --- modules/carrierroute/README | 6 +++--- modules/carrierroute/cr_fixup.c | 2 ++ modules/carrierroute/doc/carrierroute_admin.xml | 6 +++--- modules/carrierroute/prime_hash.c | 19 +++++++++++++++++++ modules/carrierroute/prime_hash.h | 2 ++ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/modules/carrierroute/README b/modules/carrierroute/README index 7192926..0ab8268 100644 --- a/modules/carrierroute/README +++ b/modules/carrierroute/README @@ -493,7 +493,7 @@ hash_source, descavp) be a contiguous range starting at 1, limited by the configuration parameter max_targets. Possible values for hash_source are: call_id, from_uri, from_user, to_uri and - to_user. + to_user and rand. * decsavp - Name of the AVP where to store the description. This parameter is optional. @@ -537,8 +537,8 @@ rewrite_user, hash_source, descavp) * hash_source - The hash values of the destination set must be a contiguous range starting at 1, limited by the configuration parameter max_targets. Possible values for - hash_source are: call_id, from_uri, from_user, to_uri and - to_user. + hash_source are: call_id, from_uri, from_user, to_uri , + to_user and rand * descavp - Name of the AVP where to store the description. This parameter is optional. diff --git a/modules/carrierroute/cr_fixup.c b/modules/carrierroute/cr_fixup.c index f832af4..94632f6 100644 --- a/modules/carrierroute/cr_fixup.c +++ b/modules/carrierroute/cr_fixup.c @@ -103,6 +103,8 @@ static enum hash_source hash_fixup(const char * my_hash_source) { return shs_to_uri; } else if (strcasecmp("to_user", my_hash_source) == 0) { return shs_to_user; + } else if (strcasecmp("rand", my_hash_source) == 0) { + return shs_rand; } else { return shs_error; } diff --git a/modules/carrierroute/doc/carrierroute_admin.xml b/modules/carrierroute/doc/carrierroute_admin.xml index 7814d83..656ff04 100644 --- a/modules/carrierroute/doc/carrierroute_admin.xml +++ b/modules/carrierroute/doc/carrierroute_admin.xml @@ -480,8 +480,8 @@ cr_tree_rewrite_uri(tree, domain) <para><emphasis>hash_source</emphasis> - The hash values of the destination set must be a contiguous range starting at 1, limited by the configuration parameter max_targets. Possible values for - hash_source are: call_id, from_uri, from_user, to_uri - and to_user. + hash_source are: call_id, from_uri, from_user, to_uri, + to_user and rand </para> </listitem> <listitem> @@ -551,7 +551,7 @@ cr_tree_rewrite_uri(tree, domain) be a contiguous range starting at 1, limited by the configuration parameter max_targets. Possible values for hash_source are: call_id, from_uri, from_user, to_uri - and to_user. + to_user and rand </para> </listitem> <listitem> diff --git a/modules/carrierroute/prime_hash.c b/modules/carrierroute/prime_hash.c index 8bb9579..25819c5 100644 --- a/modules/carrierroute/prime_hash.c +++ b/modules/carrierroute/prime_hash.c @@ -34,9 +34,13 @@ #include "../../lib/kcore/km_crc.h" #include <ctype.h> +#include <stdio.h> /* for snprintf */ +#include <stdlib.h> /* for rand */ #include "prime_hash.h" +#define CR_RANDBUF_S 20 +static char cr_randbuf[CR_RANDBUF_S]; static int determine_source(struct sip_msg *msg, enum hash_source source, str *source_string); @@ -44,6 +48,7 @@ static int validate_msg(struct sip_msg * msg); static int determine_call_id (struct sip_msg *msg, str *source_string); static int determine_fromto_uri (struct to_body *fromto, str *source_string); static int determine_fromto_user (struct to_body *fromto, str *source_string); +static int determine_fromrand(str* source_string); static int first_token (str *source_string); @@ -56,6 +61,7 @@ int hash_func (struct sip_msg * msg, if(determine_source (msg, source, &source_string) == -1) { return -1; } + crc32_uint(&source_string, &hash); ret = hash % denominator; @@ -128,6 +134,8 @@ static int determine_source (struct sip_msg *msg, enum hash_source source, return determine_fromto_uri (get_to(msg), source_string); case shs_to_user: return determine_fromto_user (get_to(msg), source_string); + case shs_rand: + return determine_fromrand(source_string); /* msg is not needed */ default: LM_ERR("unknown hash source %i.\n", (int) source); @@ -190,6 +198,17 @@ static int determine_fromto_user (struct to_body *fromto, str *source_string) { return 0; } +static int determine_fromrand(str* source_string){ + + snprintf(&cr_randbuf[0], CR_RANDBUF_S , "%d", rand()); + + LM_NOTICE("randbuf is %s\n", cr_randbuf); + source_string->s = cr_randbuf; + source_string->len = strlen(source_string->s); + + return 0; +} + static int first_token (str *source_string) { size_t len; diff --git a/modules/carrierroute/prime_hash.h b/modules/carrierroute/prime_hash.h index b059742..b383046 100644 --- a/modules/carrierroute/prime_hash.h +++ b/modules/carrierroute/prime_hash.h @@ -45,6 +45,7 @@ * - \b shs_from_user the username part of the URI in the From header field * - \b shs_to_uri the entire URI in the To header field * - \b shs_to_user the username part of the URI in the To header field + * - \b shs_rand some random data which is not related to any header field * - \b shs_error no hash specified */ enum hash_source { @@ -53,6 +54,7 @@ enum hash_source { shs_from_user, shs_to_uri, shs_to_user, + shs_rand, shs_error };

15 years, 4 months

git:master: registrar(k): port from r5923: information leak bug in registrar

by Henning Westerholt

Module: sip-router Branch: master Commit: f0a71b9957f94715c5cf7c25a7265e19ff1e277c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0a71b9… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 4 18:14:11 2009 +0200 registrar(k): port from r5923: information leak bug in registrar --- modules_k/registrar/save.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 148543f..470fbe4 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -197,6 +197,8 @@ static inline int no_contacts(udomain_t* _d, str* _a) if (res == 0) { /* Contacts found */ build_contact(r->contacts); ul.release_urecord(r); + } else { /* No contacts found */ + build_contact(NULL); } ul.unlock_udomain(_d, _a); return 0;

15 years, 4 months

[ openser-Bugs-2851214 ] Registrar leaks contacts from unrelated users

by SourceForge.net

Bugs item #2851214, was opened at 2009-09-04 14:26 Message generated for change (Settings changed) made by henningw You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2851214&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x >Status: Closed >Resolution: Fixed Priority: 5 Private: No Submitted By: Alex Hermann (axlh) >Assigned to: Henning Westerholt (henningw) Summary: Registrar leaks contacts from unrelated users Initial Comment: When an AOR with no active registrations queries for its current bindings (Contact: *, Expires: 0), the registrar returns the bindings of the AOR who was last handled by the same process instead of returning an empty list. Attached patch fixes this. Applies to 1.4 as well as 1.5. Btw, why does every caller of get_urecord() check for negative return code??? The function can only return 0 or 1. ---------------------------------------------------------------------- >Comment By: Henning Westerholt (henningw) Date: 2009-09-04 16:13 Message: Thanks for the patch Alex, i've applied it to the 1.3, 1.4 and 1.5 branches. With regards to your question, indeed this is strange. Perhaps in the past the function used to return a negative return value? Patches for this (against the sr master branch) are ok course welcome. :-) ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2851214&group_…

15 years, 4 months

SF.net SVN: openser:[5923] branches

by Henning Westerholt

Revision: 5923 http://openser.svn.sourceforge.net/openser/?rev=5923&view=rev Author: henningw Date: 2009-09-04 16:10:01 +0000 (Fri, 04 Sep 2009) Log Message: ----------- - fix information leak bug in registrar: When an AOR with no active registrations queries for its current bindings (Contact: *, Expires: 0), the registrar returns the bindings of the AOR who was last handled by the same process instead of returning an empty list. - closes #2851214, patch from Alex Hermann Modified Paths: -------------- branches/1.3/modules/registrar/save.c branches/1.4/modules/registrar/save.c branches/1.5/modules/registrar/save.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev