sr-dev February 2010

sr-dev@lists.kamailio.org

31 participants
250 discussions

SF.net SVN: openser:[5990] branches/1.5/modules/userblacklist
by Henning Westerholt 24 Feb '10

24 Feb '10

Revision: 5990 http://openser.svn.sourceforge.net/openser/?rev=5990&view=rev Author: henningw Date: 2010-02-24 16:01:34 +0000 (Wed, 24 Feb 2010) Log Message: ----------- * add a small note about the global blacklist table this will be fixed more thoroughly in the upstream Modified Paths: -------------- branches/1.5/modules/userblacklist/README branches/1.5/modules/userblacklist/doc/userblacklist_db.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 1

[tracker] Task opened: make install overwrites existing tls.cfg file
by sip-router 24 Feb '10

24 Feb '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Klaus Darilion (klaus3000) Attached to Project - sip-router Summary - make install overwrites existing tls.cfg file Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - at least when using kamailio 3.0 a "make install" overwrites the existing tls.cfg :-( damn! More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=38 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Assignee added: make install overwrites existing tls.cfg file
by sip-router 24 Feb '10

24 Feb '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#38 - make install overwrites existing tls.cfg file User who did this - Klaus Darilion (klaus3000) http://sip-router.org/tracker/index.php?do=details&task_id=38 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

How to add moules ( make deb) under different dir
by Min Wang 24 Feb '10

24 Feb '10

Hi I am trying to compile openims ( make deb) under sip-router. Here is what I did: (1) Copy these modules cdp/pcscf etc to modules_osims (2) Then change Makefile.dirs modules_dirs= modules modules_s modules_k modules_osims (3) change pkg/debian/rules: MDIRS=modules modules_s modules_k modules_osims And add modules_osims to define PACKAGE_MODULE_INSTALL_template $(MAKE) install-modules-all modules="$(mod)" \ modules_s="" modules_k="" modules_osims="" \ as well (4) Then make deb, it seems nothing under modules_osims got compiled, Then I add modules_osims/cdp etc to ruls file: MODULES_SP= ... modules_osims/cdp ... (Not sure if need to add to PACKAGE_GROUPS?) Now the files under modules_osims got compiled, but no seperated module-deb files generated for those modules. ser_2.99.0-dev01_i386.deb ser-db-modules_2.99.0-dev01_i386.deb .... Inside the ser_2.99.0-dev01_i386.deb there is no moduels from modules_osims. Anything missing? Thanks. Kind Regards Min Wang

2 4

git:master: tls: disable kerberos more thoroughly [fix]
by Andrei Pelinescu-Onciul 24 Feb '10

24 Feb '10

