January 2013 - sr-dev - kamailio.org

[tracker] Task opened: Add your GPG key to a public key server
by sip-router 27 Jan '13

27 Jan '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Paul Belanger (pabelanger) Attached to Project - sip-router Summary - Add your GPG key to a public key server Task Type - Improvement Category - Core Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Please add your GPG key[1] for Debian packages, to a public key server[2]. [1] wget http://deb.kamailio.org/kamailiodebkey.gpg [2] pgp.mit.edu More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=266 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

git:master: tls Update of README
by Olle E. Johansson 26 Jan '13

26 Jan '13

Module: sip-router Branch: master Commit: 6b212dc881dae76ab872c79e39f96b21ee4e6687 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b212dc… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Jan 26 21:10:03 2013 +0100 tls Update of README --- modules/tls/README | 62 +++++++++++++++++++------------------- modules/tls/doc/certs_howto.xml | 2 +- modules/tls/doc/params.xml | 12 ++++---- modules/tls/doc/tls.xml | 14 ++++---- 4 files changed, 45 insertions(+), 45 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6b2…

1 0

git:mgw/json: json: use libjansson instead of libjson-c in order to support JSONPath access to object values ; provide tests
by Matthew Williams 26 Jan '13

26 Jan '13

Module: sip-router Branch: mgw/json Commit: eac0169c00aefe17b67759a8556194d40815e608 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eac0169… Author: Matthew Williams <mgwilliams(a)gmail.com> Committer: Matthew Williams <mgwilliams(a)gmail.com> Date: Fri Jan 25 17:25:17 2013 -0800 json: use libjansson instead of libjson-c in order to support JSONPath access to object values; provide tests --- modules/json/Makefile | 13 +-- modules/json/README | 69 ++++++++++++-- modules/json/doc/json.xml | 8 +- modules/json/doc/json_admin.xml | 176 +++++++++++++++++++++++------------- modules/json/json_funcs.c | 164 ++++++++++++++++++++++++++------- modules/json/json_funcs.h | 3 +- modules/json/json_mod.c | 106 +++++++++++++--------- modules/json/json_path.c | 100 ++++++++++++++++++++ modules/json/json_path.h | 16 ++++ modules/json/test/json-test.cfg | 191 +++++++++++++++++++++++++++++++++++++++ modules/json/test/run-tests.sh | 4 + 11 files changed, 687 insertions(+), 163 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=eac…

2 2

git:master: dispatcher - Fix typo in README and add return value information for ds_select_dst
by Olle E. Johansson 26 Jan '13

26 Jan '13

Module: sip-router Branch: master Commit: 78f0c33c3793a7c586860c65ed84e8442808d580 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78f0c33… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Jan 26 17:56:51 2013 +0100 dispatcher - Fix typo in README and add return value information for ds_select_dst The return value was used in the example, but not documented. --- modules/dispatcher/README | 5 +++-- modules/dispatcher/doc/dispatcher_admin.xml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/dispatcher/README b/modules/dispatcher/README index 358730d..576e3fb 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -685,12 +685,13 @@ Note 4.1. ds_select_dst(set, alg) - The method selects a destination from addresses set. + The method selects a destination from addresses set. It returns true if + a new destination is set. Meaning of the parameters is as follows: * set - the id of the set from where to pick up destination address. It is the first column in destination list file. The parameter can - be an integer or a variable holding an interger. + be an integer or a variable holding an integer. * alg - the algorithm used to select the destination address. The parameter can be an integer or a variable holding an interger. + "0" - hash over callid diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 7f66d10..7a02921 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -721,7 +721,8 @@ modparam("dispatcher", "force_dst", 1) <function moreinfo="none">ds_select_dst(set, alg)</function> </title> <para> - The method selects a destination from addresses set. + The method selects a destination from addresses set. It returns true if + a new destination is set. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -730,7 +731,7 @@ modparam("dispatcher", "force_dst", 1) <emphasis>set</emphasis> - the id of the set from where to pick up destination address. It is the first column in destination list file. The parameter can be an integer or a variable holding - an interger. + an integer. </para> </listitem> <listitem>

1 0

git:master: kamctl: added command for management of uid_domain records
by Daniel-Constantin Mierla 25 Jan '13

