sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

git:master: modules_k/sqlops: sql_query(): make result parameter optional

by Alex Hermann

Module: sip-router Branch: master Commit: 9b62514b4a90e169c9126b7bda6d87cc4c213ad2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b62514… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Mar 10 15:21:06 2011 +0100 modules_k/sqlops: sql_query(): make result parameter optional No need to specify a result parameter for SQL statements that do not return a resultset, so make it optional. --- modules_k/sqlops/doc/sqlops_admin.xml | 4 +++- modules_k/sqlops/sql_api.c | 9 ++++++++- modules_k/sqlops/sqlops.c | 9 +++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules_k/sqlops/doc/sqlops_admin.xml b/modules_k/sqlops/doc/sqlops_admin.xml index d042c61..a0a8512 100644 --- a/modules_k/sqlops/doc/sqlops_admin.xml +++ b/modules_k/sqlops/doc/sqlops_admin.xml @@ -179,7 +179,7 @@ modparam("sqlops", "sqlres", "ra") <title>Exported Functions</title> <section> <title> - <function moreinfo="none">sql_query(connection, query, result)</function> + <function moreinfo="none">sql_query(connection, query[, result])</function> </title> <para> Make a SQL query using 'connection' and store data in 'result'. @@ -201,6 +201,8 @@ modparam("sqlops", "sqlres", "ra") <emphasis>result</emphasis> - string name to identify the result. Will be used by $dbr(...) pseudo-variable to access result attributes. + If omitted, any resultset will be discarded. The result parameter should + normally only be omitted when no result is expected (INSERT, UPDATE, DELETE). </para> </listitem> </itemizedlist> diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index 0dc97e0..5fe3371 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -208,7 +208,6 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) LM_ERR("bad parameters\n"); return -1; } - sql_reset_result(res); if(con->dbf.raw_query(con->dbh, query, &db_res)!=0) { LM_ERR("cannot do the query\n"); @@ -221,6 +220,14 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) con->dbf.free_result(con->dbh, db_res); return 2; } + if(!res) + { + LM_DBG("no sqlresult parameter, ignoring result from query\n"); + con->dbf.free_result(con->dbh, db_res); + return 3; + } + + sql_reset_result(res); res->ncols = RES_COL_N(db_res); res->nrows = RES_ROW_N(db_res); LM_DBG("rows [%d] cols [%d]\n", res->nrows, res->ncols); diff --git a/modules_k/sqlops/sqlops.c b/modules_k/sqlops/sqlops.c index 6d04e4b..a34a7d9 100644 --- a/modules_k/sqlops/sqlops.c +++ b/modules_k/sqlops/sqlops.c @@ -60,6 +60,7 @@ static int bind_sqlops(sqlops_api_t* api); /** module functions */ static int sql_query(struct sip_msg*, char*, char*, char*); +static int sql_query2(struct sip_msg*, char*, char*); #ifdef WITH_XAVP static int sql_xquery(struct sip_msg *msg, char *dbl, char *query, char *res); #endif @@ -86,6 +87,9 @@ static cmd_export_t cmds[]={ {"sql_query", (cmd_function)sql_query, 3, fixup_sql_query, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, + {"sql_query", (cmd_function)sql_query2, 2, fixup_sql_query, 0, + REQUEST_ROUTE | FAILURE_ROUTE | + ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, #ifdef WITH_XAVP {"sql_xquery", (cmd_function)sql_xquery, 3, fixup_sql_xquery, 0, REQUEST_ROUTE | FAILURE_ROUTE | @@ -192,6 +196,11 @@ static int sql_query(struct sip_msg *msg, char *dbl, char *query, char *res) return sql_do_query((sql_con_t*)dbl, &sq, (sql_result_t*)res); } +static int sql_query2(struct sip_msg *msg, char *dbl, char *query) +{ + return sql_query(msg, dbl, query, NULL); +} + #ifdef WITH_XAVP /** *

13 years, 7 months

git:master: modules_k/sqlops: Add BIGINT support for sql_xquery()

by Alex Hermann