Module: sip-router Branch: master Commit: 51ee5da9ebf09447f71d4393f7c5b703305ff46d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51ee5da… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 23 16:10:21 2010 +0100 tls: disable kerberos more thoroughly [fix] Older openssl versions (< 0.9.8e release) have a bug in the kerberos code (it uses the wrong malloc, for more details see openssl bug # 1467). While there is already a workaround for this openssl bug in the sr code (see commits 36cb8f & 560a42), in some situations this workaround causes another bug (crash on connection opening when openssl is compiled with kerberos support and kerberos is enabled for key exchange). The current fix will disable automatically all the ciphers containing KRB5 if the openssl version is < 0.9.8e beta1 or it is between 0.9.9-dev and 0.9.9-beta1. It iss equivalent to setting cipher_list to "<prev. value>:!KRB5". Impact: this fix is needed only if openssl is compiled with kerberos support and the version is < 0.9.8e. It also affects at least CentOS users with openssl-0.9.8e-12.el5_4.1 (in the centos openssl package they play some strange games with the version and report 0.9.8b via SSLeay). Tested-by: Klaus Darilion klaus.mailinglists at pernau.at Reported-by: Klaus Darilion klaus.mailinglists at pernau.at Reported-by: Andreas Rehbein rehbein at e-technik.org Reported-by: Martin Koenig koenig starface.de --- modules/tls/tls_domain.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index b0d5d3c..c4f25e8 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -271,6 +271,10 @@ static int load_ca_list(tls_domain_t* d) return 0; } +#define C_DEF_NO_KRB5 "DEFAULT:!KRB5" +#define C_DEF_NO_KRB5_LEN (sizeof(C_DEF_NO_KRB5)-1) +#define C_NO_KRB5_SUFFIX ":!KRB5" +#define C_NO_KRB5_SUFFIX_LEN (sizeof(C_NO_KRB5_SUFFIX)-1) /* * Configure cipher list @@ -279,12 +283,35 @@ static int set_cipher_list(tls_domain_t* d) { int i; int procs_no; - - if (!d->cipher_list.s) return 0; + char* cipher_list; + + cipher_list=d->cipher_list.s; +#ifdef TLS_KSSL_WORKARROUND + if (openssl_kssl_malloc_bug) { /* is openssl bug #1467 present ? */ + if (d->cipher_list.s==0) { + /* use "DEFAULT:!KRB5" */ + cipher_list="DEFAULT:!KRB5"; + } else { + /* append ":!KRB5" */ + cipher_list=shm_malloc(d->cipher_list.len+C_NO_KRB5_SUFFIX_LEN+1); + if (cipher_list) { + memcpy(cipher_list, d->cipher_list.s, d->cipher_list.len); + memcpy(cipher_list+d->cipher_list.len, C_NO_KRB5_SUFFIX, + C_NO_KRB5_SUFFIX_LEN); + cipher_list[d->cipher_list.len+C_NO_KRB5_SUFFIX_LEN]=0; + shm_free(d->cipher_list.s); + d->cipher_list.s=cipher_list; + d->cipher_list.len+=C_NO_KRB5_SUFFIX_LEN; + } + } + } +#endif /* TLS_KSSL_WORKARROUND */ + if (!cipher_list) return 0; procs_no=get_max_procs(); for(i = 0; i < procs_no; i++) { - if (SSL_CTX_set_cipher_list(d->ctx[i], d->cipher_list.s) == 0 ) { - ERR("%s: Failure to set SSL context cipher list\n", tls_domain_str(d)); + if (SSL_CTX_set_cipher_list(d->ctx[i], cipher_list) == 0 ) { + ERR("%s: Failure to set SSL context cipher list \"%s\"\n", + tls_domain_str(d), cipher_list); return -1; } }

2 2

git:master: cfg parser: segfault on case RE parse error fix
by Andrei Pelinescu-Onciul 24 Feb '10

24 Feb '10

Module: sip-router Branch: master Commit: d2871c1190291e4b801f42e0763e5ca7ea28ee36 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2871c1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 24 15:13:12 2010 +0100 cfg parser: segfault on case RE parse error fix Reported-by: Klaus Feichtinger klaus.feichtinger gmx net --- cfg.y | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cfg.y b/cfg.y index 453e6a1..e193674 100644 --- a/cfg.y +++ b/cfg.y @@ -2277,12 +2277,14 @@ if_cmd: ct_rval: rval_expr { $$=0; - if (!rve_is_constant($1)){ + if ($1 && !rve_is_constant($1)){ yyerror("constant expected"); + YYERROR; /* - } else if (!rve_check_type((enum rval_type*)&i_tmp, $1, 0, 0 ,0)){ + } else if ($1 && + !rve_check_type((enum rval_type*)&i_tmp, $1, 0, 0 ,0)){ yyerror("invalid expression (bad type)"); - }else if (i_tmp!=RV_INT){ + }else if ($1 && i_tmp!=RV_INT){ yyerror("invalid expression type, int expected\n"); */ }else @@ -2292,28 +2294,28 @@ ct_rval: rval_expr { single_case: CASE ct_rval COLON actions { $$=0; - if ($2==0) yyerror ("bad case label"); + if ($2==0) { yyerror ("bad case label"); YYERROR; } else if ((($$=mk_case_stm($2, 0, $4, &i_tmp))==0) && (i_tmp==-10)){ YYABORT; } } | CASE SLASH ct_rval COLON actions { $$=0; - if ($3==0) yyerror ("bad case label"); + if ($3==0) { yyerror ("bad case label"); YYERROR; } else if ((($$=mk_case_stm($3, 1, $5, &i_tmp))==0) && (i_tmp==-10)){ YYABORT; } } | CASE ct_rval COLON { $$=0; - if ($2==0) yyerror ("bad case label"); + if ($2==0) { yyerror ("bad case label"); YYERROR; } else if ((($$=mk_case_stm($2, 0, 0, &i_tmp))==0) && (i_tmp==-10)){ YYABORT; } } | CASE SLASH ct_rval COLON { $$=0; - if ($3==0) yyerror ("bad case label"); + if ($3==0) { yyerror ("bad regex case label"); YYERROR; } else if ((($$=mk_case_stm($3, 1, 0, &i_tmp))==0) && (i_tmp==-10)){ YYABORT; } @@ -2328,7 +2330,10 @@ single_case: YYABORT; } } - | CASE error { $$=0; yyerror("bad case label"); } + | CASE error COLON actions { $$=0; yyerror("bad case label"); } + | CASE SLASH error COLON actions { $$=0; yyerror("bad case regex label"); } + | CASE error COLON { $$=0; yyerror("bad case label"); } + | CASE SLASH error COLON { $$=0; yyerror("bad case regex label"); } | CASE ct_rval COLON error { $$=0; yyerror ("bad case body"); } ; case_stms:

1 0

git:master: Modules/registrar : update stats even if -DSTATISTICS was not passed to the compiles( this was the default)
by Marius Zbihlei 24 Feb '10

24 Feb '10

Module: sip-router Branch: master Commit: 3303a5b1f7c4ead6b0edd21d20e65b9957359200 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3303a5b… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Feb 17 13:57:05 2010 +0200 Modules/registrar : update stats even if -DSTATISTICS was not passed to the compiles(this was the default) update_stat was called even if the statistics where not added to the stats framework. --- modules_k/registrar/save.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index b641479..3b479f6 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -780,18 +780,16 @@ int save(struct sip_msg* _m, char* _d, char* _cflags) goto error; ret = (ret==0)?1:ret; } -#ifdef STATISTICS + update_stat(accepted_registrations, 1); -#endif + /* Only send reply upon request, not upon reply */ if ((route_type == REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) && (reg_send_reply(_m) < 0)) return -1; return ret; error: -#ifdef STATISTICS update_stat(rejected_registrations, 1); -#endif if ((route_type == REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) ) reg_send_reply(_m);

3 6

git:master: reg(k): fix compilation for kamailio flavour, reported from Daniel
by Henning Westerholt 24 Feb '10

24 Feb '10

Module: sip-router Branch: master Commit: be26e161a5f403cf8f368bb77b7d47067c3a546a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be26e16… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 24 15:07:38 2010 +0100 reg(k): fix compilation for kamailio flavour, reported from Daniel --- modules_k/registrar/reg_mod.h | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules_k/registrar/reg_mod.h b/modules_k/registrar/reg_mod.h index 477cfb4..2fda4ae 100644 --- a/modules_k/registrar/reg_mod.h +++ b/modules_k/registrar/reg_mod.h @@ -95,9 +95,8 @@ extern struct sl_binds slb; extern stat_var *accepted_registrations; extern stat_var *rejected_registrations; - -extern void default_expires_stats_update(str*, str*); -extern void min_expires_stats_update(str*, str*); -extern void max_expires_stats_update(str*, str*); +extern stat_var *default_expires_stat; +extern stat_var *min_expires_stat; +extern stat_var *max_expires_stat; #endif /* REG_MOD_H */

1 0

question about SWITCH statement
by Klaus Feichtinger 24 Feb '10

24 Feb '10

Hello, I have a question regarding the "SWITCH" statement from the core of sip-router / kamailio. In the news publication (http://www.kamailio.org/dokuwiki/doku.php/features:new-in-3.0.x) I found a description that the switch statement now supports "regular expression for matching string". However, when I try the example (as displayed on the wiki page) I get different error messages. The example that I've tested looks like: switch($rU) { case /^123/: sl_send_reply("200", "yippie - ^123 works"); case /^124.*/: sl_send_reply("200", "yippie - ^124.* works"); break; } Worst case was using the first case with the case label "/^123/". That resulted in a segmentation fault (!) with following error messages: loading modules under /usr/lib/kamailio/ 0(23229) : <core> [cfg.y:3329]: parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 374, column 16: syntax error 0(23229) : <core> [cfg.y:3329]: parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 374, column 16: bad expression Segmentation fault When I added ".*" to /^123/ as in case "/^124.*/" the error message was: loading modules under /usr/lib/kamailio/ 0(23256) : <core> [cfg.y:3329]: parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 374, column 15: syntax error 0(23256) : <core> [cfg.y:3329]: parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 374, column 15: bad case label 0(23256) : <core> [cfg.y:3329]: parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 374, column 15: bad case 0(23256) : <core> [cfg.y:3329]: parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 379, column 5: bad switch body What does sip-router / kamailio now REALLY support? Is the information about RegEx a mistake on the web page or is only the syntax wrong? However, in the CoreCookbook no entry can be found regarding RegEx for switch statement...... Regards, Klaus -- Sicherer, schneller und einfacher. Die aktuellen Internet-Browser - jetzt kostenlos herunterladen! http://portal.gmx.net/de/go/atbrowser

2 1

Question about config framework (ser)
by marius zbihlei 23 Feb '10

23 Feb '10

Hello In cfg/cfg_ctx.c : 888 there is the definition of the function cfg_get_by_name which gets called in case of a "sercmd cfg.get" command ... if (var->def->on_change_cb) { /* The variable cannot be retrieved, because the fixup function may have changed it, and it is better to return an error than an incorrect value */ return 1; } ... The "problem" is that if a use a fixup callback(or a on_change callback) , this function returns an error and the value cannot be read anymore via sercmd. What is the best way to proceed in this case? I am currently working on the modules_k/registrar module and if STATISTICS are used (default in kamailio build), I need to register some callbacks to be called when sercmd cfg.set_now_int (set_delayed_int) are called so I update kamailio's statistics framework with the new values passed from ser cfg framework. (for example min_expires, max_expires and others) Is there a way for the cfg framework to specify that the callback doesn't change the value (like in the case above)? Any ideas welcome. Cheers Marius

4 8

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2010