sr-dev September 2009

sr-dev@lists.kamailio.org

32 participants
207 discussions

SF.net SVN: openser:[5926] branches/1.5/etc/kamailio.cfg
by Daniel-Constantin Mierla 24 Sep '09

24 Sep '09

Revision: 5926 http://openser.svn.sourceforge.net/openser/?rev=5926&view=rev Author: miconda Date: 2009-09-24 18:37:43 +0000 (Thu, 24 Sep 2009) Log Message: ----------- - setting of brach flags for sip nat pinging Modified Paths: -------------- branches/1.5/etc/kamailio.cfg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:master: mi_rpc: support for async mi commands
by Andrei Pelinescu-Onciul 24 Sep '09

24 Sep '09

Module: sip-router Branch: master Commit: 244d4d4729b295be999acb3a4ca4cf156a9bfbbf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=244d4d4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Sep 24 18:06:22 2009 +0200 mi_rpc: support for async mi commands async mi commands can now be executed, if the underlying rpc transport module supports it (e.g. xmlrpc). --- modules/mi_rpc/mi_rpc_mod.c | 135 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 120 insertions(+), 15 deletions(-) diff --git a/modules/mi_rpc/mi_rpc_mod.c b/modules/mi_rpc/mi_rpc_mod.c index 9c68839..b678f25 100644 --- a/modules/mi_rpc/mi_rpc_mod.c +++ b/modules/mi_rpc/mi_rpc_mod.c @@ -93,7 +93,7 @@ struct mi_root *mi_rpc_read_params(rpc_t *rpc, void *ctx) { name.s = 0; name.len = 0; - + if(value.len>=2 && value.s[0]=='-' && value.s[1]=='-') { /* name */ @@ -256,12 +256,66 @@ static int mi_rpc_print_tree(rpc_t* rpc, void* ctx, struct mi_root *tree, return 0; } + + +/* structure used to pack the rpc dyn. ctx and the print mode */ +struct mi_rpc_handler_param{ + rpc_delayed_ctx_t* dctx; + enum mi_rpc_print_mode mode; +}; + +/* send reply and close async context */ +static void mi_rpc_async_close(struct mi_root* mi_rpl, + struct mi_handler* mi_h, + int done) +{ + rpc_delayed_ctx_t* dctx; + rpc_t* rpc; + void* c; + enum mi_rpc_print_mode mode; + + dctx=0; + if (done){ + if (mi_h->param==0){ + BUG("null param\n"); + shm_free(mi_h); + goto error; + } + dctx=((struct mi_rpc_handler_param*)mi_h->param)->dctx; + if (dctx==0){ + BUG("null dctx\n"); + shm_free(mi_h->param); + shm_free(mi_h); + mi_h->param=0; + goto error; + } + mode=((struct mi_rpc_handler_param*)mi_h->param)->mode; + rpc=&dctx->rpc; + c=dctx->reply_ctx; + + mi_rpc_print_tree(rpc, c, mi_rpl, mode); + + rpc->delayed_ctx_close(dctx); + shm_free(mi_h->param); + mi_h->param=0; + shm_free(mi_h); + } /* else: no provisional support => do nothing */ +error: + if (mi_rpl) + free_mi_tree(mi_rpl); + return; +} + + + static void rpc_mi_exec(rpc_t *rpc, void *ctx, enum mi_rpc_print_mode mode) { str cmd; struct mi_cmd *mic; struct mi_root *mi_req; struct mi_root *mi_rpl; + struct mi_handler* mi_async_h; + struct mi_rpc_handler_param* mi_handler_param; if (rpc->scan(ctx, "S", &cmd) < 1) { @@ -269,7 +323,11 @@ static void rpc_mi_exec(rpc_t *rpc, void *ctx, enum mi_rpc_print_mode mode) rpc->fault(ctx, 500, "command parameter missing"); return; } - + + mi_async_h=0; + mi_req = 0; + mi_rpl=0; + mic = lookup_mi_cmd(cmd.s, cmd.len); if(mic==0) { @@ -280,12 +338,15 @@ static void rpc_mi_exec(rpc_t *rpc, void *ctx, enum mi_rpc_print_mode mode) if (mic->flags&MI_ASYNC_RPL_FLAG) { - LM_ERR("async mi cmd support not implemented yet\n"); - rpc->fault(ctx, 500, "async my cmd not implemented yet"); - return; + if (rpc->capabilities==0 || + !(rpc->capabilities(ctx) & RPC_DELAYED_REPLY)) + { + rpc->fault(ctx, 500, + "this rpc transport does not support async mode"); + return; + } } - mi_req = 0; if(!(mic->flags&MI_NO_INPUT_FLAG)) { mi_req = mi_rpc_read_params(rpc, ctx); @@ -293,29 +354,73 @@ static void rpc_mi_exec(rpc_t *rpc, void *ctx, enum mi_rpc_print_mode mode) { LM_ERR("cannot parse parameters\n"); rpc->fault(ctx, 500, "cannot parse parameters"); - return; + goto error; } + if (mic->flags&MI_ASYNC_RPL_FLAG) + { + /* build mi async handler */ + mi_handler_param=shm_malloc(sizeof(*mi_handler_param)); + if (mi_handler_param==0){ + rpc->fault(ctx, 500, "out of memory"); + return; + } + mi_async_h=shm_malloc(sizeof(*mi_async_h)); + if (mi_async_h==0){ + shm_free(mi_handler_param); + mi_handler_param=0; + rpc->fault(ctx, 500, "out of memory"); + return; + } + memset(mi_async_h, 0, sizeof(*mi_async_h)); + mi_async_h->handler_f=mi_rpc_async_close; + mi_handler_param->mode=mode; + mi_handler_param->dctx=rpc->delayed_ctx_new(ctx); + if (mi_handler_param->dctx==0){ + rpc->fault(ctx, 500, "internal error: async ctx" + " creation failed"); + goto error; + } + /* switch context, since replies are not allowed anymore on the + original one */ + rpc=&mi_handler_param->dctx->rpc; + ctx=mi_handler_param->dctx->reply_ctx; + mi_async_h->param=mi_handler_param; + } + mi_req->async_hdl=mi_async_h; } mi_rpl=run_mi_cmd(mic, mi_req); if(mi_rpl == 0) { rpc->fault(ctx, 500, "execution failed"); - if (mi_req) free_mi_tree(mi_req); - return; + goto error; } if (mi_rpl!=MI_ROOT_ASYNC_RPL) { mi_rpc_print_tree(rpc, ctx, mi_rpl, mode); + goto end; + }else if (mi_async_h==0){ + /* async reply, but command not listed as async */ + rpc->fault(ctx, 500, "bad mi command: unexpected async reply"); + goto error; + } + mi_async_h=0; /* don't delete it */ +end: +error: + if (mi_req) + free_mi_tree(mi_req); + if (mi_rpl && mi_rpl!=MI_ROOT_ASYNC_RPL) free_mi_tree(mi_rpl); - if (mi_req) free_mi_tree(mi_req); - return; + if (mi_async_h){ + if (mi_async_h->param){ + if (((struct mi_rpc_handler_param*)mi_async_h->param)->dctx) + rpc->delayed_ctx_close(((struct mi_rpc_handler_param*) + mi_async_h->param)->dctx); + shm_free(mi_async_h->param); + } + shm_free(mi_async_h); } - - /* async cmd -- not yet */ - rpc->fault(ctx, 500, "no async handling yet"); - if (mi_req) free_mi_tree(mi_req); return; }

1 0

git:master: mi_rpc: doc update
by Andrei Pelinescu-Onciul 24 Sep '09

24 Sep '09

Module: sip-router Branch: master Commit: cf593d2fd64bcc6a04526beaa228b028e065d304 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf593d2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Sep 24 18:20:54 2009 +0200 mi_rpc: doc update - async mi commands supported - added the list of the various rpc mi commands versions (mi, mi_dg, mi_xmlrpc and mi_fifo). --- modules/mi_rpc/README | 73 ++++++++++++++++++++++++----------- modules/mi_rpc/doc/mi_rpc_admin.xml | 37 ++++++++++++++--- 2 files changed, 80 insertions(+), 30 deletions(-) diff --git a/modules/mi_rpc/README b/modules/mi_rpc/README index d2d0fff..5739c28 100644 --- a/modules/mi_rpc/README +++ b/modules/mi_rpc/README @@ -18,55 +18,84 @@ Daniel-Constantin Mierla 1. Admin Guide - 1.1. Overview - 1.2. Dependencies + 1. Overview + 2. Dependencies - 1.2.1. Kamailio Modules - 1.2.2. External Libraries or Applications + 2.1. Kamailio Modules + 2.2. External Libraries or Applications - 1.3. Exported Parameters - 1.4. Exported Functions - 1.5. Exported RPC commands + 3. Exported Parameters + 4. Exported Functions + 5. Exported RPC commands - 1.5.1. mi + 5.1. mi mi_dg mi_fifo mi_xmlrpc Chapter 1. Admin Guide -1.1. Overview + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + 4. Exported Functions + 5. Exported RPC commands + + 5.1. mi mi_dg mi_fifo mi_xmlrpc + +1. Overview The module exports a RPC command to execute MI commands. The other way around not implemented (MI command to execute RPC) -- to - be investigated if worth the effort. Also, execution of asynchronous MI - command is not yet supported. + be investigated if worth the effort. + +2. Dependencies -1.2. Dependencies + 2.1. Kamailio Modules + 2.2. External Libraries or Applications -1.2.1. Kamailio Modules +2.1. Kamailio Modules The following modules must be loaded before this module: * No dependencies on other Kamailio modules. -1.2.2. External Libraries or Applications +2.2. External Libraries or Applications The following libraries or applications must be installed before running Kamailio with this module loaded: * None. -1.3. Exported Parameters +3. Exported Parameters none -1.4. Exported Functions +4. Exported Functions none -1.5. Exported RPC commands +5. Exported RPC commands + + 5.1. mi mi_dg mi_fifo mi_xmlrpc -1.5.1. mi +5.1. mi mi_dg mi_fifo mi_xmlrpc Execute a MI command. + Depending on the version (e.g. mi, mi_dg) it formats the output in a + similar way to the corresponding kamailio mi module: + * mi - uses a special, "pretty" format which generates nicer (more + readable) output when used with sercmd. + * mi_dg - uses an output format similar to the kamailio mi_datagram + module. + * mi_fifo - uses an output format similar to the kamailio mi_fifo + module. + * mi_xmlrpc - uses an output format similar to the kamailio mi_xmlrpc + module. + Name: mi Parameters: @@ -77,8 +106,6 @@ Chapter 1. Admin Guide Example using 'sercmd': sercmd> mi uptime -200 OK - -+ Now:: Sun Jun 28 12:45:37 2009 -+ Up since:: Sun Jun 28 12:24:27 2009 -+ Up time:: 1270 [sec] +Now:: Thu Sep 24 18:17:15 2009 +Up since:: Thu Sep 24 17:35:45 2009 +Up time:: 2490 [sec] diff --git a/modules/mi_rpc/doc/mi_rpc_admin.xml b/modules/mi_rpc/doc/mi_rpc_admin.xml index 98b7987..514ddd6 100644 --- a/modules/mi_rpc/doc/mi_rpc_admin.xml +++ b/modules/mi_rpc/doc/mi_rpc_admin.xml @@ -20,8 +20,7 @@ </para> <para> The other way around not implemented (MI command to execute RPC) - -- to be investigated if worth the effort. Also, execution of - asynchronous MI command is not yet supported. + -- to be investigated if worth the effort. </para> </section> @@ -69,11 +68,37 @@ <section> <title> <function moreinfo="none">mi</function> + <function moreinfo="none">mi_dg</function> + <function moreinfo="none">mi_fifo</function> + <function moreinfo="none">mi_xmlrpc</function> </title> <para> Execute a MI command. </para> <para> + Depending on the version (e.g. mi, mi_dg) it formats the output in a + similar way to the corresponding kamailio mi module: + <itemizedlist> + <listitem> + <function>mi</function> - uses a special, "pretty" format + which generates nicer (more readable) output when used with + sercmd. + </listitem> + <listitem> + <function>mi_dg</function> - uses an output format similar to + the kamailio mi_datagram module. + </listitem> + <listitem> + <function>mi_fifo</function> - uses an output format similar + to the kamailio mi_fifo module. + </listitem> + <listitem> + <function>mi_xmlrpc</function> - uses an output format similar + to the kamailio mi_xmlrpc module. + </listitem> + </itemizedlist> + </para> + <para> Name: <emphasis>mi</emphasis> </para> <para>Parameters:</para> @@ -90,11 +115,9 @@ </para> <programlisting format="linespecific"> sercmd> mi uptime -200 OK - -+ Now:: Sun Jun 28 12:45:37 2009 -+ Up since:: Sun Jun 28 12:24:27 2009 -+ Up time:: 1270 [sec] +Now:: Thu Sep 24 18:17:15 2009 +Up since:: Thu Sep 24 17:35:45 2009 +Up time:: 2490 [sec] </programlisting> </section> </section>

1 0

git:master: tm: t_uac_wait rpc error path fixes
by Andrei Pelinescu-Onciul 24 Sep '09

24 Sep '09

Module: sip-router Branch: master Commit: 4d5abbd5a1070ce45f5c7f31d758a70df686296c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d5abbd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Sep 24 17:58:38 2009 +0200 tm: t_uac_wait rpc error path fixes - fix no reply sent on t_uac() failure - free "delayed" context on t_uac() failure --- modules/tm/rpc_uac.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/tm/rpc_uac.c b/modules/tm/rpc_uac.c index 3dc34a9..f177094 100644 --- a/modules/tm/rpc_uac.c +++ b/modules/tm/rpc_uac.c @@ -493,6 +493,7 @@ static void rpc_t_uac(rpc_t* rpc, void* c, int reply_wait) body.s=0; body.len=0; + dctx=0; if (reply_wait && (rpc->capabilities == 0 || !(rpc->capabilities(c) & RPC_DELAYED_REPLY))) { rpc->fault(c, 600, "Reply wait/async mode not supported" @@ -604,6 +605,10 @@ static void rpc_t_uac(rpc_t* rpc, void* c, int reply_wait) uac_req.cb=rpc_uac_callback; uac_req.cbp=dctx; uac_req.cb_flags=TMCB_LOCAL_COMPLETED; + /* switch to dctx, in case adding the callback fails and we + want to still send a reply */ + rpc=&dctx->rpc; + c=dctx->reply_ctx; } ret = t_uac(&uac_req); @@ -616,6 +621,8 @@ static void rpc_t_uac(rpc_t* rpc, void* c, int reply_wait) } else { rpc->fault(c, 500, "RPC/UAC error"); } + if (dctx) + rpc->delayed_ctx_close(dctx); goto error01; } error01:

1 0

Standalone Configuration File Parser
by Jan Janak 24 Sep '09

24 Sep '09

Hello, I am not sure if everybody is aware of that, but the sip-router core has inherited a standalone configuration file parser from SER. The parser lives in files cfg_parser.[ch] and can be used to parse configuration files of form: # comment... [section] name1 = value1 name2 = value2 ... The format of section identifiers as well as the format of configuration values are extensible it can be anything from booleans, integers, strings, and even more complicated compound formats of your own. Two SER modules currently use the parser. The tls module uses it to parse standalone configuration files with TLS related configuration. The ldap SER module uses the parser to parse a configuration file that maps LDAP objects to tables and columns for the database API. Here is an example of a non-trivial configuration file the parse can parse: http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob_plain;f=mo… Some documentation can be found in file sip_router/cfg_parser.c. For examples how to use it have a look at the following files: http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules_… http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules/… Jan.

2 2

F_TCPCONN connection marked as bad
by jh＠tutpro.com 23 Sep '09

23 Sep '09

with latest additions that andrei made to s xmlrpc module, i now managed to get click-to-dial to work using tm.t_uac_wait. however, one new issue appeared. each time i call t_uac_wait over xmlrpc, i get to syslog: Sep 23 18:06:37 localhost /usr/sbin/sip-proxy[18399]: INFO: Handling XMLRPC POST from <127.0.0.1> Sep 23 18:06:37 localhost /usr/sbin/sip-proxy[18399]: WARNING: <core> [tcp_read. c:969]: WARNING: tcp_receive: handle_io: F_TCPCONN connection marked as bad: 0xb 3399dc8 id 51 refcnt 1 it does not seem to have any effect in operation of t_uac_wait. any idea why that comes and how to get rid of it? my xmlrpc_requests route looks like this: route [xmlrpc_requests] { # Handle XMLRPC requests xlog("L_INFO", "Handling XMLRPC $rm from <$si>\n"); set_reply_no_connect(); # optional set_reply_close(); dispatch_rpc(); return; } -- juha

2 1

git:master: tm: fixed empty sl reply warning
by Andrei Pelinescu-Onciul 23 Sep '09

23 Sep '09

Module: sip-router Branch: master Commit: 0d6fcb8e786c89e25ac0ac11eab59ab108b97ab6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d6fcb8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 23 22:21:07 2009 +0200 tm: fixed empty sl reply warning --- modules/tm/tm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 22d7da1..df7874c 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -504,7 +504,7 @@ static int fixup_routes(char* r_type, struct route_list* rt, void** param) LOG(L_ERR, "ERROR: tm: fixup_routes: route_get failed\n"); return E_UNSPEC; } - if (rt->rlist[i]==0){ + if (r_type && rt->rlist[i]==0){ LOG(L_WARN, "WARNING: %s(\"%s\"): empty/non existing route\n", r_type, (char*)*param); } @@ -557,7 +557,7 @@ static int fixup_on_sl_reply(modparam_t type, void* val) return -1; } - if (fixup_routes("on_sl_reply", &onreply_rt, &val)) + if (fixup_routes(0, &onreply_rt, &val)) return -1; goto_on_sl_reply = (int)(long)val; @@ -779,6 +779,8 @@ static int mod_init(void) if (goto_on_local_req>=0 && event_rt.rlist[goto_on_local_req]==0) goto_on_local_req=-1; /* disable */ #endif /* WITH_EVENT_LOCAL_REQUEST */ + if (goto_on_sl_reply && onreply_rt.rlist[goto_on_sl_reply]==0) + WARN("empty/non existing on_sl_reply route\n"); tm_init = 1; return 0; }

1 0

git:master: tcp: killed warning
by Andrei Pelinescu-Onciul 23 Sep '09

23 Sep '09

Module: sip-router Branch: master Commit: 33c8757246f5a775f6b918f4e629e3c645ad1345 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33c8757… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 23 21:48:32 2009 +0200 tcp: killed warning Killed warning for the case when a connection is force closed on purpose (via set_reply_close()). --- tcp_read.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index b79e2e2..d201765 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -964,7 +964,8 @@ again: con=(struct tcp_connection*)fm->data; if (unlikely(con->state==S_CONN_BAD)){ resp=CONN_ERROR; - LOG(L_WARN, "WARNING: tcp_receive: handle_io: F_TCPCONN" + if (!(con->send_flags & SND_F_CON_CLOSE)) + LOG(L_WARN, "WARNING: tcp_receive: handle_io: F_TCPCONN" " connection marked as bad: %p id %d refcnt %d\n", con, con->id, atomic_get(&con->refcnt)); goto read_error;

1 0

current problem summary
by jh＠tutpro.com 23 Sep '09

23 Sep '09

here is my current list of open problems: - this warning needs to go away: Sep 2 21:00:18 localhost sip-router: WARNING: tm [tm.c:502]: WARNING: on_sl_reply("stateless_reply"): empty/non existing route when onreply_route [stateless_reply] exist. - tm.t_uac_wait over xmlrpc generates warning: Sep 23 18:06:37 localhost /usr/sbin/sip-proxy[18399]: WARNING: <core> [tcp_read. c:969]: WARNING: tcp_receive: handle_io: F_TCPCONN connection marked as bad: 0xb 3399dc8 id 51 refcnt 1 - not all processes die on sr restart (waiting it to happen again to get more info). -- juha ps. i hope that i'm not the only user currently testing sr, because i haven't seen many problems reports from other people? if i am, i need a plan b.

1 0

local_route block ?
by jh＠tutpro.com 23 Sep '09

23 Sep '09

in k or openser there used to be a local_route block that was executed for locally generated requests, such as those triggered by t_uac_dlg mi command. the question is, what is the equivalent in sr? when issuing, for example, invite using tm.t_uac_wait, i need to be able to set invite timeout using t_set_fr() call. there exists onsend_route, but according to wiki, it does not apply: This route is executed only when forwarding requests - it is not executed for replies, retransmissions, or locally generated messages (e.g. via fifo uac). -- juha

3 5

← Newer
1
2
3
4
5
6
7
8
9
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2009