Module: sip-router Branch: master Commit: 956f01b2a906dc07d45e9b0639dfd9de51e4629b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=956f01b… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Mar 14 14:47:25 2011 +0100 modules_k/sqlops: Add BIGINT support for sql_xquery() xavp's have native support for longlongs so there's no reason not to use it. --- modules_k/sqlops/sql_api.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index 5fe3371..aca782d 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -438,6 +438,11 @@ int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, val.v.i = (int)RES_ROWS(db_res)[i].values[j].val.bitmap_val; break; + case DB1_BIGINT: + val.type = SR_XTYPE_LLONG; + val.v.ll + = RES_ROWS(db_res)[i].values[j].val.ll_val; + break; default: val.type = SR_XTYPE_NULL; }

13 years, 7 months

git:master: modules_k/sqlops: Add BIGINT support to sql_query()

by Alex Hermann

Module: sip-router Branch: master Commit: 16965c1cf58a3c740bd039878093679b07e2cc27 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16965c1… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Mar 14 14:48:28 2011 +0100 modules_k/sqlops: Add BIGINT support to sql_query() As sqlresult has no support for longlongs, convert the BIGINT to a string value. --- modules_k/sqlops/sql_api.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index aca782d..9149f5c 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -32,6 +32,7 @@ #include "../../dprint.h" #include "../../lib/kcore/hash_func.h" #include "../../ut.h" +#include "../../lib/srdb1/db_ut.h" #ifdef WITH_XAVP #include "../../xavp.h" #endif @@ -319,10 +320,22 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) res->vals[i][j].value.n = (int)RES_ROWS(db_res)[i].values[j].val.bitmap_val; break; + case DB1_BIGINT: + res->vals[i][j].flags = PV_VAL_STR; + res->vals[i][j].value.s.len = 21*sizeof(char); + res->vals[i][j].value.s.s + = (char*)pkg_malloc(res->vals[i][j].value.s.len); + if(res->vals[i][j].value.s.s==NULL) + { + LM_ERR("no more memory\n"); + goto error; + } + db_longlong2str(RES_ROWS(db_res)[i].values[j].val.ll_val, res->vals[i][j].value.s.s, &res->vals[i][j].value.s.len); + break; default: res->vals[i][j].flags = PV_VAL_NULL; } - if(res->vals[i][j].flags == PV_VAL_STR) + if(res->vals[i][j].flags == PV_VAL_STR && sv.s) { if(sv.len==0) {

13 years, 7 months

segfault when trying to give xlog an expression param

by Juha Heinanen

i tried to give xlog an expression param and got segfault at startup: Apr 22 14:29:41 sip kernel: [53028.559446] sip-proxy[8339]: segfault at f30cbd8b ip 080c7616 sp bfa74da0 error 5 in sip-proxy[8048000+18e000] Not starting sip-proxy: invalid configuration file! 0(8339) INFO: pv [pv_shv.c:61]: locks array size 16 0(8339) : <core> [cfg.y:3437]: parse error in config file /etc/sip-proxy/sip-proxy.cfg, line 1531, column 24-58: function xlog: parameter 2 is not constant it would be better to just to give the error message without segfaulting. this was with master branch. -- juha

13 years, 7 months

git:master: modules_k/siputils: allow tel2sip call also in branch route

by Juha Heinanen

