sr-dev October 2009

sr-dev@lists.kamailio.org

30 participants
468 discussions

git:master: core: core pvars added for $?/$retcode/$rc
by Andrei Pelinescu-Onciul 07 Oct '09

07 Oct '09

Module: sip-router Branch: master Commit: 0c73dfed30960affda3a096f07f9679f18527585 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c73dfe… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 7 23:57:45 2009 +0200 core: core pvars added for $?/$retcode/$rc - added core pvars (registered before script parsing) for the return code ($?, $retcode, $rc). This solves script conflicts between the different return code handling (kamailio - pvars and ser built-in expr. elem). - removed ser expr. elem for retcode (not needed anymore) - added '?' as a valid pvar char (needed so that $? will be accepted) --- cfg.lex | 8 ++++-- cfg.y | 4 +-- main.c | 2 + pv_core.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pv_core.h | 30 +++++++++++++++++++++++++++++ pvapi.c | 2 +- 6 files changed, 102 insertions(+), 7 deletions(-) diff --git a/cfg.lex b/cfg.lex index 8490364..105df4b 100644 --- a/cfg.lex +++ b/cfg.lex @@ -78,7 +78,8 @@ * 2008-11-28 added support for kamailio pvars and avp/pvar guessing (andrei) * 2008-12-11 added support for "string1" "string2" (andrei) * 2009-03-10 added SET_USERPHONE action (Miklos) - * 2009-04-24 addd strlen, strempty and defined operators (andrei) + * 2009-04-24 add strlen, strempty and defined operators (andrei) + * 2009-03-07 RETCODE, it's now a core pvar (andrei) */ @@ -256,7 +257,7 @@ PROTO proto AF af MYSELF myself MSGLEN "msg:len" -RETCODE \$\?|\$retcode +RETCODE \$\?|\$retcode|\$rc /* operators */ EQUAL = EQUAL_T == @@ -535,7 +536,6 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{RETCODE} { count(); yylval.strval=yytext; return RETCODE; } <INITIAL>{ROUTE} { count(); yylval.strval=yytext; return ROUTE; } <INITIAL>{ROUTE_ONREPLY} { count(); yylval.strval=yytext; return ROUTE_ONREPLY; } @@ -969,6 +969,8 @@ EAT_ABLE [\ \t\b\r] return PVAR; } + /* if found retcode => it's a built-in pvar */ +<INITIAL>{RETCODE} { count(); yylval.strval=yytext; return PVAR; } <INITIAL>{VAR_MARK} { switch(sr_cfg_compat){ diff --git a/cfg.y b/cfg.y index b0cb2a5..585edf5 100644 --- a/cfg.y +++ b/cfg.y @@ -354,7 +354,6 @@ extern char *finame; %token AF %token MYSELF %token MSGLEN -%token RETCODE %token UDP %token TCP %token TLS @@ -1824,7 +1823,6 @@ eint_op: SRCPORT { $$=SRCPORT_O; } | DSTPORT { $$=DSTPORT_O; } | AF { $$=AF_O; } | MSGLEN { $$=MSGLEN_O; } - | RETCODE { $$=RETCODE_O; } | eint_op_onsend ; @@ -2418,7 +2416,7 @@ pvar: PVAR { memset(pv_spec, 0, sizeof(*pv_spec)); s_tmp.s=$1; s_tmp.len=strlen($1); if (pv_parse_spec(&s_tmp, pv_spec)==0){ - yyerror("unknown script pseudo variable"); + yyerror("unknown script pseudo variable %s", $1 ); pkg_free(pv_spec); pv_spec=0; YYABORT; diff --git a/main.c b/main.c index fb9ba93..c1f9d07 100644 --- a/main.c +++ b/main.c @@ -172,6 +172,7 @@ #include "cfg_core.h" #include "endianness.h" /* init */ #include "basex.h" /* init */ +#include "pv_core.h" /* register core pvars */ #ifdef DEBUG_DMALLOC #include <dmalloc.h> @@ -1760,6 +1761,7 @@ int main(int argc, char** argv) if (init_script_cb()<0) goto error; if (init_rpcs()<0) goto error; if (register_core_rpcs()!=0) goto error; + if (pv_register_core_vars()!=0) goto error; /* Fix the value of cfg_file variable.*/ if (fix_cfg_file() < 0) goto error; diff --git a/pv_core.c b/pv_core.c new file mode 100644 index 0000000..43ae4d9 --- /dev/null +++ b/pv_core.c @@ -0,0 +1,63 @@ +/* + * $Id$ + * + * Copyright (C) 2009 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * pv_core.c - pvars needed in the core, e.g. $?, $retcode + * + * Note: in general please avoid adding pvars directly to the core, unless + * absolutely necessary (use/create a new module instead). + */ + +#include "pv_core.h" +#include "pvar.h" +#include "str.h" + +static int pv_get_retcode(struct sip_msg*, pv_param_t*, pv_value_t*); + +static pv_export_t core_pvs[] = { + /* return code, various synonims */ + { STR_STATIC_INIT("?"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, + { STR_STATIC_INIT("rc"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, + { STR_STATIC_INIT("retcode"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, + + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + + +/* ugly hack to get the return code, needed because the PVs do not know (yet) + about the script context */ +extern int _last_returned_code; + +static int pv_get_retcode(struct sip_msg* msg, pv_param_t* p, pv_value_t* res) +{ + /* FIXME: as soon as PVs support script context, use it instead of the + return in global variable hack */ + return pv_get_sintval(msg, p, res, _last_returned_code); +} + + + +/** register built-in core pvars. + * should be called before parsing the config script. + * @return 0 on success + */ +int pv_register_core_vars(void) +{ + return register_pvars_mod("core", core_pvs); +} + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/pv_core.h b/pv_core.h new file mode 100644 index 0000000..e98480b --- /dev/null +++ b/pv_core.h @@ -0,0 +1,30 @@ +/* + * $Id$ + * + * Copyright (C) 2009 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * pv_core.h + */ + +#ifndef __pv_core_h +#define __pv_core_h + +/* register core pvars */ +int pv_register_core_vars(void); + +#endif /*__pv_core_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/pvapi.c b/pvapi.c index dbae078..34ef819 100644 --- a/pvapi.c +++ b/pvapi.c @@ -73,7 +73,7 @@ void pv_init_table(void) static int is_pv_valid_char(char c) { if((c>='0' && c<='9') || (c>='a' && c<='z') || (c>='A' && c<='Z') - || (c=='_') || (c=='.')) + || (c=='_') || (c=='.') || (c=='?') /* ser $? */) return 1; return 0; }

1 0

git:master: core: fix cfg_update() on config error
by Andrei Pelinescu-Onciul 07 Oct '09

07 Oct '09

Module: sip-router Branch: master Commit: 29e63735632a379df5d6b49130d05d47e2829a60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29e6373… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 8 00:14:32 2009 +0200 core: fix cfg_update() on config error Don't try to use the cfg framework if it was not initialized (it could happen if for example config parsing fails and shutdown is triggered before the cfg framework is initialized). --- main.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/main.c b/main.c index c1f9d07..01a6fde 100644 --- a/main.c +++ b/main.c @@ -473,6 +473,9 @@ unsigned long shm_mem_size=SHM_MEM_SIZE * 1024 * 1024; int my_argc; char **my_argv; +/* set to 1 when the cfg framework and core cfg is initialized/registered */ +static int cfg_ok=0; + #define MAX_FD 32 /* maximum number of inherited open file descriptors, (normally it shouldn't be bigger than 3) */ @@ -511,10 +514,12 @@ void cleanup(show_status) /* restore the original core configuration before the * config block is freed, otherwise even logging is unusable, * it can case segfault */ - cfg_update(); - /* copy current config into default_core_cfg */ - if (core_cfg) - default_core_cfg=*((struct cfg_group_core*)core_cfg); + if (cfg_ok){ + cfg_update(); + /* copy current config into default_core_cfg */ + if (core_cfg) + default_core_cfg=*((struct cfg_group_core*)core_cfg); + } core_cfg = &default_core_cfg; cfg_destroy(); #ifdef USE_TCP @@ -2080,6 +2085,7 @@ try_again: LOG(L_CRIT, "could not declare the core configuration\n"); goto error; } + cfg_ok=1; #ifdef USE_TCP if (tcp_register_cfg()){ LOG(L_CRIT, "could not register the tcp configuration\n");

1 0

memcached module value expiration
by Alex Balashov 07 Oct '09

07 Oct '09

Henning, The memcached module is very useful. But I think it would be about 10x more useful if expiration values could be controlled on a per-key basis rather than just globally as a modparam, because different kinds of data needs to be aged out at different intervals. What do you think? -- Alex -- Alex Balashov - Principal Evariste Systems Web : http://www.evaristesys.com/ Tel : (+1) (678) 954-0670 Direct : (+1) (678) 954-0671

2 4

git:master: unit test(sr): add initial small test for memcache module
by Henning Westerholt 07 Oct '09

07 Oct '09

Module: sip-router Branch: master Commit: da3327522527211fcd76aba394de9f2f538d8b9d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da33275… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Oct 7 18:35:00 2009 +0200 unit test(sr): add initial small test for memcache module --- test/unit/45.cfg | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/unit/45.sh | 50 +++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) diff --git a/test/unit/45.cfg b/test/unit/45.cfg new file mode 100644 index 0000000..e434654 --- /dev/null +++ b/test/unit/45.cfg @@ -0,0 +1,72 @@ +# Kamailio config for lookup / registrar testing + +#------------------------Global configuration---------------------------------- +debug=2 +fork=yes +log_stderror=no +listen=127.0.0.1 +port=5060 +dns=no +rev_dns=no + +#-----------------------Loading Modules------------------------------------- +mpath="../../modules_k/" +loadmodule "../../modules/db_mysql/db_mysql.so" +loadmodule "usrloc/usrloc.so" +loadmodule "registrar/registrar.so" +loadmodule "sl/sl.so" +loadmodule "../../modules/tm/tm.so" +loadmodule "maxfwd/maxfwd.so" +loadmodule "pv/pv.so" +loadmodule "cfgutils.so" +loadmodule "memcached.so" +#for debugging purposes only +loadmodule "mi_fifo/mi_fifo.so" +loadmodule "xlog/xlog.so" + + +#-----------------------Module parameters------------------------------------- +modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +modparam("usrloc", "db_mode", 3) +modparam("usrloc", "db_url", "mysql://openser:openserrw@localhost/openser") + +#-----------------------Routing configuration---------------------------------# +route{ + if (!mf_process_maxfwd_header("10")) { + sl_send_reply("483","Too Many Hops"); + exit(); + } + + $mct(test) = "1"; + $mct(test) = 5; + xlog("stored value is $mct(test)"); +# not work at the moment? +# $mct(test) = null; +# xlog("stored value is $mct(test)"); + + $mct(cnt) = 1; + $mcinc(cnt) = 1; # increment by 1 + xlog("counter is now $mct(cnt)"); + $mcdec(cnt) = 1; # decrement by 1 + xlog("counter is now $mct(cnt)"); + + $mct(test) = 111; + xlog("stored value is $mct(test)"); + $mctex(test) = 1; +# also not work at the moment? +# sleep("2"); + xlog("stored value is now $mct(test)"); + + if (registered("location")) { + xlog("contact registered"); + } + + if(!lookup ("location")){ + sl_send_reply("404", "Not Found"); + } + + if (!t_relay()) { + sl_reply_error(); + } +} + diff --git a/test/unit/45.sh b/test/unit/45.sh new file mode 100755 index 0000000..7b28c64 --- /dev/null +++ b/test/unit/45.sh @@ -0,0 +1,50 @@ +#!/bin/bash +# check memcached module with a basic usrloc scenario + +# Copyright (C) 2007 1&1 Internet AG +# +# This file is part of Kamailio, a free SIP server. +# +# Kamailio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version +# +# Kamailio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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 +source include/require +source include/database + +if ! (check_sipp && check_kamailio && check_module "db_mysql" && check_mysql && check_module "memcached"); then + exit 0 +fi ; + +CFG=45.cfg +SRV=5060 +UAS=5070 +UAC=5080 + + +# add an registrar entry to the db; +$MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:foo@localhost:$UAS\",\"udp:127.0.0.1:$UAS\",\"ser_test\",1,-1);" + +$BIN -w . -f $CFG &> /dev/null +sipp -sn uas -bg -i localhost -m 10 -f 2 -p $UAS &> /dev/null +sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 10 -f 2 -p $UAC &> /dev/null + +ret=$? + +# cleanup +killall -9 sipp > /dev/null 2>&1 +$KILL > /dev/null 2>&1 + +$MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo@localhost:$UAS\") and (user_agent = \"ser_test\"));" +exit $ret;

1 0

git:master: unit test(sr): fix debug setting and a bunch of paths
by Henning Westerholt 07 Oct '09

07 Oct '09

Module: sip-router Branch: master Commit: e36890e2b6a8deb678c7b24f3701d63ba8c449c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e36890e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Oct 7 18:37:55 2009 +0200 unit test(sr): fix debug setting and a bunch of paths --- test/unit/19.cfg | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/19.cfg b/test/unit/19.cfg index 0bfa64a..a398fff 100644 --- a/test/unit/19.cfg +++ b/test/unit/19.cfg @@ -1,7 +1,7 @@ # Kamailio config for lookup / registrar testing #------------------------Global configuration---------------------------------- -debug=3 +debug=2 fork=yes log_stderror=no listen=127.0.0.1 @@ -10,12 +10,12 @@ dns=no rev_dns=no #-----------------------Loading Modules------------------------------------- -mpath="../modules/" -loadmodule "db_mysql/db_mysql.so" +mpath="../../modules_k/" +loadmodule "../../modules/db_mysql/db_mysql.so" loadmodule "usrloc/usrloc.so" loadmodule "registrar/registrar.so" loadmodule "sl/sl.so" -loadmodule "tm/tm.so" +loadmodule "../../modules/tm/tm.so" loadmodule "maxfwd/maxfwd.so" loadmodule "pv/pv.so" #for debugging purposes only

1 0

git:master: memcached(sr): add support for setting of value expiration - $mctex(key)
by Henning Westerholt 07 Oct '09

07 Oct '09

Module: sip-router Branch: master Commit: f3528b2e48a8dca862f61ebef2dd2eb2bd843234 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3528b2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Oct 7 18:31:08 2009 +0200 memcached(sr): add support for setting of value expiration - $mctex(key) - add support for setting of value expiration. As the memcache library don't provide functions to later change the expire value of an existing key we need to fetch the value and then store it again with the given time. This should be changed with a different (improved) library - refactor functions a bit, use a helper method instead of duplicating the cache access functions - update documentation --- modules_k/memcached/README | 30 +++- modules_k/memcached/doc/memcached_admin.xml | 19 +++ modules_k/memcached/mcd_var.c | 223 ++++++++++++++++----------- modules_k/memcached/mcd_var.h | 13 ++ modules_k/memcached/memcached.c | 4 +- 5 files changed, 191 insertions(+), 98 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f35…

1 0

git:master: unit test(sr): fix location of kamailio ctl tool
by Henning Westerholt 07 Oct '09

07 Oct '09

Module: sip-router Branch: master Commit: e9a6621bd51f4cec0a74fcc0ce5706953d4da4ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9a6621… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Oct 7 18:35:51 2009 +0200 unit test(sr): fix location of kamailio ctl tool --- test/unit/include/common | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/unit/include/common b/test/unit/include/common index 7606ab0..d8b1ef9 100644 --- a/test/unit/include/common +++ b/test/unit/include/common @@ -2,7 +2,7 @@ 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" # root directory relative to tests SR_DIR="../.." -CTL_DIR="$SR_DIR/tools" +CTL_DIR="$SR_DIR/tools/kamctl" CTLRC="$CTL_DIR/kamctlrc" CTL="$CTL_DIR/kamctl" DBCTL="$CTL_DIR/kamdbctl"

1 0

no header on sip-router.org home page
by jh＠tutpro.com 07 Oct '09

07 Oct '09

sip-router.org home page looks a bit odd, because there is nothing on top of the page. if no logo is available, heading text SIP Router Project of something like that using a big font would be fine. -- juha

3 3

new developer: Marius Zbihlei
by Henning Westerholt 07 Oct '09

07 Oct '09

Hi all, i'm happy to announce a new developer for the kamailio and sip-router project: Marius Zbihlei. Marius is a experienced C/C++ developer in our offices in Bukarest (Romania). He develops since a few years internal applications for the web hosting plattform of 1&1. Since app. a half year he is part of the team that handles the development and maintenance of our VoIP backend systems. Most of his work so far was targeted to our internal repositories, but Marius also already contributed a bunch of patches to the project. He'll support us with the maintenance of the kamailio code we contributed to the project in the past, and also work on new sip-router features in the future. Best regards, Henning -- Henning Westerholt - Development Consumer Products / Consumer Core 1&1 Internet AG, Ernst-Frey-Str. 9, 76135 Karlsruhe, Germany

4 3

AVP arrays
by Alex Balashov 07 Oct '09

07 Oct '09

Daniel once taught me in a mailing list post how to use AVP arrays syntactically - i.e. to iterate through them and to implicitly create them - for which I am very grateful. For example: $var(i) = 0; while($var(i) < $dbr(ra=>rows)) { $(avp(s:rows_of_things)[$var(i)]) = $dbr(ra=>[$var(i),0]); } But I don't see anywhere in the documentation - for the avpops module or otherwise - where someone else can learn to use them. They are not mentioned explicitly anywhere as having potentially nonscalar properties. I think it is a good idea to fix that. -- Alex Balashov - Principal Evariste Systems Web : http://www.evaristesys.com/ Tel : (+1) (678) 954-0670 Direct : (+1) (678) 954-0671

2 2

← Newer
1
...
36
37
38
39
40
41
42
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2009