sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

git:master: kmi: added missing file mi_mem.h

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d803b87b0f2ecf8da3954c28ad8af72000e862ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d803b87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 29 17:54:26 2009 +0200 kmi: added missing file mi_mem.h --- lib/kmi/mi_mem.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/lib/kmi/mi_mem.h b/lib/kmi/mi_mem.h new file mode 100644 index 0000000..b1151f6 --- /dev/null +++ b/lib/kmi/mi_mem.h @@ -0,0 +1,49 @@ +/* + * $Id$ + * + * Copyright (C) 2009 Daniel-Constantin Mierla + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +/*! + * \file + * \brief MI_MEM :: MI Memory Management + * \ingroup mi + */ + + +#ifndef _MI_MEM_H_ +#define _MI_MEM_H_ + +#include "../../mem/shm_mem.h" + +#ifdef MI_SYSTEM_MALLOC +#include <stdlib.h> +#define mi_malloc malloc +#define mi_realloc realloc +#define mi_free free +#else +#include "../../mem/mem.h" +#define mi_malloc pkg_malloc +#define mi_realloc pkg_realloc +#define mi_free pkg_free +#endif + +#endif +

14 years, 10 months

Build problems

by Klaus Darilion

Hi! I justed cloned the repository and executed "make", which fails when linking: gcc -Wl,-O2 -Wl,-E action.o atomic_ops.o basex.o bit_scan.o cfg_core.o cfg_parser.o core_cmd.o crc.o daemonize.o data_lump.o data_lump_rpl.o dns_cache.o dprint.o dset.o dst_blacklist.o endianness.o error.o flags.o ... parser/sdp/sdp_helpr_funcs.o rand/fastrand.o rand/isaac/rand.o cfg/cfg.o cfg/cfg_ctx.o cfg/cfg_script.o cfg/cfg_select.o cfg/cfg_struct.o lex.yy.o cfg.tab.o -ldl -lresolv -o ser cfg.tab.o: In function `yyparse': /home/darilion/software/siprouter/sip-router/cfg.tab.c:4478: multiple definition of `yyparse' y.tab.o:/home/darilion/software/siprouter/sip-router/y.tab.c:4527: first defined here collect2: ld returned 1 exit status make: *** [ser] Error 1 any hints? thanks klaus

14 years, 10 months

[ openser-Bugs-2813924 ] nathelper crash

by SourceForge.net

Bugs item #2813924, was opened at 2009-06-29 13:55 Message generated for change (Tracker Item Submitted) made by marcushunger You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2813924&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Marcus Hunger (marcushunger) Assigned to: Nobody/Anonymous (nobody) Summary: nathelper crash Initial Comment: publishing very long payload-type to the rtp-proxy overflows a buffer. see nathelper.c +2758. v[1].iov_len must be smaller than sizeof(opts) ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2813924&group_…

14 years, 10 months

