sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

git:master: make: fix the module path in installed cfg
by Andrei Pelinescu-Onciul 06 May '09

06 May '09

Module: sip-router Branch: master Commit: a88b7d6f18d98ed877b6295dbc9526155dbd688e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a88b7d6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 6 17:48:05 2009 +0200 make: fix the module path in installed cfg - fix: the module path is updated in the installed cfg and man pages (broken when the multiple modules were added). --- Makefile | 16 +++++++++++----- Makefile.defs | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 4079bb7..160f1c4 100644 --- a/Makefile +++ b/Makefile @@ -382,7 +382,8 @@ nullstring= space=$(nullstring) $(nullstring) modules_search_path=$(subst $(space),:,$(strip\ - $(addprefix $(modules_target),$(modules_dirs)))) + $(foreach m,$(modules_dirs),$($(m)_target)))) + # $(addprefix $(modules_target),$(modules_dirs)))) main.o: DEFS+=-DMODS_DIR='"$(modules_search_path)"' @@ -455,6 +456,7 @@ print-modules: define MODULES_RULES_template $(1)_dst=$(modules_prefix)/$(modules_dir)$(1) +$(1)_target=$(prefix)/$(modules_dir)$(1) .PHONY: $(1) $(1): modules.lst @@ -738,7 +740,8 @@ $(man_prefix)/$(man_dir)/man5: # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) install-cfg: $(cfg_prefix)/$(cfg_dir) - sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/ser/$(m)$[:/\"]$#$($(m)_target)\1#g") \ < etc/ser-basic.cfg > $(cfg_prefix)/$(cfg_dir)ser.cfg.sample chmod 644 $(cfg_prefix)/$(cfg_dir)ser.cfg.sample if [ -z "${skip_cfg_install}" -a \ @@ -746,7 +749,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) mv -f $(cfg_prefix)/$(cfg_dir)ser.cfg.sample \ $(cfg_prefix)/$(cfg_dir)ser.cfg; \ fi - sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/ser/$(m)$[:/\"]$#$($(m)_target)\1#g") \ < etc/ser-oob.cfg \ > $(cfg_prefix)/$(cfg_dir)ser-advanced.cfg.sample chmod 644 $(cfg_prefix)/$(cfg_dir)ser-advanced.cfg.sample @@ -850,13 +854,15 @@ install-doc: $(doc_prefix)/$(doc_dir) install-every-module-doc install-ser-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 sed -e "s#/etc/ser/ser\.cfg#$(cfg_target)ser.cfg#g" \ -e "s#/usr/sbin/#$(bin_target)#g" \ - -e "s#/usr/lib/ser/modules/#$(modules_target)#g" \ + $(foreach m,$(modules_dirs),\ + -e "s#/usr/lib/ser/$(m)$[^_]$#$($(m)_target)\1#g") \ -e "s#/usr/share/doc/ser/#$(doc_target)#g" \ < ser.8 > $(man_prefix)/$(man_dir)/man8/ser.8 chmod 644 $(man_prefix)/$(man_dir)/man8/ser.8 sed -e "s#/etc/ser/ser\.cfg#$(cfg_target)ser.cfg#g" \ -e "s#/usr/sbin/#$(bin_target)#g" \ - -e "s#/usr/lib/ser/modules/#$(modules_target)#g" \ + $(foreach m,$(modules_dirs),\ + -e "s#/usr/lib/ser/$(m)$[^_]$#$($(m)_target)\1#g") \ -e "s#/usr/share/doc/ser/#$(doc_target)#g" \ < ser.cfg.5 > $(man_prefix)/$(man_dir)/man5/ser.cfg.5 chmod 644 $(man_prefix)/$(man_dir)/man5/ser.cfg.5 diff --git a/Makefile.defs b/Makefile.defs index c2b23a8..1bead07 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -234,7 +234,7 @@ share_prefix = $(basedir)$(prefix) # target dirs for various stuff cfg_target = $(prefix)/$(cfg_dir) bin_target = $(prefix)/$(bin_dir) -modules_target = $(prefix)/$(modules_dir) +#modules_target = $(prefix)/$(modules_dir) lib_target = $(prefix)/$(lib_dir) doc_target = $(prefix)/$(doc_dir) @@ -1709,7 +1709,7 @@ saved_chg_vars:=\ cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \ share_prefix share_dir lib_prefix lib_dir \ - cfg_target lib_target modules_target + cfg_target lib_target #export relevant variables to the sub-makes

