sr-dev October 2010

sr-dev@lists.kamailio.org

33 participants
336 discussions

evaluating expression stored in a variable
by Juha Heinanen 27 Oct '10

27 Oct '10

i think i asked this once before, but i'm not sure what the conclusion was: it is somehow currently possible to evaluate an runtime an expression stored in variable, for example, $var(exp) = ";param=$avp(value)"; append_hf("P-Foo: " + $var(uri) + eval($var(exp)) + "\r\n"); in practice, the expression to be evaluated could come from database, htable, etc., which would in my opinion greatly enhance flexibility of sr. if that cannot be done in sr 3.1, would it be difficult to implement it for the next version? -- juha

1 0

git:master: Merge remote branch 'origin/tirpi/cfg_framework_multivalue'
by Miklos Tirpak 27 Oct '10

27 Oct '10

Module: sip-router Branch: master Commit: b5cc26d622f1711f6c26f50d6562c7f93d7e1ea7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5cc26d… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Oct 27 13:03:59 2010 +0200 Merge remote branch 'origin/tirpi/cfg_framework_multivalue' * origin/tirpi/cfg_framework_multivalue: (33 commits) cfg framework: fix uninitialized group_inst pointers xmlrpc: scan resets the error code cfg_rpc: group can be specified for cfg.list cfg_rpc: cfg.set and cfg.set_delayed commands added ctl: rpc->scan does not immediately send out errors cfg_rpc: documentation update - group instances cfg framework: multiple group instances is documented cfg framework: timer must reset the handles more frequently cfg framework: cfg_select() and cfg_reset() added cfg framework: group handle can be moved runtime cfg framework: group instance support in the script cfg framework: apply the values in the order they are set cfg framework: translate_pointer bugfix cfg framework: apply additional var list bugfix cfg framework: apply the additional variable list cfg framework: group instance support before forking cfg framework: CFG_GROUP_UNKNOWN group type cfg framework: cfg_commit() log message fixes cfg_db: updated to the cfg framework changes cfg_db: updated to the cfg framework changes ... ---

1 0

git:tirpi/cfg_framework_multivalue: cfg framework: fix uninitialized group_inst pointers
by Miklos Tirpak 27 Oct '10