git:master: lib/kmi: option to build it with system malloc

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 85f2302e8448ee20edb12bc3b4e2911ca3b111ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85f2302… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 29 12:34:08 2009 +0200 lib/kmi: option to build it with system malloc - MI lib can be built independently of core with system malloc for pkg memory (see Makefile) --- lib/kmi/Makefile | 2 ++ lib/kmi/attr.c | 6 +++--- lib/kmi/fmt.c | 4 ++-- lib/kmi/mi.c | 4 ++-- lib/kmi/tree.c | 11 +++++------ 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/kmi/Makefile b/lib/kmi/Makefile index 9a70acf..a20f006 100644 --- a/lib/kmi/Makefile +++ b/lib/kmi/Makefile @@ -4,6 +4,8 @@ NAME:=kmi MAJOR_VER=1 MINOR_VER=0 BUGFIX_VER=0 +## uncomment next line for using system malloc with MI +#DEFS+= -DMI_SYSTEM_MALLOC LIBS= include ../../Makefile.libs diff --git a/lib/kmi/attr.c b/lib/kmi/attr.c index 1f254d0..4a1b81b 100644 --- a/lib/kmi/attr.c +++ b/lib/kmi/attr.c @@ -36,8 +36,8 @@ #include <string.h> #include <errno.h> -#include "../../mem/mem.h" #include "../../dprint.h" +#include "mi_mem.h" #include "attr.h" #include "fmt.h" @@ -75,7 +75,7 @@ struct mi_attr *add_mi_attr(struct mi_node *node, int flags, size_mem += value_len; } - new = (struct mi_attr *)pkg_malloc(size_mem); + new = (struct mi_attr *)mi_malloc(size_mem); if (!new) { LM_ERR("no more pkg mem (%d)\n",size_mem); return NULL; @@ -167,7 +167,7 @@ void del_mi_attr_list(struct mi_node *node) for(head = node->attributes; head ;){ p = head->next; - pkg_free(head); + mi_free(head); head = p; } diff --git a/lib/kmi/fmt.c b/lib/kmi/fmt.c index 81ca917..a3b8b8f 100644 --- a/lib/kmi/fmt.c +++ b/lib/kmi/fmt.c @@ -34,7 +34,7 @@ #include <string.h> #include "../../dprint.h" -#include "../../mem/mem.h" +#include "mi_mem.h" char *mi_fmt_buf = 0; int mi_fmt_buf_len = 0; @@ -42,7 +42,7 @@ int mi_fmt_buf_len = 0; int mi_fmt_init( unsigned int size ) { - mi_fmt_buf = (char*)pkg_malloc(size); + mi_fmt_buf = (char*)mi_malloc(size); if (mi_fmt_buf==NULL) { LM_ERR("no more pkg mem\n"); return -1; diff --git a/lib/kmi/mi.c b/lib/kmi/mi.c index 6dfa709..dfa458e 100644 --- a/lib/kmi/mi.c +++ b/lib/kmi/mi.c @@ -46,7 +46,7 @@ #include <string.h> #include "../../dprint.h" -#include "../../mem/mem.h" +#include "mi_mem.h" #include "mi.h" static struct mi_cmd* mi_cmds = 0; @@ -138,7 +138,7 @@ int register_mi_cmd( mi_cmd_f f, char *name, void *param, return -1; } - cmds = (struct mi_cmd*)pkg_realloc( mi_cmds, + cmds = (struct mi_cmd*)mi_realloc( mi_cmds, (mi_cmds_no+1)*sizeof(struct mi_cmd) ); if (cmds==0) { LM_ERR("no more pkg memory\n"); diff --git a/lib/kmi/tree.c b/lib/kmi/tree.c index 4ca6578..da29fea 100644 --- a/lib/kmi/tree.c +++ b/lib/kmi/tree.c @@ -34,9 +34,8 @@ #include <string.h> #include <stdio.h> #include <errno.h> -#include "../../mem/mem.h" -#include "../../mem/shm_mem.h" #include "../../dprint.h" +#include "mi_mem.h" #include "tree.h" #include "fmt.h" @@ -50,7 +49,7 @@ struct mi_root *init_mi_tree(unsigned int code, char *reason, int reason_len) if (use_shm) root = (struct mi_root *)shm_malloc(sizeof(struct mi_root)); else - root = (struct mi_root *)pkg_malloc(sizeof(struct mi_root)); + root = (struct mi_root *)mi_malloc(sizeof(struct mi_root)); if (!root) { LM_ERR("no more pkg mem\n"); return NULL; @@ -83,7 +82,7 @@ static void free_mi_node(struct mi_node *parent) shm_free(parent); } else { del_mi_attr_list(parent); - pkg_free(parent); + mi_free(parent); } } @@ -100,7 +99,7 @@ void free_mi_tree(struct mi_root *parent) if (use_shm) shm_free(parent); else - pkg_free(parent); + mi_free(parent); } @@ -135,7 +134,7 @@ static inline struct mi_node *create_mi_node(char *name, int name_len, if (use_shm) new = (struct mi_node *)shm_malloc(size_mem); else - new = (struct mi_node *)pkg_malloc(size_mem); + new = (struct mi_node *)mi_malloc(size_mem); if(!new) { LM_ERR("no more pkg mem\n"); return NULL;