1 0

git:master: core script parsing: various small fixes
by Andrei Pelinescu-Onciul 06 May '09

06 May '09

Module: sip-router Branch: master Commit: b269c881615482456499488484ef2b380be25423 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b269c88… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 6 16:45:04 2009 +0200 core script parsing: various small fixes - fix: allow "default" in a config var id (e.g. session_timer.default). It stopped working after default became a keyword (switch()). - fix: allow negative number in selects (e.g. @eval.pop[-1]) - fix: allow negative number in function parameters - fix setavpflag, resetavpflag, isavpflag and "simple" avp names --- cfg.y | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 38 insertions(+), 11 deletions(-) diff --git a/cfg.y b/cfg.y index 49608a2..a0b13d6 100644 --- a/cfg.y +++ b/cfg.y @@ -561,6 +561,7 @@ static int case_check_default(struct case_stms* stms); %type <strval> route_name; %type <intval> avpflag_oper %type <intval> rve_un_op +%type <strval> cfg_var_id /* %type <intval> rve_op */ /*%type <route_el> rules; @@ -1361,29 +1362,37 @@ assign_stm: | cfg_var | error EQUAL { yyerror("unknown config variable"); } ; + +cfg_var_id: ID + | DEFAULT { $$="default" ; } /*needed to allow default as cfg var. name*/ + ; + cfg_var: - ID DOT ID EQUAL NUMBER { + cfg_var_id DOT cfg_var_id EQUAL NUMBER { if (cfg_declare_int($1, $3, $5, 0, 0, NULL)) { yyerror("variable cannot be declared"); } } - | ID DOT ID EQUAL STRING { + | cfg_var_id DOT cfg_var_id EQUAL STRING { if (cfg_declare_str($1, $3, $5, NULL)) { yyerror("variable cannot be declared"); } } - | ID DOT ID EQUAL NUMBER CFG_DESCRIPTION STRING { + | cfg_var_id DOT cfg_var_id EQUAL NUMBER CFG_DESCRIPTION STRING { if (cfg_declare_int($1, $3, $5, 0, 0, $7)) { yyerror("variable cannot be declared"); } } - | ID DOT ID EQUAL STRING CFG_DESCRIPTION STRING { + | cfg_var_id DOT cfg_var_id EQUAL STRING CFG_DESCRIPTION STRING { if (cfg_declare_str($1, $3, $5, $7)) { yyerror("variable cannot be declared"); } } - | ID DOT ID EQUAL error { yyerror("number or string expected"); } + | cfg_var_id DOT cfg_var_id EQUAL error { + yyerror("number or string expected"); + } ; + module_stm: LOADMODULE STRING { DBG("loading module %s\n", $2); @@ -2010,7 +2019,7 @@ select_param: sel.params[sel.n].v.s.len = strlen($1); sel.n++; } - | ID LBRACK NUMBER RBRACK { + | ID LBRACK intno RBRACK { if (sel.n >= MAX_SELECT_PARAMS-2) { yyerror("Select identifier too long\n"); } @@ -2071,8 +2080,8 @@ attr_spec: attr_mark: ATTR_MARK { s_attr = (struct avp_spec*)pkg_malloc(sizeof(struct avp_spec)); - if (!s_attr) { yyerror("No memory left"); } - s_attr->type = 0; + if (!s_attr) { yyerror("No memory left"); YYABORT; } + else s_attr->type = 0; } ; attr_id: @@ -2108,6 +2117,17 @@ attr_id_any: ; attr_id_any_str: attr_id + | avp_pvar { + if ($1->type==LV_AVP){ + s_attr = pkg_malloc(sizeof(struct avp_spec)); + if (!s_attr) { yyerror("No memory left"); YYABORT; } + else{ + *s_attr=$1->lv.avps; + } + }else + $$=0; /* not an avp, a pvar */ + pkg_free($1); + } | STRING { avp_spec_t *avp_spec; str s; @@ -2266,8 +2286,8 @@ rve_op: PLUS { $$=RVE_PLUS_OP; } rval_expr: rval { $$=$1; if ($$==0){ - yyerror("out of memory\n"); - YYABORT; + /*yyerror("out of memory\n");*/ + YYERROR; } } | rve_un_op %prec NOT rval_expr {$$=mk_rve1($1, $2); } @@ -2589,6 +2609,13 @@ cmd: if (i_tmp==0) yyerror("avpflag not declared"); $$=mk_action(AVPFLAG_OPER_T, 3, AVP_ST, $3, NUMBER_ST, (void*)(long)i_tmp, NUMBER_ST, (void*)$1); } + | avpflag_oper LPAREN attr_id_any_str COMMA error RPAREN { + $$=0; yyerror("error parsing flag name"); + } + | avpflag_oper LPAREN error COMMA flag_name RPAREN { + $$=0; yyerror("error parsing first parameter (avp or string)"); + } + | avpflag_oper LPAREN error RPAREN { $$=0; yyerror("bad parameters"); } | avpflag_oper error { $$=0; yyerror("missing '(' or ')'?"); } | ERROR LPAREN STRING COMMA STRING RPAREN {$$=mk_action(ERROR_T, 2, STRING_ST, $3, STRING_ST, $5); } | ERROR error { $$=0; yyerror("missing '(' or ')' ?"); } @@ -2765,7 +2792,7 @@ func_params: | func_params error { yyerror("call params error\n"); } ; func_param: - NUMBER { + intno { if (mod_func_action->val[1].u.number < MAX_ACTIONS-2) { mod_func_action->val[mod_func_action->val[1].u.number+2].type = NUMBER_ST;

1 0

git:master: cfg: example configs migrated to sip-router
by Andrei Pelinescu-Onciul 06 May '09

06 May '09

Module: sip-router Branch: master Commit: ec8e49e8b6b8cc8d5fe06bf2797c36f9671f7c9e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec8e49e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 6 17:50:53 2009 +0200 cfg: example configs migrated to sip-router Ported ser example configs to sip-router: - updated module path (now using loadpath) - changed mysql module name to db_mysql - replaced max_len in msg:len comparisons with 4096 - updated avp and selects non-empty checks: if($v) -> if ($v!="") if(!$v) -> if (strempty($v)) or if ($v=="") --- etc/ser-basic.cfg | 24 +++++++++------ etc/ser-oob.cfg | 60 ++++++++++++++++++++------------------ etc/ser.cfg | 83 +++++++++++++++++++++++++++------------------------- 3 files changed, 88 insertions(+), 79 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ec8…

1 0

sip router presentation at amoocon 2009
by Daniel-Constantin Mierla 06 May '09

06 May '09

Hello, those interested in seeing the slides I presented at Amoocon 2009, can get the link to them at: http://sip-router.org/2009/05/05/amoocon-2009-presentation/ Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

1 0

git:master: test: adaption of kamailio specific scripts to sr, more generalization
by Henning Westerholt 06 May '09

06 May '09

Module: sip-router Branch: master Commit: 21ac862fd73687d469f3e0ef9e535c521cfc3e75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21ac862… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 6 17:12:17 2009 +0200 test: adaption of kamailio specific scripts to sr, more generalization --- test/unit/include/common | 15 ++++++++++----- test/unit/include/require | 11 ++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/test/unit/include/common b/test/unit/include/common index 48f48b2..feda07e 100644 --- a/test/unit/include/common +++ b/test/unit/include/common @@ -1,6 +1,11 @@ +# all database modules DB_ALL_MOD="acc|alias_db|auth_db|avpops|dialog|dialplan|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt|userblacklist" -CTLRC="kamctlrc" -CTL="kamctl" -DBCTL="kamdbctl" -BIN="kamailio" -KILL="killall -15 kamailio" \ No newline at end of file +# root directory relative to tests +SR_DIR="../.." +CTLRC="$SR_DIR/scripts/kamctlrc" +CTL="$SR_DIR/scripts/kamctl" +DBCTL="$SR_DIR/scripts/kamdbctl" +BIN="$SR_DIR/ser" +KILL="killall -15 $BIN" +# test directory relative to root +TEST_DIR="test/unit" \ No newline at end of file diff --git a/test/unit/include/require b/test/unit/include/require index fef0bcb..80a1058 100644 --- a/test/unit/include/require +++ b/test/unit/include/require @@ -16,8 +16,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +source include/common + function check_kamailio() { - if ! (test -e ../kamailio) ; then + if ! (test -e $BIN) ; then echo "kamailio not found, not run" return -1 fi; @@ -30,8 +32,11 @@ function check_module() { return -1 fi - if ! (test -e ../modules/$1/$1.so) ; then - echo "modules/$1/$1.so not found, not run" + if ! (test -e $SR_DIR/modules_k/$1/$1.so) ; then + echo "$SR_DIR/modules_k/$1/$1.so not found, try $SR_DIR/modules" + fi; + if ! (test -e $SR_DIR/modules/$1/$1.so) ; then + echo "$SR_DIR/modules/$1/$1.so not found, not run" return -1 fi; return 0

1 0

git:master: refine 15e2e89e5d1e7f9dc6265c270153088596159ee5, remove instead comment out
by Henning Westerholt 06 May '09

06 May '09

Module: sip-router Branch: master Commit: 778362943cce3c1d27c8e1afac25bfceeb4aa0fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7783629… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 6 14:31:33 2009 +0200 refine 15e2e89e5d1e7f9dc6265c270153088596159ee5, remove instead comment out --- modules_s/uri/Makefile | 1 - modules_s/uri/checks.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules_s/uri/Makefile b/modules_s/uri/Makefile index d7d185f..a755e14 100644 --- a/modules_s/uri/Makefile +++ b/modules_s/uri/Makefile @@ -13,6 +13,5 @@ LIBS= DEFS+=-DSER_MOD_INTERFACE SERLIBPATH=../../lib -#SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2 include ../../Makefile.modules diff --git a/modules_s/uri/checks.c b/modules_s/uri/checks.c index 9d5a1c6..a703d92 100644 --- a/modules_s/uri/checks.c +++ b/modules_s/uri/checks.c @@ -43,7 +43,6 @@ #include "../../parser/parse_uri.h" #include "../../parser/parse_param.h" #include "../../ut.h" /* Handy utilities */ -//#include "../../lib/srdb2/db.h" /* Database API */ #include "../../dset.h" #include "uri_mod.h" #include "checks.h"

1 0

git:master: port from k r5751, fscanf can fail, fix warning related to recent glibc versions
by Henning Westerholt 06 May '09

06 May '09

Module: sip-router Branch: master Commit: 5dbe4f22ddc81c67cebe89c072cbffc0daf3aecd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5dbe4f2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 6 15:04:34 2009 +0200 port from k r5751, fscanf can fail, fix warning related to recent glibc versions --- daemonize.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/daemonize.c b/daemonize.c index 03552be..e87bec2 100644 --- a/daemonize.c +++ b/daemonize.c @@ -133,7 +133,9 @@ int daemonize(char* name) if (pid_file!=0){ if ((pid_stream=fopen(pid_file, "r"))!=NULL){ - fscanf(pid_stream, "%d", &p); + if (fscanf(pid_stream, "%d", &p) < 0) { + LM_WARN("could not parse pid file %s\n", pid_file); + } fclose(pid_stream); if (p==-1){ LOG(L_CRIT, "pid file %s exists, but doesn't contain a valid" @@ -161,7 +163,9 @@ int daemonize(char* name) if (pgid_file!=0){ if ((pid_stream=fopen(pgid_file, "r"))!=NULL){ - fscanf(pid_stream, "%d", &p); + if (fscanf(pid_stream, "%d", &p) < 0) { + LM_WARN("could not parse pgid file %s\n", pgid_file); + } fclose(pid_stream); if (p==-1){ LOG(L_CRIT, "pgid file %s exists, but doesn't contain a valid"

1 0

git:master: core: Consolidate append_str macro usage
by Jan Janak 06 May '09

06 May '09

Module: sip-router Branch: master Commit: 47945782e1459935b1f327abb92fbc1a3ffcd86f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4794578… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed May 6 14:47:14 2009 +0200 core: Consolidate append_str macro usage The definition of append_str macro was scattered across the source tree, there were multiple definition of the macro, some of them with different parameters. This patch brings the definition of append_str macro into ut.h header file and removes all other definitions from core and modules. We chose the version with three parameters where the pointer and the length of the source string are passed separately to the macro. This is more flexible than passing both of them within one parameter as str structure. All references to append_mem_block have been removed because the same operation can now be achieved with append_str. In addition to that we updated parameters passed to append_str where needed, converting one str parameter to <pointer,len> pair of parameters. Some modules had yet another version of append_str defined, there we renamed the macro to some other name to make sure that the local definition does not conflict with the definition on ut.h --- lib/kcore/km_ut.h | 11 ---- modules/tm/t_fifo.c | 8 ++-- modules/tm/t_funcs.h | 16 ------ modules/tm/t_msgbuilder.c | 96 ++++++++++++++++++------------------ modules/tm/t_serial.c | 8 ++-- modules_s/acc_syslog/acc_syslog.c | 8 ++-- modules_s/sms/sms_funcs.c | 4 -- msg_translator.c | 6 -- ut.h | 12 +++++ 9 files changed, 72 insertions(+), 97 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=479…

1 0

git:master: presence_xml: disable bla support
by Daniel-Constantin Mierla 06 May '09

06 May '09

Module: sip-router Branch: master Commit: dd78db27471fb2cdd266ffd5e70c6d71b321467b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd78db2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 6 14:09:47 2009 +0200 presence_xml: disable bla support - needs review with latest spec updates - potential issues with merging need to be reviewed as well --- modules_k/presence_xml/README | 239 +++++++++++--------- modules_k/presence_xml/doc/presence_xml_admin.xml | 2 +- modules_k/presence_xml/presence_xml.c | 2 +- 3 files changed, 133 insertions(+), 110 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=dd7…

1 0

git:master: Serial forking functions.
by Jan Janak 06 May '09

06 May '09

Module: sip-router Branch: master Commit: 00f54c06f2f6d4e4c8a5a004eb07367c93b82329 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00f54c0… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed May 6 11:17:17 2009 +0200 Serial forking functions. This patch adds two new functions to tm module, t_load_contacts and t_next_contacts which can be used to implement serial forking. There are also two new parameters, fr_inv_timer_next and contacts_avp. Parameter fr_inv_timer_next is similar to fr_inv_timer, the value of this parameter is used for subsequent branches during serial forking. The value of contacts_avp is the identifier of the AVP which contains the list of contacts to be used for serial forking. The serial forking functions originate from Kamailio where they were implemented by Juha Heinanen. --- modules/tm/README | 636 +++++++++++++++++++++-------------------- modules/tm/config.c | 3 + modules/tm/config.h | 5 + modules/tm/doc/functions.xml | 79 ++++++ modules/tm/doc/params.xml | 51 ++++ modules/tm/doc/tm.xml | 9 + modules/tm/t_fifo.c | 22 +-- modules/tm/t_funcs.c | 25 ++- modules/tm/t_funcs.h | 24 ++- modules/tm/t_msgbuilder.c | 14 +- modules/tm/t_serial.c | 519 ++++++++++++++++++++++++++++++++++ modules/tm/t_serial.h | 35 +++ modules/tm/tm.c | 15 +- 13 files changed, 1090 insertions(+), 347 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=00f…

2 2

← Newer
1
...
19
20
21
22
23
24
25
26
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009