sr-dev July 2009

sr-dev@lists.kamailio.org

35 participants
328 discussions

git:master: tm: which_cancel renamed and takes more parameters

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 79edcdf278ff95b17b08f44affa636ec7a40aa40 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79edcdf… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 14 14:44:21 2009 +0200 tm: which_cancel renamed and takes more parameters - which_cancel() renamed to prepare_to_cancel() to better reflect its real purpose. - which_cancel_f renamed to prepare_to_cancel_f - tm_binds which_cancel member renamed to prepare_to_cancel - should_cancel_branch() renamed to prepare_cancel_branch(). - prepare_to_cancel() takes now an extra parameter (skip_branches) which contains a bitmap of the branches that should be skipped (not canceled). --- modules/tm/t_cancel.c | 38 ++++++++++++++++++++++++++------------ modules/tm/t_cancel.h | 24 +++++++++++++++++++----- modules/tm/t_fwd.c | 8 ++++---- modules/tm/t_reply.c | 14 +++++++------- modules/tm/timer.c | 2 +- modules/tm/tm_load.c | 2 +- modules/tm/tm_load.h | 3 ++- 7 files changed, 60 insertions(+), 31 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=79e…

14 years, 11 months

TLS core parameters

by Klaus Darilion

Hi! there are various TLS parameters in core: tls_ca_list tls_certificate tls_handshake_timeout tlslog tls_method tls_port_no tls_private_key tls_require_certificate tls_send_timeout tls_verify Are they still needed? IIRC TLS is now configured by a separate config file, thus it would make sense to remove them. regards klaus

14 years, 11 months

xmlrcp request takes very long time

by jh＠tutpro.com

i wrote in python a simple text that sends domain_reload command over s xmlrpc interface to sr: --------------------------------------------------------------- import xmlrpclib XMLRPC_PROTOCOL = 'http' XMLRPC_SERVER = '127.0.0.1' XMLRPC_PORT = 6060 server_path = XMLRPC_PROTOCOL + '://' + XMLRPC_SERVER + \ ':' + str(XMLRPC_PORT) c = xmlrpclib.ServerProxy(server_path) erg = c.domain_reload() ---------------------------------------------------------------- when i execute the program, ngrep immediately prints what one would expect: T 2009/07/04 17:20:02.455028 127.0.0.1:33418 -> 127.0.0.1:6060 [AP] POST /RPC2 HTTP/1.0..Host: 127.0.0.1:6060..User-Agent: xmlrpclib.py/1.0.1 ( by www.pythonware.com)..Content-Type: text/xml..Content-Length: 107.... ## T 2009/07/04 17:20:02.455358 127.0.0.1:33418 -> 127.0.0.1:6060 [AP] <?xml version='1.0'?>.<methodCall>.<methodName>domain_reload</methodName>.< params>.</params>.</methodCall>. ## T 2009/07/04 17:20:02.455718 127.0.0.1:6060 -> 127.0.0.1:33418 [AP] HTTP/1.0 200 OK..Via: SIP/2.0/TCP 127.0.0.1:33418..Server: SIP Route r (2.99.0-dev01-serk (i386/linux))..Content-Length: 274....<?xml version="1 .0"?>.<methodResponse>.<fault>.<value>.<struct>.<member>.<name>faultCode</n ame>.<value><int>500</int></value>.</member>.<member>.<name>faultString</na me>.<value><string>Method Not Found</string></value>.</member>.</struct>.</ value>.</fault>.</methodResponse> however, python client program does not terminate until after more than 2 minutes. then it finally prints: Traceback (most recent call last): File "sr-xmlrpc.py", line 15, in <module> erg = c.domain_reload() File "/usr/lib/python2.5/xmlrpclib.py", line 1147, in __call__ return self.__send(self.__name, args) File "/usr/lib/python2.5/xmlrpclib.py", line 1437, in __request verbose=self.__verbose File "/usr/lib/python2.5/xmlrpclib.py", line 1201, in request return self._parse_response(h.getfile(), sock) File "/usr/lib/python2.5/xmlrpclib.py", line 1340, in _parse_response return u.close() File "/usr/lib/python2.5/xmlrpclib.py", line 787, in close raise Fault(**self._stack[0]) xmlrpclib.Fault: <Fault 500: 'Method Not Found'> i also tested with a php xmlrcp client with same result. any idea why it takes so long and why parsing of response fails? is something missing from the response? -- juha

14 years, 11 months

trusted_reload fails

by jh＠tutpro.com

mi trusted_reload fails like this: srctl> mi trusted_reload error: 400 - Trusted table reload failed and syslog shows these error messages: Jul 14 11:21:56 localhost /usr/sbin/sip-router[11658]: ERROR: <core> [db.c:422]: invalid parameter value Jul 14 11:21:56 localhost /usr/sbin/sip-router[11658]: ERROR: permissions [trusted.c:76]: failed to use trusted table -- juha

14 years, 11 months

CVS:commitlog: sip_router/parser msg_parser.c

by Andrei Pelinescu-Onciul

andrei 2009/07/14 09:40:17 CEST SER CVS Repository Modified files: parser msg_parser.c Log: core: parse_headers flags fix Restore original flags after parse_headers was called with "next" (without restoring them, if parse_headers doesn't find again all the requested headers it will leave their flags cleared although they might be present in the message). Revision Changes Path 1.62 +8 -3 sip_router/parser/msg_parser.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/parser/msg_parser.…

14 years, 11 months

CVS:commitlog: sip_router/modules/tm t_fifo.c

by Andrei Pelinescu-Onciul

andrei 2009/07/14 09:38:33 CEST SER CVS Repository Modified files: modules/tm t_fifo.c Log: tm: fifo access From fix Access the From header contents only if non-null. Revision Changes Path 1.32 +2 -2 sip_router/modules/tm/t_fifo.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/tm/t_fifo.…

14 years, 11 months

CVS:commitlog: sip_router/modules/presence_b2b euac_funcs.c

by Andrei Pelinescu-Onciul

andrei 2009/07/14 09:36:51 CEST SER CVS Repository Modified files: modules/presence_b2b euac_funcs.c Log: presence_b2b: fix from & to header access Access the parsed part of a From or To header only if non-zero and/or parse_from_header() returned success. Revision Changes Path 1.16 +4 -2 sip_router/modules/presence_b2b/euac_funcs.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/presence_b…

14 years, 11 months

CVS:commitlog: sip_router/modules/rr loose.c

by Andrei Pelinescu-Onciul

andrei 2009/07/14 09:36:20 CEST SER CVS Repository Modified files: modules/rr loose.c Log: rr: fix from header access get_from() can be used _only_ if parse_from_header() returned success or if msg->from!=0. Revision Changes Path 1.53 +3 -3 sip_router/modules/rr/loose.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/rr/loose.c…

14 years, 11 months

git:master: mi_rpc: support for different "modes"

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 1e1cc81d8f7c18615b78335f889c8a3de21dac24 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e1cc81… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 13 22:35:34 2009 +0200 mi_rpc: support for different "modes" Added more rpc commands: mi_fifo - output compatible with the k mi_fifo module, when using with sercmd (e.g. sercmd -f "%v" mi_fifo which) mi_dg - output compatible with the k mi_datagram module, when using with sermcd (e.g. sercmd -f "%v" mi_dg which) mi_xmlrpc - output compatible with the k mi_xmlrpc module (should be used with the xmlrpc module) The "mi" command was changed too: it doesn't output a leading '+' anymore on each line and it doesn't print the result code (the result code is embedded in the rpc reply, there no need to print it). --- modules/mi_rpc/mi_rpc_mod.c | 186 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 153 insertions(+), 33 deletions(-) diff --git a/modules/mi_rpc/mi_rpc_mod.c b/modules/mi_rpc/mi_rpc_mod.c index cc3daac..007c575 100644 --- a/modules/mi_rpc/mi_rpc_mod.c +++ b/modules/mi_rpc/mi_rpc_mod.c @@ -33,14 +33,31 @@ MODULE_VERSION static str mi_rpc_indent = { "\t", 1 }; static const char* rpc_mi_exec_doc[2] = { - "Execut MI command", + "Execute MI command", 0 }; -static void rpc_mi_exec(rpc_t* rpc, void* c); + + +enum mi_rpc_print_mode { + MI_PRETTY_PRINT, + MI_FIFO_PRINT, + MI_DATAGRAM_PRINT, + MI_XMLRPC_PRINT +}; + + + +static void rpc_mi_pretty_exec(rpc_t* rpc, void* c); +static void rpc_mi_fifo_exec(rpc_t* rpc, void* c); +static void rpc_mi_dg_exec(rpc_t* rpc, void* c); +static void rpc_mi_xmlrpc_exec(rpc_t* rpc, void* c); rpc_export_t mr_rpc[] = { - {"mi", rpc_mi_exec, rpc_mi_exec_doc, RET_ARRAY}, + {"mi", rpc_mi_pretty_exec, rpc_mi_exec_doc, RET_ARRAY}, + {"mi_fifo", rpc_mi_fifo_exec, rpc_mi_exec_doc, RET_ARRAY}, + {"mi_dg", rpc_mi_dg_exec, rpc_mi_exec_doc, RET_ARRAY}, + {"mi_xmlrpc", rpc_mi_xmlrpc_exec, rpc_mi_exec_doc, RET_ARRAY}, {0, 0, 0, 0} }; @@ -56,6 +73,8 @@ struct module_exports exports = { 0 /* Child initialization function */ }; + + struct mi_root *mi_rpc_read_params(rpc_t *rpc, void *ctx) { struct mi_root *root; @@ -108,63 +127,136 @@ error: return 0; } -static int mi_rpc_rprint_node(rpc_t* rpc, void* ctx, struct mi_node *node, - int level) + + +/** prints a mi node using mode. + * @return 0 on success, -1 on error (line too long) + */ +static int mi_rpc_print_node(rpc_t* rpc, void* ctx, struct mi_node* node, + enum mi_rpc_print_mode mode, char* prefix) { + static char buf[512]; + char* p; + int n; + int size; struct mi_attr *attr; + + p=buf; + *p=0; + size=sizeof(buf); + n=snprintf(p, size, "%s%.*s:: %.*s", + prefix, + node->name.len, (node->name.s)?node->name.s:"", + node->value.len, (node->value.s)?node->value.s:""); + if (n==-1 || n >= size) + goto error_buf; + p+=n; + size-=n; + for( attr=node->attributes ; attr!=NULL ; attr=attr->next ) { + n=snprintf(p, size, " %.*s=%.*s", + attr->name.len, (attr->name.s)?attr->name.s:"", + attr->value.len, (attr->value.s)?attr->value.s:""); + if (n==-1 || n >= size) + goto error_buf; + p+=n; + size-=n; + } + if (mode!=MI_PRETTY_PRINT){ + n=snprintf(p, size, "\n"); + if (n==-1 || n>= size ) + goto error_buf; + } + rpc->add(ctx, "s", buf); + return 0; +error_buf: + ERR("line too long (extra %d chars)\n", (n>=size)?n-size+1:0); + rpc->fault(ctx, 500, "Line too long"); + return -1; +} + + + +static int mi_rpc_rprint_all(rpc_t* rpc, void* ctx, struct mi_node *node, + enum mi_rpc_print_mode mode, int level) +{ char indent[32]; int i; char *p; - if(level*mi_rpc_indent.len>=32) - { - LM_ERR("too many recursive levels for indentation\n"); - return -1; - } p = indent; - for(i=0; i<level; i++) - { - memcpy(p, mi_rpc_indent.s, mi_rpc_indent.len); - p += mi_rpc_indent.len; + switch(mode){ + case MI_FIFO_PRINT: + case MI_DATAGRAM_PRINT: + case MI_PRETTY_PRINT: + if(level*mi_rpc_indent.len>=32) + { + LM_ERR("too many recursive levels for indentation\n"); + return -1; + } + for(i=0; i<level; i++) + { + memcpy(p, mi_rpc_indent.s, mi_rpc_indent.len); + p += mi_rpc_indent.len; + } + break; + case MI_XMLRPC_PRINT: + /* no identation in this mode */ + break; } *p = 0; for( ; node ; node=node->next ) { - rpc->printf(ctx, "%s+ %.*s:: %.*s", - indent, - node->name.len, (node->name.s)?node->name.s:"", - node->value.len, (node->value.s)?node->value.s:""); - - for( attr=node->attributes ; attr!=NULL ; attr=attr->next ) { - rpc->printf(ctx, "%s%.*s - %.*s=%.*s", - indent, mi_rpc_indent.len, mi_rpc_indent.s, - attr->name.len, (attr->name.s)?attr->name.s:"", - attr->value.len, (attr->value.s)?attr->value.s:""); - } - + if (mi_rpc_print_node(rpc, ctx, node, mode, p)<0) + return -1; if (node->kids) { - if (mi_rpc_rprint_node(rpc, ctx, node->kids, level+1)<0) + if (mi_rpc_rprint_all(rpc, ctx, node->kids, mode, level+1)<0) return -1; } } return 0; } -static int mi_rpc_print_tree(rpc_t* rpc, void* ctx, struct mi_root *tree) + + +/** build an rpc reply from an mi tree. + * @param mode - how to build the reply: mi_fifo like, mi_datagram_like, + * mi_xmlrpc ... + * @return -1 on error, 0 on success + */ +static int mi_rpc_print_tree(rpc_t* rpc, void* ctx, struct mi_root *tree, + enum mi_rpc_print_mode mode) { - rpc->printf(ctx, "%d %.*s\n", tree->code, - tree->reason.len, tree->reason.s); + switch(mode){ + case MI_FIFO_PRINT: + case MI_DATAGRAM_PRINT: + /* always success, code & reason are the part of the reply */ + rpc->printf(ctx, "%d %.*s\n", tree->code, + tree->reason.len, tree->reason.s); + break; + case MI_PRETTY_PRINT: + case MI_XMLRPC_PRINT: + /* don't print code & reason, use fault instead */ + if (tree->code<200 || tree->code> 299) { + rpc->fault(ctx, tree->code, tree->reason.s); + return -1; + } + break; + } if (tree->node.kids) { - if (mi_rpc_rprint_node(rpc, ctx, tree->node.kids, 0)<0) + if (mi_rpc_rprint_all(rpc, ctx, tree->node.kids, mode, 0)<0) return -1; } + if (mode==MI_FIFO_PRINT){ + /* mi fifo adds an extra "\n" at the end */ + rpc->printf(ctx, "\n"); + } return 0; } -static void rpc_mi_exec(rpc_t *rpc, void *ctx) +static void rpc_mi_exec(rpc_t *rpc, void *ctx, enum mi_rpc_print_mode mode) { str cmd; struct mi_cmd *mic; @@ -215,7 +307,7 @@ static void rpc_mi_exec(rpc_t *rpc, void *ctx) if (mi_rpl!=MI_ROOT_ASYNC_RPL) { - mi_rpc_print_tree(rpc, ctx, mi_rpl); + mi_rpc_print_tree(rpc, ctx, mi_rpl, mode); free_mi_tree(mi_rpl); if (mi_req) free_mi_tree(mi_req); return; @@ -226,3 +318,31 @@ static void rpc_mi_exec(rpc_t *rpc, void *ctx) if (mi_req) free_mi_tree(mi_req); return; } + + + +static void rpc_mi_pretty_exec(rpc_t* rpc, void* c) +{ + rpc_mi_exec(rpc, c, MI_PRETTY_PRINT); +} + + + +static void rpc_mi_fifo_exec(rpc_t* rpc, void* c) +{ + rpc_mi_exec(rpc, c, MI_FIFO_PRINT); +} + + + +static void rpc_mi_dg_exec(rpc_t* rpc, void* c) +{ + rpc_mi_exec(rpc, c, MI_DATAGRAM_PRINT); +} + + + +static void rpc_mi_xmlrpc_exec(rpc_t* rpc, void* c) +{ + rpc_mi_exec(rpc, c, MI_XMLRPC_PRINT); +}

14 years, 11 months

git:master: sercmd: updated to the new mi_rpc format

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ad12d90508ef5f896ef0327362971cd9afba81f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad12d90… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 13 22:40:33 2009 +0200 sercmd: updated to the new mi_rpc format - updated to the new mi output format - support for tab completion for mi_dg, mi_fifo and mi_xmlrpc --- utils/sercmd/sercmd.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 0c26d9e..9c9edf0 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -314,6 +314,9 @@ char* complete_params_cfg_var[]={ /* commands for which we complete the first param with an mi command*/ char* complete_params_mi[]={ "mi", + "mi_fifo", + "mi_dg", + "mi_xmlrpc", 0 }; #endif /* USE_MI */ @@ -1423,10 +1426,10 @@ static int get_mi_list(int s) for (r=0; r<mi_which_no; r++){ if (mi_which_array[r].type!=BINRPC_T_STR) continue; - /* we are interestend only in lines starting with '+', e.g.: - + :: version */ + /* we are interestend only in lines starting with ':', e.g.: + :: version */ if ((mi_which_array[r].u.strval.len) && - (mi_which_array[r].u.strval.s[0]=='+')) + (mi_which_array[r].u.strval.s[0]==':')) mi_which_results++; } /* no mi commands */ @@ -1442,29 +1445,26 @@ static int get_mi_list(int s) continue; p=mi_which_array[r].u.strval.s; end=p+mi_which_array[r].u.strval.len; - /* we are interestend only in lines starting with '+', e.g.: - + :: version */ - if ((p>=end) || (*p!='+')) + /* we are interestend only in lines starting with ':', e.g.: + :: version */ + if ((p>=end) || (*p!=':')) continue; p++; - /* skip over to the first ':' */ - for(;p<end && *p!=':'; p++); - if (p>=end) continue; - p++; /* skip over to the next ':' */ for(;p<end && *p!=':'; p++); if (p>=end) continue; p++; /* skip over spaces */ for(;p<end && (*p==' ' || *p=='\t'); p++); - if (p>=end) continue; + if (p>=end || *p=='\n') continue; if (mi_cmds_no >= mi_which_results){ fprintf(stderr, "BUG: wrong mi cmds no (%d >= %d)\n", mi_cmds_no, mi_which_results); goto error; } mi_name.s=p; - mi_name.len=(int)(long)(end-p); + for(; p<end && *p!=' ' && *p!='\t' && *p!='\n'; p++); + mi_name.len=(int)(long)(p-mi_name.s); mi_cmds[mi_cmds_no]=mi_name; mi_cmds_no++; }

14 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2009