sr-dev

sr-dev@lists.kamailio.org

15 participants
44233 discussions

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 */

15 years, 6 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 ---

15 years, 6 months

git:ser_core_cvs: sctp: compile fix if -DUSE_SCTP is not defined

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 650b96b5764db2196e2afeaf49bd7ff34fea72e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=650b96b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Jun 28 09:22:38 2009 +0000 sctp: compile fix if -DUSE_SCTP is not defined If -DUSE_SCTP is not defined don't try to use sctp library includes. --- sctp_options.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sctp_options.c b/sctp_options.c index e14d3ef..b6d7e36 100644 --- a/sctp_options.c +++ b/sctp_options.c @@ -27,11 +27,13 @@ #include <string.h> #include <sys/types.h> +#ifdef USE_SCTP #include <sys/socket.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/sctp.h> +#endif /* USE_SCTP */ #include <errno.h> #include "sctp_options.h"

15 years, 6 months

git:ser_core_cvs: tcp: compile fix if -DUSE_TCP is not defined

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 2e8c0383eb7ac0d58ecb34e53a261e52b7b2edd3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e8c038… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Jun 28 09:23:02 2009 +0000 tcp: compile fix if -DUSE_TCP is not defined Don't try to use tcp_max_connections if tcp support is not compiled-in. --- tcp_options.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tcp_options.c b/tcp_options.c index 7b52536..55f7fd5 100644 --- a/tcp_options.c +++ b/tcp_options.c @@ -121,7 +121,11 @@ void init_tcp_options() tcp_default_cfg.connect_timeout_s=DEFAULT_TCP_CONNECT_TIMEOUT; tcp_default_cfg.send_timeout=S_TO_TICKS(DEFAULT_TCP_SEND_TIMEOUT); tcp_default_cfg.con_lifetime=S_TO_TICKS(DEFAULT_TCP_CONNECTION_LIFETIME_S); +#ifdef USE_TCP tcp_default_cfg.max_connections=tcp_max_connections; +#else /*USE_TCP*/ + tcp_default_cfg.max_connections=0; +#endif /*USE_TCP*/ #ifdef TCP_ASYNC tcp_default_cfg.async=1; tcp_default_cfg.tcpconn_wq_max=32*1024; /* 32 k */ @@ -224,11 +228,19 @@ static int fix_max_conns(void* cfg_h, str* gname, str* name, void** val) { int v; v=(int)(long)*val; +#ifdef USE_TCP if (v>tcp_max_connections){ INFO("cannot override hard tcp_max_connections limit, please" " restart and increase tcp_max_connections in the cfg.\n"); v=tcp_max_connections; } +#else /* USE_TCP */ + if (v){ + ERR("TCP support disabled at compile-time, tcp_max_connection is" + " hardwired to 0.\n"); + v=0; + } +#endif /*USE_TCP */ *val=(void*)(long)v; return 0; } @@ -325,7 +337,11 @@ void tcp_options_check() MAX_TCP_CON_LIFETIME); fix_timeout("tcp_connection_lifetime", &tcp_default_cfg.con_lifetime, MAX_TCP_CON_LIFETIME, MAX_TCP_CON_LIFETIME); +#ifdef USE_TCP tcp_default_cfg.max_connections=tcp_max_connections; +#else /* USE_TCP */ + tcp_default_cfg.max_connections=0; +#endif /* USE_TCP */ tcp_cfg_def_fix("rd_buf_size", (int*)&tcp_default_cfg.rd_buf_size); tcp_cfg_def_fix("wq_blk_size", (int*)&tcp_default_cfg.wq_blk_size); }

15 years, 6 months

git:ser_core_cvs: core: compile io_wait support even if -DUSE_TCP is not set

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: f836b647ba8ef0bff1f7041c4cc6c9d6e41abff7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f836b64… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Jun 28 09:23:12 2009 +0000 core: compile io_wait support even if -DUSE_TCP is not set io_wait is needed now also by the ctl module, so it should be compiled even if no tcp support is desired. Its compilation can be turned off if NO_IO_WAIT is defined (but in this case one must make sure so no other piece of code using it will be compiled). --- io_wait.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/io_wait.c b/io_wait.c index 7b53913..5adb8d2 100644 --- a/io_wait.c +++ b/io_wait.c @@ -29,7 +29,7 @@ -#ifdef USE_TCP /* for now it make sense only with tcp */ +#ifndef NO_IO_WAIT #ifdef HAVE_EPOLL #include <unistd.h> /* close() */ @@ -631,4 +631,4 @@ void destroy_io_wait(io_wait_h* h) -#endif +#endif /*ifndef NO_IO_WAIT */