27 Oct '10

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 678625a48b213e5b2899ac418c6a4b3fde25750c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=678625a… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Oct 22 14:35:33 2010 +0200 cfg framework: fix uninitialized group_inst pointers --- cfg/cfg_ctx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 606ab6b..d3ea6fe 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -318,7 +318,7 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va char *old_string = NULL; void **replaced = NULL; cfg_child_cb_t *child_cb = NULL; - cfg_group_inst_t *group_inst, *new_array = NULL; + cfg_group_inst_t *group_inst = NULL, *new_array = NULL; unsigned char *var_block; /* verify the context even if we do not need it now @@ -655,7 +655,7 @@ int cfg_set_delayed(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str cfg_changed_var_t *changed = NULL, **changed_p; int size; str s; - cfg_group_inst_t *group_inst; + cfg_group_inst_t *group_inst = NULL; unsigned char *var_block; if (!cfg_shmized) @@ -934,7 +934,7 @@ int cfg_commit(cfg_ctx_t *ctx) void *p; str s, s2; cfg_group_t *group; - cfg_group_inst_t *group_inst; + cfg_group_inst_t *group_inst = NULL; if (!ctx) { LOG(L_ERR, "ERROR: cfg_commit(): context is undefined\n"); @@ -1022,7 +1022,7 @@ int cfg_commit(cfg_ctx_t *ctx) if (!changed->group_id_set) { p = CFG_GROUP_DATA(block, changed->group) + changed->var->offset; - group_inst = NULL; /* fore the look-up of the next group_inst */ + group_inst = NULL; /* force the look-up of the next group_inst */ } else { if (group != changed->group) { /* The group array has not been cloned yet. */

1 0

git:tirpi/cfg_framework_multivalue: xmlrpc: scan resets the error code
by Miklos Tirpak 27 Oct '10

27 Oct '10

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: ef18280cf6d5fc0650d0432166c639654e6cc9f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef18280… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Oct 7 13:32:30 2010 +0200 xmlrpc: scan resets the error code This way, the scan can be retried, and RPC functions with multi-type parameters can be supported: if (rpc->scan(c, "d",&i) == 1) /* int parameter */ else if (rpc->scan(c, "s",&ch) == 1) /* char* parameter */ else return /* error */ --- modules/xmlrpc/xmlrpc.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index b4cee98..deacf74 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -634,6 +634,15 @@ static int init_xmlrpc_reply(struct xmlrpc_reply* reply) return 0; } +/** Clear the XML-RPC reply code and sets it back to a success reply. + * + * @param reply XML-RPC reply structure to be cleared. + */ +static void clear_xmlrpc_reply(struct xmlrpc_reply* reply) +{ + reply->code = 200; + reply->reason = "OK"; +} /* if this a delayed reply context, and it's never been use before, fix it */ @@ -1445,6 +1454,9 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) va_list ap; reply = &ctx->reply; + /* clear the previously saved error code */ + clear_xmlrpc_reply(reply); + fmt_len = strlen(fmt); va_start(ap, fmt); modifiers=0; @@ -1768,6 +1780,8 @@ static int rpc_struct_scan(struct rpc_struct* s, char* fmt, ...) while(*fmt) { member_name = va_arg(ap, char*); reply = s->reply; + /* clear the previously saved error code */ + clear_xmlrpc_reply(reply); ret = find_member(&value, s->doc, s->struct_in, reply, member_name); if (ret != 0) goto error;

1 0

git:tirpi/cfg_framework_multivalue: cfg_rpc: group can be specified for cfg .list
by Miklos Tirpak 27 Oct '10

27 Oct '10

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: f6f6e6c8134d5c995d1818890b6107790363410f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6f6e6c… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Oct 5 16:50:51 2010 +0200 cfg_rpc: group can be specified for cfg.list - cfg.list without any parameter lists all the cfg variables. - cfg.list <group name> lists only the variables of the specific group. --- modules/cfg_rpc/README | 4 ++-- modules/cfg_rpc/cfg_rpc.c | 14 ++++++++++++-- modules/cfg_rpc/doc/rpc.xml | 3 ++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/modules/cfg_rpc/README b/modules/cfg_rpc/README index 385ee8d..3bec8f0 100644 --- a/modules/cfg_rpc/README +++ b/modules/cfg_rpc/README @@ -60,8 +60,8 @@ Miklos Tirpak can optionally contain the group instance id, for example foo[5]. * cfg.help - Print the description of a configuration variable. The function accepts two parameters: group name, variable name. - * cfg.list - List the configuration variables. The function does not - have any parameters. + * cfg.list - List the configuration variables. The function has one + optional parameter: group name. * cfg.diff - List the pending configuration changes that have not been committed yet. The function does not have any parameters. * cfg.add_group_inst - Add a new instance to an existing diff --git a/modules/cfg_rpc/cfg_rpc.c b/modules/cfg_rpc/cfg_rpc.c index 0ec588f..23cba03 100644 --- a/modules/cfg_rpc/cfg_rpc.c +++ b/modules/cfg_rpc/cfg_rpc.c @@ -353,11 +353,21 @@ static void rpc_list(rpc_t* rpc, void* c) str gname; cfg_def_t *def; int i; + str group; + + if (rpc->scan(c, "*S", &group) < 1) { + group.s = NULL; + group.len = 0; + } cfg_get_group_init(&h); while(cfg_get_group_next(&h, &gname, &def)) - for (i=0; def[i].name; i++) - rpc->printf(c, "%.*s: %s", gname.len, gname.s, def[i].name); + if (!group.len + || ((gname.len == group.len) + && (memcmp(gname.s, group.s, group.len) == 0)) + ) + for (i=0; def[i].name; i++) + rpc->printf(c, "%.*s: %s", gname.len, gname.s, def[i].name); } static const char* rpc_diff_doc[2] = { diff --git a/modules/cfg_rpc/doc/rpc.xml b/modules/cfg_rpc/doc/rpc.xml index 24c5769..4491184 100644 --- a/modules/cfg_rpc/doc/rpc.xml +++ b/modules/cfg_rpc/doc/rpc.xml @@ -100,7 +100,8 @@ <listitem> <para> <emphasis>cfg.list</emphasis> - List the configuration - variables. The function does not have any parameters. + variables. The function has one optional parameter: + group name. </para> </listitem> <listitem>

1 0

git:3.1: db_text(k): fixed db_url driver name
by Daniel-Constantin Mierla 26 Oct '10

26 Oct '10

Module: sip-router Branch: 3.1 Commit: 14a2f7d1560a3462df850084f25a758ca704a473 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14a2f7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 26 21:15:11 2010 +0200 db_text(k): fixed db_url driver name - it has to be 'text' instead of 'dbtext' - db_text should work as well, according to db driver names and module names - reported by Jeremya (cherry picked from commit e82be561d2e7f98cb2cbd7e574873134f70b2f8a) --- modules_k/db_text/README | 247 +++++++++++++++++-------------- modules_k/db_text/doc/db_text_admin.xml | 18 +- 2 files changed, 142 insertions(+), 123 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=14a…

1 0

git:master: db_text(k): fixed db_url driver name
by Daniel-Constantin Mierla 26 Oct '10

26 Oct '10

Module: sip-router Branch: master Commit: e82be561d2e7f98cb2cbd7e574873134f70b2f8a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e82be56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 26 21:15:11 2010 +0200 db_text(k): fixed db_url driver name - it has to be 'text' instead of 'dbtext' - db_text should work as well, according to db driver names and module names - reported by Jeremya --- modules_k/db_text/README | 247 +++++++++++++++++-------------- modules_k/db_text/doc/db_text_admin.xml | 18 +- 2 files changed, 142 insertions(+), 123 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e82…

1 0

Segmentation fault if using multi_leg_info
by Mino Haluz 26 Oct '10

26 Oct '10

Hi, there seems to be a bug when using multi_leg_info (version: kamailio 3.1.0 (i386/linux) bf8b8d): modparam("acc", "multi_leg_info", "Src-Leg=$avp(i:901);Dst-Leg=$avp(i:902)") When the call ends, kamailio suddenly segfaults: WARNING: no fork mode Segmentation fault (core dumped) If you do not know to reproduce the error, please provide a howto that can lead me to retrieve another useful information (gdb..). Thank you very much.

2 1

git:3.1: sanity: update docs related to return code
by Daniel-Constantin Mierla 26 Oct '10

26 Oct '10

Module: sip-router Branch: 3.1 Commit: d920515a0d65256aafcf47c5ad88deda816fccff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d920515… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 26 10:25:03 2010 +0200 sanity: update docs related to return code - sanity_check() returns false if a test fails - reported by Sergey Okhapkin (cherry picked from commit 8a2334dd758a1e9d43d1fac544f6e962960b4dcc) --- modules/sanity/README | 22 +++++++++++----------- modules/sanity/doc/functions.xml | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/sanity/README b/modules/sanity/README index 0e364e3..2510375 100644 --- a/modules/sanity/README +++ b/modules/sanity/README @@ -4,7 +4,7 @@ Nils Ohlmeier iptelorg GmbH - Copyright � 2006 iptelorg GmbH + Copyright © 2006 iptelorg GmbH Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -116,17 +116,17 @@ modparam("sanity", "proxy_require", "foo, bar") Revision History Revision $Revision$ $Date$ -1.4.1. sanity_check() +1.4.1. sanity_check() This function makes a row of sanity checks on the given request. The - function returns true if one of the checks failed. If one of the checks - fails the module sends a precise error reply via sl_send_reply. Thus - their is no need to reply with a generic error message. + function returns false (-1) if one of the checks failed. If one of the + checks fails the module sends a precise error reply via sl_send_reply. + Thus there is no need to reply with a generic error message. Example 3. sanity_check usage ... -if (sanity_check()) { - break; +if (!sanity_check()) { + exit; } ... @@ -138,10 +138,10 @@ if (sanity_check()) { Example 4. sanity_check usage with parameter ... -if (method=="REGISTER" && sanity_check("256")) { +if (method=="REGISTER" && !sanity_check("256")) { /* the register contains an invalid expires value and is replied with a 400 */ - break; + exit; } ... @@ -151,9 +151,9 @@ if (method=="REGISTER" && sanity_check("256")) { Example 5. sanity_check usage with two parameters ... -if (method=="INVITE" && sanity_check("1024", "6")) { +if (method=="INVITE" && !sanity_check("1024", "6")) { /* the INVITE contains an invalid From or To header and is replied with a 400 */ - break; + exit; } ... diff --git a/modules/sanity/doc/functions.xml b/modules/sanity/doc/functions.xml index 85f788d..ea9cf1d 100644 --- a/modules/sanity/doc/functions.xml +++ b/modules/sanity/doc/functions.xml @@ -26,9 +26,9 @@ </title> <para> This function makes a row of sanity checks on the given request. - The function returns true if one of the checks failed. If one + The function returns false (-1) if one of the checks failed. If one of the checks fails the module sends a precise error reply via - sl_send_reply. Thus their is no need to reply with a generic + sl_send_reply. Thus there is no need to reply with a generic error message. </para> <example> @@ -36,8 +36,8 @@ <programlisting> <![CDATA[ ... -if (sanity_check()) { - break; +if (!sanity_check()) { + exit; } ... ]]> @@ -55,9 +55,9 @@ if (sanity_check()) { <programlisting> <![CDATA[ ... -if (method=="REGISTER" && sanity_check("256")) { +if (method=="REGISTER" && !sanity_check("256")) { /* the register contains an invalid expires value and is replied with a 400 */ - break; + exit; } ... ]]> @@ -73,9 +73,9 @@ if (method=="REGISTER" && sanity_check("256")) { <programlisting> <![CDATA[ ... -if (method=="INVITE" && sanity_check("1024", "6")) { +if (method=="INVITE" && !sanity_check("1024", "6")) { /* the INVITE contains an invalid From or To header and is replied with a 400 */ - break; + exit; } ... ]]>

1 0

git:master: sanity: update docs related to return code
by Daniel-Constantin Mierla 26 Oct '10

26 Oct '10

Module: sip-router Branch: master Commit: 8a2334dd758a1e9d43d1fac544f6e962960b4dcc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a2334d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 26 10:25:03 2010 +0200 sanity: update docs related to return code - sanity_check() returns false if a test fails - reported by Sergey Okhapkin --- modules/sanity/README | 22 +++++++++++----------- modules/sanity/doc/functions.xml | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/sanity/README b/modules/sanity/README index 0e364e3..2510375 100644 --- a/modules/sanity/README +++ b/modules/sanity/README @@ -4,7 +4,7 @@ Nils Ohlmeier iptelorg GmbH - Copyright � 2006 iptelorg GmbH + Copyright © 2006 iptelorg GmbH Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -116,17 +116,17 @@ modparam("sanity", "proxy_require", "foo, bar") Revision History Revision $Revision$ $Date$ -1.4.1. sanity_check() +1.4.1. sanity_check() This function makes a row of sanity checks on the given request. The - function returns true if one of the checks failed. If one of the checks - fails the module sends a precise error reply via sl_send_reply. Thus - their is no need to reply with a generic error message. + function returns false (-1) if one of the checks failed. If one of the + checks fails the module sends a precise error reply via sl_send_reply. + Thus there is no need to reply with a generic error message. Example 3. sanity_check usage ... -if (sanity_check()) { - break; +if (!sanity_check()) { + exit; } ... @@ -138,10 +138,10 @@ if (sanity_check()) { Example 4. sanity_check usage with parameter ... -if (method=="REGISTER" && sanity_check("256")) { +if (method=="REGISTER" && !sanity_check("256")) { /* the register contains an invalid expires value and is replied with a 400 */ - break; + exit; } ... @@ -151,9 +151,9 @@ if (method=="REGISTER" && sanity_check("256")) { Example 5. sanity_check usage with two parameters ... -if (method=="INVITE" && sanity_check("1024", "6")) { +if (method=="INVITE" && !sanity_check("1024", "6")) { /* the INVITE contains an invalid From or To header and is replied with a 400 */ - break; + exit; } ... diff --git a/modules/sanity/doc/functions.xml b/modules/sanity/doc/functions.xml index 85f788d..ea9cf1d 100644 --- a/modules/sanity/doc/functions.xml +++ b/modules/sanity/doc/functions.xml @@ -26,9 +26,9 @@ </title> <para> This function makes a row of sanity checks on the given request. - The function returns true if one of the checks failed. If one + The function returns false (-1) if one of the checks failed. If one of the checks fails the module sends a precise error reply via - sl_send_reply. Thus their is no need to reply with a generic + sl_send_reply. Thus there is no need to reply with a generic error message. </para> <example> @@ -36,8 +36,8 @@ <programlisting> <![CDATA[ ... -if (sanity_check()) { - break; +if (!sanity_check()) { + exit; } ... ]]> @@ -55,9 +55,9 @@ if (sanity_check()) { <programlisting> <![CDATA[ ... -if (method=="REGISTER" && sanity_check("256")) { +if (method=="REGISTER" && !sanity_check("256")) { /* the register contains an invalid expires value and is replied with a 400 */ - break; + exit; } ... ]]> @@ -73,9 +73,9 @@ if (method=="REGISTER" && sanity_check("256")) { <programlisting> <![CDATA[ ... -if (method=="INVITE" && sanity_check("1024", "6")) { +if (method=="INVITE" && !sanity_check("1024", "6")) { /* the INVITE contains an invalid From or To header and is replied with a 400 */ - break; + exit; } ... ]]>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2010