Module: sip-router Branch: master Commit: 90c3fc80b5307584e2bc31b5d81b937200a3a54b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90c3fc8… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 22 13:59:09 2011 +0300 modules_k/siputils: allow tel2sip call also in branch route --- modules_k/siputils/README | 4 ++-- modules_k/siputils/doc/siputils_admin.xml | 2 +- modules_k/siputils/siputils.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_k/siputils/README b/modules_k/siputils/README index 73c760c..8dd3963 100644 --- a/modules_k/siputils/README +++ b/modules_k/siputils/README @@ -508,8 +508,8 @@ add_uri_param("nat=yes"); The SIP URI hostpart is taken from second param (pseudo variable or string). - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, or - ONREPLY_ROUTE. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + BRANCH_ROUTE, or ONREPLY_ROUTE. Example 1.17. tel2sip usage ... diff --git a/modules_k/siputils/doc/siputils_admin.xml b/modules_k/siputils/doc/siputils_admin.xml index 8ae86c2..323a55f 100644 --- a/modules_k/siputils/doc/siputils_admin.xml +++ b/modules_k/siputils/doc/siputils_admin.xml @@ -503,7 +503,7 @@ add_uri_param("nat=yes"); </para> <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, - or ONREPLY_ROUTE. + BRANCH_ROUTE, or ONREPLY_ROUTE. </para> <example> <title><function>tel2sip</function> usage</title> diff --git a/modules_k/siputils/siputils.c b/modules_k/siputils/siputils.c index 104af17..e018b14 100644 --- a/modules_k/siputils/siputils.c +++ b/modules_k/siputils/siputils.c @@ -129,7 +129,7 @@ static cmd_export_t cmds[]={ {"add_uri_param", (cmd_function)add_uri_param, 1, fixup_str_null, 0, REQUEST_ROUTE}, {"tel2sip", (cmd_function)tel2sip, 3, fixup_tel2sip, 0, - REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE}, + REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE}, {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"is_uri_user_e164", (cmd_function)is_uri_user_e164, 1, fixup_pvar_null, @@ -139,7 +139,7 @@ static cmd_export_t cmds[]={ {"decode_contact", (cmd_function)decode_contact, 0, 0, 0, REQUEST_ROUTE}, {"decode_contact_header", (cmd_function)decode_contact_header, 0, 0, - 0,REQUEST_ROUTE|ONREPLY_ROUTE}, + 0,REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE}, {"cmp_uri", (cmd_function)w_cmp_uri, 2, fixup_spve_spve, 0, ANY_ROUTE}, {"cmp_aor", (cmd_function)w_cmp_aor, 2, fixup_spve_spve,

13 years, 7 months

git:master: modules_k/siputils: allow tel2sip call also in failure route.

by Juha Heinanen

Module: sip-router Branch: master Commit: b56094a42d010e1ead64195e3db0c855e49f1cde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b56094a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 22 12:25:26 2011 +0300 modules_k/siputils: allow tel2sip call also in failure route. --- modules_k/siputils/README | 3 ++- modules_k/siputils/doc/siputils_admin.xml | 3 ++- modules_k/siputils/siputils.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules_k/siputils/README b/modules_k/siputils/README index 5fae3c7..73c760c 100644 --- a/modules_k/siputils/README +++ b/modules_k/siputils/README @@ -508,7 +508,8 @@ add_uri_param("nat=yes"); The SIP URI hostpart is taken from second param (pseudo variable or string). - This function can be used from REQUEST_ROUTE or ONREPLY_ROUTE. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, or + ONREPLY_ROUTE. Example 1.17. tel2sip usage ... diff --git a/modules_k/siputils/doc/siputils_admin.xml b/modules_k/siputils/doc/siputils_admin.xml index f2135d5..8ae86c2 100644 --- a/modules_k/siputils/doc/siputils_admin.xml +++ b/modules_k/siputils/doc/siputils_admin.xml @@ -502,7 +502,8 @@ add_uri_param("nat=yes"); (pseudo variable or string). </para> <para> - This function can be used from REQUEST_ROUTE or ONREPLY_ROUTE. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + or ONREPLY_ROUTE. </para> <example> <title><function>tel2sip</function> usage</title> diff --git a/modules_k/siputils/siputils.c b/modules_k/siputils/siputils.c index 5427fb2..391907e 100644 --- a/modules_k/siputils/siputils.c +++ b/modules_k/siputils/siputils.c @@ -139,7 +139,7 @@ static cmd_export_t cmds[]={ {"decode_contact", (cmd_function)decode_contact, 0, 0, 0, REQUEST_ROUTE}, {"decode_contact_header", (cmd_function)decode_contact_header, 0, 0, - 0,REQUEST_ROUTE|ONREPLY_ROUTE}, + 0,REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE}, {"cmp_uri", (cmd_function)w_cmp_uri, 2, fixup_spve_spve, 0, ANY_ROUTE}, {"cmp_aor", (cmd_function)w_cmp_aor, 2, fixup_spve_spve,

13 years, 7 months

git:master: modules_k/siputils: added failure route to wrong function

by Juha Heinanen

Module: sip-router Branch: master Commit: 69aed0615f5e846203acd4809d1f7fdfd67acb8a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69aed06… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 22 13:09:44 2011 +0300 modules_k/siputils: added failure route to wrong function - Credits to Alex Hermann. --- modules_k/siputils/siputils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/siputils/siputils.c b/modules_k/siputils/siputils.c index 391907e..104af17 100644 --- a/modules_k/siputils/siputils.c +++ b/modules_k/siputils/siputils.c @@ -129,7 +129,7 @@ static cmd_export_t cmds[]={ {"add_uri_param", (cmd_function)add_uri_param, 1, fixup_str_null, 0, REQUEST_ROUTE}, {"tel2sip", (cmd_function)tel2sip, 3, fixup_tel2sip, 0, - REQUEST_ROUTE|ONREPLY_ROUTE}, + REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE}, {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"is_uri_user_e164", (cmd_function)is_uri_user_e164, 1, fixup_pvar_null, @@ -139,7 +139,7 @@ static cmd_export_t cmds[]={ {"decode_contact", (cmd_function)decode_contact, 0, 0, 0, REQUEST_ROUTE}, {"decode_contact_header", (cmd_function)decode_contact_header, 0, 0, - 0,REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE}, + 0,REQUEST_ROUTE|ONREPLY_ROUTE}, {"cmp_uri", (cmd_function)w_cmp_uri, 2, fixup_spve_spve, 0, ANY_ROUTE}, {"cmp_aor", (cmd_function)w_cmp_aor, 2, fixup_spve_spve,

13 years, 7 months

question about module function arguments

by Juha Heinanen

i understood that module functions can now have an arbitrary number of string, int and pseudo var arguments, where string arguments can possibly also contain pseudo variables. some time ago i asked an example on how this is done, but didn't get any reply. so i'll try again. for example, allow_trusted function is now defined like this: {"allow_trusted", (cmd_function)allow_trusted_2, 2, fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE | FAILURE_ROUTE}, how can i add a third argument to the function without needing to define yet another fixup_pvar_pvar_something? -- juha

13 years, 7 months

git:master: modules_k/siputils: tel2sip() replaced by tel2sip(uri, hostpart , result)

by Juha Heinanen

Module: sip-router Branch: master Commit: 5ad55516eb434a24d1dbd5225029c9b254ca5235 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ad5551… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 22 12:18:09 2011 +0300 modules_k/siputils: tel2sip() replaced by tel2sip(uri, hostpart, result) --- modules_k/siputils/README | 36 ++++--- modules_k/siputils/checks.c | 143 +++++++++++++++------------- modules_k/siputils/checks.h | 9 +- modules_k/siputils/doc/siputils_admin.xml | 29 ++++--- modules_k/siputils/siputils.c | 36 +++++++- 5 files changed, 153 insertions(+), 100 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5ad…

13 years, 7 months

git:mariusbucur/dmq: added send_dmq_message functionality and also used it to send initial notification message

by Marius Ovidiu Bucur

Module: sip-router Branch: mariusbucur/dmq Commit: a3918ba707bfb5316eeb5718e5854a1eab00a0d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3918ba… Author: Marius Bucur <marius(a)marius-bucur.ro> Committer: Marius Bucur <marius(a)marius-bucur.ro> Date: Fri Apr 22 09:56:04 2011 +0300 added send_dmq_message functionality and also used it to send initial notification message --- modules_k/dmq/bind_dmq.c | 2 + modules_k/dmq/dmq.c | 41 ++++++++-- modules_k/dmq/dmq.h | 8 ++ modules_k/dmq/dmq_funcs.c | 38 ++++++++++ modules_k/dmq/dmq_funcs.h | 14 ++++ modules_k/dmq/dmqnode.c | 13 +++ modules_k/dmq/dmqnode.h | 6 +- modules_k/dmq/notification_peer.c | 149 ++++++++++++++++++++++++++++++++++--- modules_k/dmq/notification_peer.h | 11 ++- modules_k/dmq/peer.c | 12 --- modules_k/dmq/peer.h | 9 ++- modules_k/dmq/worker.c | 4 +- 12 files changed, 268 insertions(+), 39 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a39…

13 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2011