14 years, 10 months

git:master: tmx: t_hash MI command fixes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5caeeb1266d5541bfe0437dcefba3d96d4ee03eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5caeeb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 29 12:32:17 2009 +0200 tmx: t_hash MI command fixes - return 500 if TM_HASH_STATS is not defined - print only nodes corresponding to entries that have cur_entries or acc_entries != 0, otherwise is a huge list (2^16) of useless values --- modules_k/tmx/t_mi.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index 89f2270..4c73a54 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -688,12 +688,13 @@ struct mi_root* mi_tm_cancel(struct mi_root* cmd_tree, void* param) */ struct mi_root* mi_tm_hash(struct mi_root* cmd_tree, void* param) { +#ifndef TM_HASH_STATS + return init_mi_tree( 500, "No TM hash stats", 16); +#else struct mi_root* rpl_tree= NULL; struct mi_node* rpl; struct mi_node* node; -#ifdef TM_HASH_STATS struct mi_attr* attr; -#endif struct s_table* tm_t; char *p; int i; @@ -706,12 +707,15 @@ struct mi_root* mi_tm_hash(struct mi_root* cmd_tree, void* param) tm_t = get_tm_table(); for (i=0; i<TABLE_ENTRIES; i++) { + if(tm_t->entries[i].cur_entries==0 + && tm_t->entries[i].acc_entries==0) + continue; + p = int2str((unsigned long)i, &len ); node = add_mi_node_child(rpl, MI_DUP_VALUE , 0, 0, p, len); if(node == NULL) goto error; -#ifdef TM_HASH_STATS p = int2str((unsigned long)tm_t->entries[i].cur_entries, &len ); attr = add_mi_attr(node, MI_DUP_VALUE, "Current", 7, p, len ); if(attr == NULL) @@ -721,13 +725,13 @@ struct mi_root* mi_tm_hash(struct mi_root* cmd_tree, void* param) attr = add_mi_attr(node, MI_DUP_VALUE, "Total", 5, p, len ); if(attr == NULL) goto error; -#endif } return rpl_tree; error: free_mi_tree(rpl_tree); return init_mi_tree( 500, MI_INTERNAL_ERR_S, MI_INTERNAL_ERR_LEN); +#endif }

14 years, 10 months

[ openser-Bugs-1545216 ] Diversion header(s) parsing

by SourceForge.net

Bugs item #1545216, was opened at 2006-08-23 13:16 Message generated for change (Comment added) made by sjmuller You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=1545216&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: core Group: ver devel Status: Open Resolution: None Priority: 3 Private: No Submitted By: Bogdan-Andrei Iancu (bogdan_iancu) Assigned to: Nobody/Anonymous (nobody) Summary: Diversion header(s) parsing Initial Comment: The current implementation of the parse_diversion() header parses only the first diversion header (even if more than one header can be present). Also the function cannot cope with multiple URIs (comma separated) in the body of the same header since internally it is using the parse_to() function that expects only one URI. ---------------------------------------------------------------------- Comment By: Sam J. M. (sjmuller) Date: 2009-06-29 11:45 Message: Yep it's still a problem. I'm using kamailio v.1.4.4 and it causes some disagreement with many pstn gateways in my architecture. . Suffixes entered in parameters'module does not apply. . Parsing is not working. ** kamailio logs : Jun 29 11:33:00 ser0 kamailio[1469]: -CFU------------------------------------- Jun 29 11:33:00 ser0 kamailio[1469]: -> call forwarding unconditional found to 0183659999 Jun 29 11:33:00 ser0 kamailio[1469]: DBG:avpops:ops_delete_avp: 1 avps were removed Jun 29 11:33:00 ser0 kamailio[1469]: DBG:avpops:ops_pushto_avp: 1 avps were processed Jun 29 11:33:00 ser0 kamailio[1469]: -CFU-ACC--------------------------------- Jun 29 11:33:00 ser0 kamailio[1469]: DBG:avpops:ops_delete_avp: 1 avps were removed Jun 29 11:33:00 ser0 kamailio[1469]: -> acc state: cfu Jun 29 11:33:00 ser0 kamailio[1469]: -> CFU rewrited, search new contact right now Jun 29 11:33:00 ser0 kamailio[1469]: callee_cli=0183659999 callee_fwd=0183659996 callee_cfu=0183659999 rU=0183659999 caller_cli=0170645720 Jun 29 11:33:00 ser0 kamailio[1469]: -> append the diversion header Jun 29 11:33:00 ser0 kamailio[1469]: DBG:core:parse_headers: flags=40000000 Jun 29 11:33:00 ser0 kamailio[1469]: DBG:core:parse_headers: flags=40000000 Jun 29 11:33:00 ser0 kamailio[1469]: DBG:core:pv_get_diversion: no Diversion header Jun 29 11:33:00 ser0 kamailio[1469]: DBG:core:parse_headers: flags=40000000 Jun 29 11:33:00 ser0 kamailio[1469]: DBG:core:pv_get_diversion: no Diversion header Jun 29 11:33:00 ser0 kamailio[1469]: DBG:core:parse_headers: flags=40000000 Jun 29 11:33:00 ser0 kamailio[1469]: DBG:core:pv_get_diversion: no Diversion header Jun 29 11:33:00 ser0 kamailio[1469]: -> div uri=<null> - div privacy=<null> - div reason=<null> ** sip trace : U 2009/06/29 11:33:00.856070 77.246.81.132:5060 -> 77.246.81.140:5060 INVITE sip:0183659999@77.246.81.140:5060;transport=udp SIP/2.0. Record-Route: <sip:77.246.81.132;lr=on;ftag=166b2b53fb3fb285o0;nat=yes;did=aa7.f5133295>. Via: SIP/2.0/UDP 77.246.81.132;branch=z9hG4bKf2b2.0950c4d5.0. Via: SIP/2.0/UDP 192.168.100.12:5060;rport=5060;received=82.229.235.185;branch=z9hG4bK-e21913cd. From: "0170645720" <sip:0170645720@sip.720.fr>;tag=166b2b53fb3fb285o0. To: <sip:0183659996@sip.720.fr>. Call-ID: f7e91deb-236ca0cd(a)192.168.100.12. CSeq: 102 INVITE. Max-Forwards: 49. Contact: "0170645720" <sip:0170645720@82.229.235.185:5060>. Expires: 240. User-Agent: Linksys/SPA942-6.1.3(a). Content-Length: 298. Allow: ACK, BYE, CANCEL, INFO, INVITE, NOTIFY, OPTIONS, PRACK, REFER. Supported: 100rel, replaces. Content-Type: application/sdp. Diversion: <sip:0183659996@sip.720.fr>;reason=unconditional. Privacy: none. Remote-Party-ID: 0170645720 <sip:0170645720@82.229.235.185>;party=calling;privacy=off;screen=yes. P-Asserted-Identity: "0170645720" <sip:0170645720@sip.720.fr>. Session-Expires: 120. . v=0. o=- 92989 92989 IN IP4 192.168.100.12. s=-. c=IN IP4 77.246.81.133. t=0 0. m=audio 36164 RTP/AVP 18 8 0 101. a=rtpmap:18 G729a/8000. a=fmtp:18 annexb=yes. a=rtpmap:8 PCMA/8000. a=rtpmap:0 PCMU/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-15. a=ptime:20. a=sendrecv. a=nortpproxy:yes. ** related code : loadmodule "diversion.so" modparam("diversion", "suffix", ";privacy=none;counter=1") ... if (!search("Diversion:.*")) { xlog("L_INFO", "-> append the diversion header"); add_diversion("unconditional"); } else { xlog("L_INFO", "-> Diversion header already found, forbidden to forward one more time"); sl_send_reply("403", "Forbidden"); exit; } # diversion control xlog("L_INFO", "-> div uri=$di - div privacy=$dip - div reason=$dir"); # return at the beginning of the callee searching route(3); exit; } ---------------------------------------------------------------------- Comment By: Henning Westerholt (henningw) Date: 2008-11-11 16:04 Message: This bug is now more then two years old. Is this still a problem? Henning ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=1545216&group_…

14 years, 10 months

git:master: sercmd: tab completion support for cfg. vars & groups

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 72a573889c0126fedee20e80ff0fb5cf9f772a49 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72a5738… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 29 00:59:17 2009 +0200 sercmd: tab completion support for cfg. vars & groups - tab completion is now supported for cfg. groups and variables parameters for the following rpc commands: cfg.help, cfg,get, cfg.set_now_int, cfg.set_now_string, cfg.set_delayed_int, cfg.set_delayed_int. E.g.: sercmd> cfg.help t<TAB> tcp tm sercmd> cfg.help tm fr_<TAB> fr_inv_timer fr_timer sercmd> cfg.help tm fr_i<TAB> sercmd> cfg.help tm fr_inv_timer - tab completion fixed when spaces are in front of the command name (e.g. sercmd> wh<TAB> works now). --- utils/sercmd/Makefile | 2 +- utils/sercmd/sercmd.c | 444 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 390 insertions(+), 56 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=72a…

14 years, 10 months

git:master: sercmd: tab completion support for mi commands

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 17ce4b4f36122b515efc7d62f70b55cb0cb17675 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17ce4b4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 29 11:03:46 2009 +0200 sercmd: tab completion support for mi commands - tab completion is now supported for mi commands. E.g.: sercmd> mi p<TAB><TAB> ps pwd sercmd> mi pw<TAB> sercmd> mi pwd --- utils/sercmd/sercmd.c | 259 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 248 insertions(+), 11 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 1c41daf..0c26d9e 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -31,6 +31,7 @@ * -------- * 2006-02-14 created by andrei * 2009-06-29 command line completion for cfg groups and vars (andrei) + * 2009-06-30 command line completion for mi cmds (andrei) */ @@ -51,7 +52,8 @@ #include <readline/readline.h> #include <readline/history.h> -#define USE_CFG_VARS +#define USE_CFG_VARS /* cfg group and vars completion */ +#define USE_MI /* mi completion */ #endif #include "parse_listen_id.h" @@ -127,7 +129,6 @@ int rpc_no=0; #ifdef USE_CFG_VARS - struct binrpc_val* cfg_vars_array; int cfg_vars_no; @@ -142,6 +143,13 @@ struct cfg_var_grp* cfg_grp_lst; /** cfg groups list, allong with var names*/ struct cfg_var_grp* crt_cfg_grp; #endif /* USE_CFG_VARS */ +#ifdef USE_MI +struct binrpc_val* mi_which_array; +int mi_which_no; + +str* mi_cmds; +int mi_cmds_no; +#endif /* USE_MI */ @@ -262,12 +270,16 @@ static struct sercmd_builtin builtins[]={ #ifdef USE_READLINE enum complete_states { - COMPLETE_NOTHING, + COMPLETE_INIT, COMPLETE_CMD_NAME, #ifdef USE_CFG_VARS COMPLETE_CFG_GRP, - COMPLETE_CFG_VAR + COMPLETE_CFG_VAR, #endif /* USE_CFG_VARS */ +#ifdef USE_MI + COMPLETE_MI, +#endif /* USE_Mi */ + COMPLETE_NOTHING }; /* instead of rl_attempted_completion_over which is not present in @@ -298,6 +310,14 @@ char* complete_params_cfg_var[]={ }; #endif /* USE_CFG_VARS */ +#ifdef USE_MI +/* commands for which we complete the first param with an mi command*/ +char* complete_params_mi[]={ + "mi", + 0 +}; +#endif /* USE_MI */ + #endif /* USE_READLINE */ @@ -1155,7 +1175,7 @@ static int get_sercmd_list(int s) } break; case BINRPC_REPL: - rpc_no=10; /* default cmd list */ + rpc_no=100; /* default cmd list */ if ((rpc_array=parse_reply_body(&rpc_no, &in_pkt, msg_body, in_pkt.tlen))==0) goto error; @@ -1173,6 +1193,30 @@ error: +#if defined(USE_CFG_VARS) || defined (USE_MI) +/** check if cmd is a rpc command. + * Quick check (using the internal rpc_array) if cmd is a valid rpc command. + * @param cmd - null terminated ascii string + * @return 1 on success, 0 on failure. + */ +static int is_rpc_cmd(char* cmd) +{ + int r; + int cmd_len; + + cmd_len=strlen(cmd); + for (r=0; r<rpc_no; r++){ + if ((rpc_array[r].type==BINRPC_T_STR) && + (rpc_array[r].u.strval.len==cmd_len) && + (strncmp(cmd, rpc_array[r].u.strval.s, cmd_len)==0)) + return 1; + } + return 0; +} +#endif /* USE_CFG_VARS || USE_MI */ + + + #ifdef USE_CFG_VARS /* retrieve the cfg vars and group list */ static int get_cfgvars_list(int s) @@ -1193,6 +1237,7 @@ static int get_cfgvars_list(int s) cmd.method="cfg.list"; cmd.argc=0; + if (!is_rpc_cmd(cmd.method)) goto error; cookie=gen_cookie(); if ((ret=send_binrpc_cmd(s, &cmd, cookie))<0){ @@ -1321,6 +1366,132 @@ void free_cfg_grp_lst() +#ifdef USE_MI +/* retrieve the mi list */ +static int get_mi_list(int s) +{ + struct binrpc_cmd cmd; + int cookie; + unsigned char reply_buf[MAX_REPLY_SIZE]; + unsigned char* msg_body; + struct binrpc_parse_ctx in_pkt; + char* p; + char* end; + str mi_name; + int mi_which_results; + int r; + int ret; + + cmd.method="mi"; + cmd.argv[0].type=BINRPC_T_STR; + cmd.argv[0].u.strval.s="which"; + cmd.argv[0].u.strval.len=strlen(cmd.argv[0].u.strval.s); + cmd.argc=1; + if (!is_rpc_cmd(cmd.method)) goto error; + + cookie=gen_cookie(); + if ((ret=send_binrpc_cmd(s, &cmd, cookie))<0){ + if (ret==-1) goto error_send; + else goto binrpc_err; + } + /* read reply */ + memset(&in_pkt, 0, sizeof(in_pkt)); + if ((ret=get_reply(s, reply_buf, MAX_REPLY_SIZE, cookie, &in_pkt, + &msg_body))<0){ + goto error; + } + switch(in_pkt.type){ + case BINRPC_FAULT: + if (print_fault(&in_pkt, msg_body, in_pkt.tlen)<0){ + goto error; + } + break; + case BINRPC_REPL: + mi_which_no=25; /* default rpc list */ + if ((mi_which_array=parse_reply_body(&mi_which_no, &in_pkt, + msg_body, in_pkt.tlen))==0) + goto error; + break; + default: + fprintf(stderr, "ERROR: not a reply\n"); + goto error; + } + + + /* get the mi commands number */ + mi_which_results=0; + 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 */ + if ((mi_which_array[r].u.strval.len) && + (mi_which_array[r].u.strval.s[0]=='+')) + mi_which_results++; + } + /* no mi commands */ + if (mi_which_results==0) + goto error; + /* alloc the mi_cmds array */ + mi_cmds=malloc(mi_which_results*sizeof(*mi_cmds)); + if (mi_cmds==0) goto error_mem; + memset(mi_cmds, 0, mi_which_results* sizeof(mi_cmds)); + /* get the mi names list */ + for (r=0; r<mi_which_no; r++){ + if (mi_which_array[r].type!=BINRPC_T_STR) + 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!='+')) + 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 (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); + mi_cmds[mi_cmds_no]=mi_name; + mi_cmds_no++; + } + + return 0; +binrpc_err: +error_send: +error: +error_mem: + return -1; +} + + + +void free_mi_cmds() +{ + if (mi_cmds){ + free(mi_cmds); + mi_cmds=0; + mi_cmds_no=0; + } +} +#endif /* USE_MI */ + + + + static void print_formatting(char* prefix, char* format, char* suffix) { if (format){ @@ -1441,6 +1612,7 @@ static char* sercmd_generator(const char* text, int state) static struct cfg_var_grp* grp; #endif switch(attempted_completion_state){ + case COMPLETE_INIT: case COMPLETE_NOTHING: return 0; case COMPLETE_CMD_NAME: @@ -1527,6 +1699,29 @@ static char* sercmd_generator(const char* text, int state) } break; #endif /* USE_CFG_VARS */ +#ifdef USE_MI + case COMPLETE_MI: + if (state==0){ + /* init */ + len=strlen(text); + idx=0; + } + while(idx < mi_cmds_no){ + if (len<=mi_cmds[idx].len && + memcmp(text, mi_cmds[idx].s, len)==0) { + /* zero-term copy of the var name */ + name=malloc(mi_cmds[idx].len+1); + if (name){ + memcpy(name, mi_cmds[idx].s, mi_cmds[idx].len); + name[mi_cmds[idx].len]=0; + } + idx++; + return name; + } + idx++; + } + break; +#endif /* USE_MI */ } /* no matches */ return 0; @@ -1594,6 +1789,20 @@ char** sercmd_completion(const char* text, int start, int end) goto end; } } +#endif /* USE_CFG_VARS */ +#ifdef USE_MI + /* try complete_parms_mi */ + for(i=0; complete_params_mi[i]; i++){ + if ((cmd_len==strlen(complete_params_mi[i])) && + (strncmp(&rl_line_buffer[cmd_start], + complete_params_mi[i], + cmd_len)==0)){ + attempted_completion_state=COMPLETE_MI; + goto end; + } + } +#endif /* USE_MI */ +#ifdef USE_CFG_VARS }else if (crt_param_no==2){ if (attempted_completion_state!=COMPLETE_CFG_GRP){ for(i=0; complete_params_cfg_var[i]; i++){ @@ -1789,10 +1998,14 @@ int main(int argc, char** argv) goto end; } /* interactive mode */ - get_sercmd_list(s); -#ifdef USE_CFG_VARS - get_cfgvars_list(s); -#endif /* USE_CFG_VARS */ + if (get_sercmd_list(s)==0){ + #ifdef USE_CFG_VARS + get_cfgvars_list(s); + #endif /* USE_CFG_VARS */ + #ifdef USE_MI + get_mi_list(s); + #endif /* USE_MI */ + } /* banners */ printf("%s %s\n", NAME, VERSION); printf("%s\n", COPYRIGHT); @@ -1845,9 +2058,21 @@ end: #ifdef USE_CFG_VARS if (cfg_grp_lst) free_cfg_grp_lst(); - if (cfg_vars_array) + if (cfg_vars_array){ free_rpc_array(cfg_vars_array, cfg_vars_no); + cfg_vars_array=0; + cfg_vars_no=0; + } #endif /* USE_CFG_VARS */ +#ifdef USE_MI + if (mi_cmds) + free_mi_cmds(); + if (mi_which_array){ + free_rpc_array(mi_which_array, mi_which_no); + mi_which_array=0; + mi_which_no=0; + } +#endif /* USE_MI */ cleanup(); exit(0); error: @@ -1860,9 +2085,21 @@ error: #ifdef USE_CFG_VARS if (cfg_grp_lst) free_cfg_grp_lst(); - if (cfg_vars_array) + if (cfg_vars_array){ free_rpc_array(cfg_vars_array, cfg_vars_no); + cfg_vars_array=0; + cfg_vars_no=0; + } #endif /* USE_CFG_VARS */ +#ifdef USE_MI + if (mi_cmds) + free_mi_cmds(); + if (mi_which_array){ + free_rpc_array(mi_which_array, mi_which_no); + mi_which_array=0; + mi_which_no=0; + } +#endif /* USE_MI */ cleanup(); exit(-1); }

14 years, 10 months

git:master: ctl: '*' optional scan modifier

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 13d7e923c4bb9b9a58371deb81727d2a10d13ef8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13d7e92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jun 28 12:28:41 2009 +0200 ctl: '*' optional scan modifier - '*' can be used in rpc scan to mark the start of optional parameter reading - example: 'Sd*Sb' - mandatory str, mandatory int, optional str, optional bool - if optinal modifier is used, then scan does not call rpc_fault, so execution of rpc command can continue - to be used by rpc command 'mi' - execute K MI commands --- modules_s/ctl/binrpc_run.c | 8 +++++++- modules_s/ctl/fifo_server.c | 17 +++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/modules_s/ctl/binrpc_run.c b/modules_s/ctl/binrpc_run.c index 13c41c4..fa371ef 100644 --- a/modules_s/ctl/binrpc_run.c +++ b/modules_s/ctl/binrpc_run.c @@ -593,11 +593,16 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) struct binrpc_val v; int err; char* orig_fmt; + int nofault; va_start(ap, fmt); orig_fmt=fmt; + nofault = 0; for (;*fmt; fmt++){ switch(*fmt){ + case '*': /* start of optional parameters */ + nofault = 1; + break; case 'b': /* bool */ case 't': /* time */ case 'd': /* int */ @@ -649,7 +654,8 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) va_end(ap); return (int)(fmt-orig_fmt); error_read: - rpc_fault(ctx, 400, "error at parameter %d: expected %s type but" + if(nofault==0) + rpc_fault(ctx, 400, "error at parameter %d: expected %s type but" " %s", ctx->in.record_no, rpc_type_name(v.type), binrpc_error(err)); /* diff --git a/modules_s/ctl/fifo_server.c b/modules_s/ctl/fifo_server.c index b625313..9ad267a 100644 --- a/modules_s/ctl/fifo_server.c +++ b/modules_s/ctl/fifo_server.c @@ -1346,10 +1346,12 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) void** void_ptr; int read; str line; + int nofault; va_list ap; va_start(ap, fmt); + nofault = 0; read = 0; while(*fmt) { if (read_line(&line.s, &line.len, &ctx->read_h) < 0) { @@ -1359,11 +1361,15 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) ctx->line_no++; switch(*fmt) { + case '*': /* start of optional parameters */ + nofault = 1; + break; case 'b': /* Bool */ case 't': /* Date and time */ case 'd': /* Integer */ if (!line.len) { - rpc_fault(ctx, 400, "Invalid parameter value on line %d", + if(nofault==0) + rpc_fault(ctx, 400, "Invalid parameter value on line %d", ctx->line_no); goto error; } @@ -1373,7 +1379,8 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) case 'f': /* double */ if (!line.len) { - rpc_fault(ctx, 400, "Invalid parameter value on line %d", + if(nofault==0) + rpc_fault(ctx, 400, "Invalid parameter value on line %d", ctx->line_no); goto error; } @@ -1385,8 +1392,10 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) case 'S': /* str structure */ l = new_chunk_unescape(&line); if (!l) { - rpc_fault(ctx, 500, "Internal Server Error"); - ERR("Not enough memory\n"); + if(nofault==0) { + rpc_fault(ctx, 500, "Internal Server Error"); + ERR("Not enough memory\n"); + } goto error; } /* Make sure it gets released at the end */

14 years, 10 months

git:master: Merge commit 'origin/ser_core_cvs'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 282a314fca125783803ac67dc926519fb2ecb8df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=282a314… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Jun 28 11:52:24 2009 +0200 Merge commit 'origin/ser_core_cvs' * commit 'origin/ser_core_cvs': core: compile io_wait support even if -DUSE_TCP is not set tcp: compile fix if -DUSE_TCP is not defined sctp: compile fix if -DUSE_SCTP is not defined ---

14 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009