25 Jan '13

Module: sip-router Branch: master Commit: bc507d28e1168313772142925721b32e1a7b634a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc507d2… Author: Philippe Sultan <philippe.sultan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 25 20:59:23 2013 +0100 kamctl: added command for management of uid_domain records --- utils/kamctl/kamctl | 76 +++++++++++++++++++++++++++++++++++++++++++ utils/kamctl/kamctl.base | 23 +++++++++++++ utils/kamctl/kamctl.sqlbase | 14 ++++++++ 3 files changed, 113 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 78116be..9e6b0ba 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1060,6 +1060,77 @@ domain() { # ##### ------------------------------------------------ ##### +### uid_domain management +# +uid_domain() { + case $1 in + reload) + require_kamcmd + $SERCTLCMD domain.reload + ;; + show) + require_kamcmd + $SERCTLCMD domain.dump + ;; + showdb) + require_dbengine + QUERY="select * FROM $UID_DOMAIN_TABLE ; " + $DBROCMD "$QUERY" + ;; + add) + require_dbengine + shift + if [ $# -lt 1 ] ; then + merr "too few parameters" + exit 1 + fi + + DOMAIN=$1 + DID=$2 + FLAGS=$3 + + if [ -z "$2" ] ; then + DID=$DOMAIN + fi + if [ -z "$3" ] ; then + FLAGS=$(( $SRDB_LOAD_SER | $SRDB_CANON | $SRDB_FOR_SERWEB )) + fi + + if is_value_in_db $UID_DOMAIN_TABLE $UID_DO_DOMAIN_COLUMN $DOMAIN; then + minfo "$1 already in $UID_DOMAIN_TABLE table" + exit 0 + fi + QUERY="insert into $UID_DOMAIN_TABLE ($UID_DO_DID_COLUMN,$UID_DO_DOMAIN_COLUMN,$UID_DO_FLAGS_COLUMN) VALUES ('$DID','$DOMAIN',$FLAGS);" + $DBCMD "$QUERY" + if [ $? -ne 0 ] ; then + merr "uid_domain - SQL Error" + exit 1 + fi + minfo "execute '$0 uid_domain reload' to synchronize cache and database" + ;; + rm) + require_dbengine + shift + if [ $# -ne 1 ] ; then + merr "missing domain parameter" + exit 1 + fi + QUERY="delete from $UID_DOMAIN_TABLE where domain='$1';" + $DBCMD "$QUERY" + if [ $? -ne 0 ] ; then + merr "domain - SQL Error" + exit 1 + fi + minfo "execute '$0 uid_domain reload' to synchronize cache and database" + ;; + *) + usage_uid_domain + exit 1 + esac +} + +# +##### ------------------------------------------------ ##### ### permissions trusted management # permissions_trusted() { @@ -2481,6 +2552,11 @@ case $1 in domain "$@" ;; + uid_domain) + shift + uid_domain "$@" + ;; + trusted) shift permissions_trusted "$@" diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index db4ef9a..589e0a0 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -128,6 +128,21 @@ USERNAME_RE="[-a-zA-Z0-9&=\+\$,;\?/_\.\!~\*']+" ##### ----------------------------------------------- ##### #### database tables for SQL databases and DBTEXT +SRDB_LOAD_SER=$((1 << 0)) # The row should be loaded by SER +SRDB_DISABLED=$((1 << 1)) # The row is disabled +SRDB_CANON=$((1 << 2)) # Canonical entry (domain or uri) +SRDB_IS_TO=$((1 << 3)) # The URI can be used in To +SRDB_IS_FROM=$((1 << 4)) # The URI can be used in From +SRDB_FOR_SERWEB=$((1 << 5)) # Credentials instance can be used by serweb +SRDB_PENDING=$((1 << 6)) +SRDB_DELETED=$((1 << 7)) +SRDB_CALLER_DELETED=$((1 << 8)) # Accounting table +SRDB_CALLEE_DELETED=$((1 << 9)) # Accounting table +SRDB_MULTIVALUE=$((1 << 10)) # Attr_types table +SRDB_FILL_ON_REG=$((1 << 11)) # Attr_types table +SRDB_REQUIRED=$((1 << 12)) # Attr_types table +SRDB_DIR=$((1 << 13)) # Domain_settings table + # UsrLoc Table if [ -z "$UL_TABLE" ] ; then UL_TABLE=location @@ -180,6 +195,14 @@ fi DO_DOMAIN_COLUMN=domain DO_LAST_MODIFIED_COLUMN=last_modified +# uid_domain table +if [ -z "$UID_DOMAIN_TABLE" ] ; then + UID_DOMAIN_TABLE=uid_domain +fi +UID_DO_DOMAIN_COLUMN=domain +UID_DO_DID_COLUMN=did +UID_DO_FLAGS_COLUMN=flags + # lcr tables if [ -z "$LCR_TABLE" ] ; then LCR_TABLE=lcr diff --git a/utils/kamctl/kamctl.sqlbase b/utils/kamctl/kamctl.sqlbase index 7354517..f07705f 100644 --- a/utils/kamctl/kamctl.sqlbase +++ b/utils/kamctl/kamctl.sqlbase @@ -140,3 +140,17 @@ cat <<EOF EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_domain" + +uid_usage_domain() { + echo + mecho " -- command 'uid_domain' - manage local domains" + echo +cat <<EOF + uid_domain reload ....................... reload domains from disk + uid_domain show ......................... show current domains in memory + uid_domain showdb ....................... show domains in the database + uid_domain add <domain> [did] [flags].... add the domain to the database + uid_domain rm <domain> .................. delete the domain from the database +EOF +} +USAGE_FUNCTIONS="$USAGE_FUNCTIONS uid_usage_domain"

1 0

New branch oej/routeblocks
by Olle E. Johansson 25 Jan '13

25 Jan '13

Hi! THe branch I just published contains some functions made a day after code freeze. With this you can check if a named route exists, and call it if it exists. This works well with non-mandatory include files. You can now have building blocks and just dump a NAT-manage file in an include directory. If that's included and that route block is defined, then execute it. Small changes that I added to the cfgutils module if that's ok with all the authors of that module. Please test and if everything seems ok, I'll merge after 4.0.0 release. Have a great weekend! Cheers, /O Documentation: ============== 4.17. check_route_exists(route) Check if a route block exists Parameters: "name" of a route block in the config file, like "route[FROGJUMP]" This function can be used from any route. You can only check for route[] blocks, not reply, event or other routes. Example 1.21. check_route_exists() usage ... if(check_route_exists("FROGJUMP") { $var(jumping_frogs) = 1; }; ... 4.18. route_if_exists(route) Execute a routing block only if it is defined. If it's not defined, silently move to the next action in the configuration script. Parameters: "name" of a route block in the config file, like "route[FROGJUMP]" This function can be used from any route. You can only execute it for route[] blocks, not reply, event or other routes. Example 1.22. route_if_exists() usage ... route_if_exists("PRESENCE_SANTA_CLAUS"); ...

1 0

git:oej/routeblocks: Merge branch 'master' into oej/routeblocks
by Olle E. Johansson 25 Jan '13

25 Jan '13

Module: sip-router Branch: oej/routeblocks Commit: 446a1289d53e16682c502673535a98ad9710ce3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=446a128… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Fri Jan 25 18:58:42 2013 +0100 Merge branch 'master' into oej/routeblocks * master: (70 commits) core: made a wrapper forward_reply_nocb() sl: use forward_reply_nocb() for sl_forward_reply() core: end simple pv name (e.g., $xy) at end of line db_cassandra: Replaced 'openser' with 'kamailio' core: default compatibility set to SR_COMPAT_MAX correct url to libjson in json and jsonrpc-c module docs pkg/kamailio/(centos|fedora): Removed old FC16 build lib/srdb1: update custom sql functions for uid tables kamctl: added option to grant sql access from a remote host kamctl: added option to creat uid-related tables kamctl: cleaned db creation json: proper handling of empty values for json documents modules:sipcapture Added PSQL schema, fixed columns length, fixed id column for PostgreSQL pua_reginfo: fix setting lengths of contact attributes siputils: fix decode2format fuction to handle ; in userpart modules:sipcapture Changed authorization column to "auth". Now PostgreSQL should be happy. kamdbctl: fix presence tables provisioning app_python: reverted changes (dlflags) pkg/kamailio/fedora: added build files for Fedora 18 README remove "modules_k" ... ---

1 0

git:oej/routeblocks: Adding route_if_exists and check_route_exists
by Olle E. Johansson 25 Jan '13

25 Jan '13

Module: sip-router Branch: oej/routeblocks Commit: 372e80d4e9055e633dd9e86c719ed86a75474e3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=372e80d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Jan 13 11:04:06 2013 +0100 Adding route_if_exists and check_route_exists --- action.c | 23 ------ cfg.lex | 2 - cfg.y | 12 --- modules_k/cfgutils/README | 117 ++++++++++++++++++++--------- modules_k/cfgutils/cfgutils.c | 26 ++++++- modules_k/cfgutils/doc/cfgutils.xml | 7 ++ modules_k/cfgutils/doc/cfgutils_admin.xml | 47 ++++++++++++ route_struct.h | 2 +- 8 files changed, 161 insertions(+), 75 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=372…

1 0

git:oej/routeblocks: Trying to implement route_if_exists(ROUTE) and route_exists(route) functions
by Olle E. Johansson 25 Jan '13

25 Jan '13

Module: sip-router Branch: oej/routeblocks Commit: 9135bf2470d64ccbfdddf0fe3c2f7c97dd0e7bd6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9135bf2… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Jan 12 08:30:08 2013 +0100 Trying to implement route_if_exists(ROUTE) and route_exists(route) functions --- action.c | 23 +++++++++++++++++++++++ cfg.lex | 2 ++ cfg.y | 12 ++++++++++++ modules_k/cfgutils/cfgutils.c | 12 ++++++++++++ route_struct.h | 2 +- 5 files changed, 50 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index e64cf81..c2b5bdd 100644 --- a/action.c +++ b/action.c @@ -646,6 +646,29 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) "not implemented yet\n", a->val[0].u.string, a->val[1].u.string); ret=1; break; + case ROUTE_IF_T: + rv = rval_expr_eval(h, msg, a->val[0].u.data); + rval_cache_init(&c1); + if (unlikely(rv == 0 || rval_get_tmp_str(h, msg, &s, rv, 0, &c1) < 0)) { + rval_destroy(rv); + rval_cache_clean(&c1); + ERR("failed to convert RVE to string\n"); + ret = E_UNSPEC; + goto error; + } + i = route_lookup(&main_rt, s.s); + rval_destroy(rv); + rval_cache_clean(&c1); + s.s = 0; + if (unlikely(i < 0)) { + /* Give up silently */ + break; + } + ret=run_actions(h, main_rt.rlist[i], msg); + h->last_retcode=ret; + _last_returned_code = h->last_retcode; + h->run_flags&=~(RETURN_R_F|BREAK_R_F); /* absorb return & break */ + break; case ROUTE_T: if (likely(a->val[0].type == NUMBER_ST)) i = a->val[0].u.number; diff --git a/cfg.lex b/cfg.lex index 7bc6e68..810a700 100644 --- a/cfg.lex +++ b/cfg.lex @@ -198,6 +198,7 @@ BREAK "break" LOG log ERROR error ROUTE route +ROUTE_IF route_if_exist ROUTE_REQUEST request_route ROUTE_FAILURE failure_route ROUTE_REPLY reply_route @@ -617,6 +618,7 @@ IMPORTFILE "import_file" <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } <INITIAL>{ROUTE} { count(); yylval.strval=yytext; return ROUTE; } +<INITIAL>{ROUTE_IF} { count(); yylval.strval=yytext; return ROUTE_IF; } <INITIAL>{ROUTE_REQUEST} { count(); yylval.strval=yytext; return ROUTE_REQUEST; } <INITIAL>{ROUTE_ONREPLY} { count(); yylval.strval=yytext; return ROUTE_ONREPLY; } diff --git a/cfg.y b/cfg.y index 0c4fb5d..f573b31 100644 --- a/cfg.y +++ b/cfg.y @@ -300,6 +300,7 @@ extern char *finame; /* keywords */ +%token ROUTE_IF %token FORWARD %token FORWARD_TCP %token FORWARD_TLS @@ -3242,6 +3243,17 @@ cmd: } | ERROR error { $$=0; yyerror("missing '(' or ')' ?"); } | ERROR LPAREN error RPAREN { $$=0; yyerror("bad error argument"); } + | ROUTE_IF LPAREN ID RPAREN { + if ($3) { + $$ = mk_action(ROUTE_IF_T, 1, STRING_ST, (void*)$3); + set_cfg_pos($$); + } else { + $$ = 0; + YYERROR; + } + } + | ROUTE_IF error { $$=0; yyerror("missing '(' or ')' ?"); } + | ROUTE_IF LPAREN error RPAREN { $$=0; yyerror("bad route_if_exist argument"); } | ROUTE LPAREN rval_expr RPAREN { if ($3) { $$ = mk_action(ROUTE_T, 1, RVE_ST, (void*)$3); diff --git a/modules_k/cfgutils/cfgutils.c b/modules_k/cfgutils/cfgutils.c index 37c106a..de775af 100644 --- a/modules_k/cfgutils/cfgutils.c +++ b/modules_k/cfgutils/cfgutils.c @@ -1,6 +1,7 @@ /* * $Id$ * + * Copyright (C) 2012 Edvina AB * Copyright (C) 2007 1&1 Internet AG * Copyright (C) 2007 BASIS AudioNet GmbH * Copyright (C) 2004 FhG @@ -70,6 +71,7 @@ #include "../../globals.h" #include "../../hashes.h" #include "../../locking.h" +#include "../../route.h" #include <stdio.h> #include <stdlib.h> #include <sys/types.h> @@ -91,6 +93,7 @@ static int dbg_pkg_status(struct sip_msg*, char*,char*); static int dbg_shm_status(struct sip_msg*, char*,char*); static int dbg_pkg_summary(struct sip_msg*, char*,char*); static int dbg_shm_summary(struct sip_msg*, char*,char*); +static int route_exists(struct sip_msg*, char*); static int set_gflag(struct sip_msg*, char *, char *); static int reset_gflag(struct sip_msg*, char *, char *); @@ -178,6 +181,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"core_hash", (cmd_function)w_core_hash, 3, fixup_core_hash, 0, ANY_ROUTE}, + {"route_exists", (cmd_function)route_exists, 1, 0, 0, + ANY_ROUTE}, {"bind_cfgutils", (cmd_function)bind_cfgutils, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -737,6 +742,13 @@ static int cfg_unlock(struct sip_msg *msg, char *key, char *s2) return cfg_lock_wrapper(msg, (gparam_p)key, 1); } +static int route_exists(struct sip_msg *msg, char *route) +{ + if (route_lookup(&main_rt, route)) + return 1; + return 0; +} + static int mod_init(void) { diff --git a/route_struct.h b/route_struct.h index e56f4c0..faa9006 100644 --- a/route_struct.h +++ b/route_struct.h @@ -79,7 +79,7 @@ enum _expr_l_type{ SNDAF_O, RETCODE_O, SELECT_O, PVAR_O, RVEXP_O, SELECT_UNFIXED_O}; /* action types */ enum action_type{ - FORWARD_T=1, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, + FORWARD_T=1, DROP_T, LOG_T, ERROR_T, ROUTE_T, ROUTE_IF_T, EXEC_T, SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, SET_HOSTALL_T, SET_USERPHONE_T,

1 0

git:master: sl: use forward_reply_nocb() for sl_forward_reply()
by Daniel-Constantin Mierla 25 Jan '13

25 Jan '13

Module: sip-router Branch: master Commit: 0636b8a70109ee44b46ec0cc76d4513c87c18e3f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0636b8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 25 17:29:46 2013 +0100 sl: use forward_reply_nocb() for sl_forward_reply() - otherwise it gets to looping if the function is used from TM onreply routes --- modules/sl/sl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sl/sl.c b/modules/sl/sl.c index 925d98e..87449fd 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -449,7 +449,7 @@ restore: msg->first_line.u.reply.status.s[1] = oldscode[1]; msg->first_line.u.reply.status.s[2] = oldscode[2]; } - return ret; + return (ret==0)?1:ret; } /**

1 0