15 years, 6 months

CVS:commitlog: sip_router io_wait.c

by Andrei Pelinescu-Onciul

andrei 2009/06/28 11:23:12 CEST SER CVS Repository Modified files: . io_wait.c Log: core: compile io_wait support even if -DUSE_TCP is not set io_wait is needed now also by the ctl module, so it should be compiled even if no tcp support is desired. Its compilation can be turned off if NO_IO_WAIT is defined (but in this case one must make sure so no other piece of code using it will be compiled). Revision Changes Path 1.13 +3 -3 sip_router/io_wait.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/io_wait.c.diff?r1=…

15 years, 6 months

CVS:commitlog: sip_router tcp_options.c

by Andrei Pelinescu-Onciul

andrei 2009/06/28 11:23:02 CEST SER CVS Repository Modified files: . tcp_options.c Log: tcp: compile fix if -DUSE_TCP is not defined Don't try to use tcp_max_connections if tcp support is not compiled-in. Revision Changes Path 1.17 +17 -1 sip_router/tcp_options.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/tcp_options.c.diff…

15 years, 6 months

CVS:commitlog: sip_router sctp_options.c

by Andrei Pelinescu-Onciul

andrei 2009/06/28 11:22:39 CEST SER CVS Repository Modified files: . sctp_options.c Log: sctp: compile fix if -DUSE_SCTP is not defined If -DUSE_SCTP is not defined don't try to use sctp library includes. Revision Changes Path 1.13 +3 -1 sip_router/sctp_options.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_options.c.dif…

15 years, 6 months

message à votre attention

by Cathy Steinberg

Bonjour, Bureau de design graphique, nous pouvons répondre à vos besoins en : - Edition : plaquettes, rapports annuels, newsletters, catalogues, livres... - Image : logos, papeterie, chartes graphiques - Signalétique : panneaux d'exposition, stands, kakemonos, signalétique interne et externe - Web : sites, newsletters etc.. J'aimerais beaucoup vous faire bénéficier de mes 20 années d’expérience et de mon amour pour mon métier. Les clients évoluent, l'image que votre plaquette véhicule doit le faire aussi. D’où la question que vous pouvez légitimement vous poser : Ma plaquette contribue-t-elle à améliorer le capital image de ma société ? Vous pouvez voir un certain nombre de réalisations sur les adresses suivantes : http://www.transylvanie.com http://www.transylvanie.com/email13.htm http://www.transylvanie.com/email14.htm Si vous désirez avoir davantage de détails sur nos méthodes, un avis sur une plaquette ou un logo existants, un devis, contactez-moi diretement au 01 30 40 81 50. Avec l'espoir de pouvoir très vite vous présenter tous les avantages que votre entreprise peut tirer de nos prestations, je vous prie de croire à ma cordiale considération. Cathy Steinberg Transylvanie Tél. 01 30 40 81 50 Fax 01 39 32 08 41 www.transylvanie.com Veuillez me retirer de votre liste de diffusion Message envoyé le 28/06/2009 à 05:48:37 à l'adresse devel(a)lists.kamailio.org

15 years, 6 months

git:master: kex: init uptime value for mi cmd

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 220f00d67cb8eac370aeb97b763f9236e0d3cb5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=220f00d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 27 23:05:13 2009 +0200 kex: init uptime value for mi cmd --- modules_k/kex/mi_core.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules_k/kex/mi_core.c b/modules_k/kex/mi_core.c index 9714d1f..7d9a09c 100644 --- a/modules_k/kex/mi_core.c +++ b/modules_k/kex/mi_core.c @@ -58,8 +58,8 @@ #define SVNREVISION "unknown" #endif -static time_t kmi_up_since; -static str kmi_up_since_ctime; +static time_t kmi_up_since = 0; +static str kmi_up_since_ctime = {0, 0}; static cfg_ctx_t *_kex_cfg_ctx = NULL; static int init_mi_uptime(void) @@ -382,5 +382,9 @@ int init_mi_core(void) return -1; } + if(init_mi_uptime()<0) { + return -1; + } + return 0; }

15 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev