sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

git:master: ctl(s): support for '.' and type autoconversion

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 07276eb9a1173b4e58d14aa82a7b81e5f2dca824 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07276eb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jul 15 22:39:20 2009 +0200 ctl(s): support for '.' and type autoconversion - support for the new '.' rpc->scan modifier (when used it turns auto-conversion on for the next input parameter, e.g.: rpc->scan(".s", &str)) - new module "autoconversion" module parameter that enables auto-conversion globally - fixed minor parameter number bug in binrpc faults, when the '*' modifier was used in rpc->scan() - added binrpc context garbage collection supports (needed to track memory allocation used in type conversions) --- modules_s/ctl/binrpc_run.c | 189 +++++++++++++++++++++++++++++++++++++++++--- modules_s/ctl/ctl.c | 5 + 2 files changed, 181 insertions(+), 13 deletions(-) diff --git a/modules_s/ctl/binrpc_run.c b/modules_s/ctl/binrpc_run.c index 0fac504..aa50e8a 100644 --- a/modules_s/ctl/binrpc_run.c +++ b/modules_s/ctl/binrpc_run.c @@ -39,12 +39,20 @@ #include "io_listener.h" #include <stdio.h> /* vsnprintf */ +#include <stdlib.h> /* strtod */ #include <stdarg.h> +/* if set try to automatically convert values to the requested type in + rpc->scan (default: not set) */ +int autoconvert=0; + + #define BINRPC_MAX_BODY 4096 /* maximum body for send */ #define STRUCT_MAX_BODY 1024 #define MAX_MSG_CHUNKS 96 +#define BINRPC_GC_IBSIZE 4 /* initial gc block size (pointers no.) */ + struct rpc_struct_head{ struct rpc_struct_l* next; struct rpc_struct_l* prev; @@ -72,11 +80,21 @@ struct binrpc_recv_ctx{ int in_struct; }; + +struct binrpc_gc_block{ + unsigned short p_no; /**< array size */ + unsigned short idx; /**< current/last used pos. in the array */ + struct binrpc_gc_block* next; + void* p[1]; /**< array of pointers that will be free'd */ +}; + + struct binrpc_ctx{ struct binrpc_recv_ctx in; struct binrpc_send_ctx out; void* send_h; /* send handle */ char* method; + struct binrpc_gc_block* gc; /**< garbage collection */ int replied; }; @@ -113,6 +131,51 @@ static rpc_t binrpc_callbacks={ +/** mark a pointer for freeing when the ctx is destroyed. + * @return 0 on success, -1 on error + */ +inline static int binrpc_gc_track(struct binrpc_ctx* ctx, void* p) +{ + struct binrpc_gc_block* b; + int n; + + b=ctx->gc; + if (b==0 || (b->idx>=b->p_no)){ + n=(b==0)?BINRPC_GC_IBSIZE:b->p_no*2; + b=pkg_malloc(sizeof(*b)+n*sizeof(void*)-sizeof(b->p)); + if (b==0) + return -1; + b->p_no=n; + b->idx=0; + /* link in front */ + b->next=ctx->gc; + ctx->gc=b; + } + b->p[b->idx]=p; + b->idx++; + return 0; +} + + + +/** free all the tracked pointer from ctx->gc. + */ +inline static void binrpc_gc_collect(struct binrpc_ctx* ctx) +{ + struct binrpc_gc_block* b; + struct binrpc_gc_block* next; + int i; + + for(b=ctx->gc; b; b=next){ + next=b->next; + for (i=0; i<b->idx; i++) + pkg_free(b->p[i]); + pkg_free(b); + } + ctx->gc=0; +} + + static struct rpc_struct_l* new_rpc_struct() { struct rpc_struct_l* rs; @@ -322,6 +385,7 @@ inline void destroy_binrpc_ctx(struct binrpc_ctx* ctx) pkg_free(ctx->out.pkt.body); ctx->out.pkt.body=0; } + binrpc_gc_collect(ctx); } @@ -583,6 +647,88 @@ static char* rpc_type_name(int type) +/** converts a binrpc_val to int. + *@return int val on success, 0 and sets err on error (E_BINRPC_TYPE) */ +inline static int binrpc_val_conv_int( struct binrpc_val* v, int* err) +{ + int ret; + + *err=0; + switch(v->type){ + case BINRPC_T_INT: + return v->u.intval; + case BINRPC_T_DOUBLE: + return (int) v->u.fval; + case BINRPC_T_STR: + if (str2sint(&v->u.strval, &ret)==0) + return ret; + } + *err=E_BINRPC_TYPE; + return 0; +} + + + +/** converts a binrpc_val to double. + *@return double val on success, 0 and sets err on error (E_BINRPC_TYPE) */ +inline static double binrpc_val_conv_double( struct binrpc_val* v, int* err) +{ + double ret; + char* end; + + *err=0; + switch(v->type){ + case BINRPC_T_DOUBLE: + return v->u.fval; + case BINRPC_T_INT: + return (double)v->u.intval; + case BINRPC_T_STR: + ret=strtod(v->u.strval.s, &end); + if (end!=v->u.strval.s) + return ret; + } + *err=E_BINRPC_TYPE; + return 0; +} + + + +/** converts a binrpc_val to str. + *@return str val pointer on success, 0 and sets err on error (E_BINRPC_TYPE)*/ +inline static str* binrpc_val_conv_str(struct binrpc_ctx* ctx, + struct binrpc_val* v, int* err) +{ + str* ret; + char* s; + int len; + + *err=0; + switch(v->type){ + case BINRPC_T_STR: + return &v->u.strval; + case BINRPC_T_INT: + s=int2str(v->u.intval, &len); + ret=pkg_malloc(sizeof(*ret)+len+1); + if (ret==0 || binrpc_gc_track(ctx, ret)!=0){ + *err=E_BINRPC_OVERFLOW; + return 0; + } + ret->s=(char*)ret+sizeof(*ret); + ret->len=len; + memcpy(ret->s, s, len); + ret->s[len]=0; + return ret; + case BINRPC_T_DOUBLE: + /* for now the double to string conversion is not supported*/ + *err=E_BINRPC_BUG; + return 0; + } + *err=E_BINRPC_TYPE; + return 0; +} + + + /* rpc interface functions */ /* returns the number of parameters read @@ -595,45 +741,61 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) char* orig_fmt; int nofault; int modifiers; + int autoconv; + int i; + double d; + str* s; va_start(ap, fmt); orig_fmt=fmt; nofault = 0; modifiers=0; + autoconv=autoconvert; for (;*fmt; fmt++){ switch(*fmt){ case '*': /* start of optional parameters */ nofault = 1; modifiers++; - break; + continue; + case '.': /* autoconv. on for the next parameter */ + modifiers++; + autoconv=1; + continue; case 'b': /* bool */ case 't': /* time */ case 'd': /* int */ - v.type=BINRPC_T_INT; + v.type=autoconv?BINRPC_T_ALL:BINRPC_T_INT; ctx->in.s=binrpc_read_record(&ctx->in.ctx, ctx->in.s, ctx->in.end, &v, &err); - if (err<0) goto error_read; - *(va_arg(ap, int*))=v.u.intval; + if (err<0 || ((i=binrpc_val_conv_int(&v, &err))==0 && err<0)) + goto error_read; + *(va_arg(ap, int*))=i; break; case 'f': - v.type=BINRPC_T_DOUBLE; + v.type=autoconv?BINRPC_T_ALL:BINRPC_T_DOUBLE; ctx->in.s=binrpc_read_record(&ctx->in.ctx, ctx->in.s, ctx->in.end, &v, &err); - if (err<0) goto error_read; - *(va_arg(ap, double*))=v.u.fval; + if (err<0 || ((d=binrpc_val_conv_double(&v, &err))==0 && + err<0)) + goto error_read; + *(va_arg(ap, double*))=d; break; case 's': /* asciiz */ case 'S': /* str */ - v.type=BINRPC_T_STR; - v.u.strval.s="if you get this string, you don't" - "check rpc_scan return code !!! (very bad)"; - v.u.strval.len=strlen(v.u.strval.s); + v.type=autoconv?BINRPC_T_ALL:BINRPC_T_STR; ctx->in.s=binrpc_read_record(&ctx->in.ctx, ctx->in.s, ctx->in.end, &v,&err); + if (err<0 || ((s=binrpc_val_conv_str(ctx, &v, &err))==0 && + err<0)){ + v.u.strval.s="if you get this string, you don't" + "check rpc_scan return code !!! (very bad)"; + v.u.strval.len=strlen(v.u.strval.s); + s=&v.u.strval; + } if (*fmt=='s'){ - *(va_arg(ap, char**))=v.u.strval.s; /* 0 term by proto*/ + *(va_arg(ap, char**))=s->s; /* 0 term by proto*/ }else{ - *(va_arg(ap, str*))=v.u.strval; + *(va_arg(ap, str*))=*s; } if (err<0) goto error_read; break; @@ -652,6 +814,7 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) default: goto error_inv_param; } + autoconv=autoconvert; /* reset autoconv*/ ctx->in.record_no++; } va_end(ap); diff --git a/modules_s/ctl/ctl.c b/modules_s/ctl/ctl.c index 071c2e2..730de47 100644 --- a/modules_s/ctl/ctl.c +++ b/modules_s/ctl/ctl.c @@ -66,6 +66,10 @@ static int usock_mode=0600; /* permissions, default rw-------*/ static int usock_uid=-1; /* username and group for the unix sockets*/ static int usock_gid=-1; +/* if set try to automatically convert values to the requested type in + rpc->scan (default: not set) */ +extern int autoconvert; + static int add_binrpc_socket(modparam_t type, void * val); #ifdef USE_FIFO static int add_fifo_socket(modparam_t type, void * val); @@ -98,6 +102,7 @@ static param_export_t params[]={ {"mode", PARAM_INT, &usock_mode }, {"user", PARAM_STRING|PARAM_USE_FUNC, fix_user }, {"group", PARAM_STRING|PARAM_USE_FUNC, fix_group }, + {"autoconversion", PARAM_INT, &autoconvert }, {0,0,0} }; /* no params */

15 years, 6 months

git:master: fix error in cr dump command, reported from Edson 4lists at gmail dot com

by Henning Westerholt

Module: sip-router Branch: master Commit: 7a1676e337f40c286735060394963436854e999e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a1676e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 15 15:06:25 2009 +0200 fix error in cr dump command, reported from Edson 4lists at gmail dot com --- tools/kamctl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/kamctl b/tools/kamctl index 0835b8c..cbbe72b 100755 --- a/tools/kamctl +++ b/tools/kamctl @@ -1264,7 +1264,7 @@ cr() { ;; dump) - $CTLCMD cr_dump + $CTLCMD cr_dump_routes ;; addcn)

15 years, 6 months

SF.net SVN: openser:[5903] branches/1.5/scripts/kamctl

by Henning Westerholt

Revision: 5903 http://openser.svn.sourceforge.net/openser/?rev=5903&view=rev Author: henningw Date: 2009-07-15 13:05:42 +0000 (Wed, 15 Jul 2009) Log Message: ----------- - fix error in cr dump command, reported from Edson 4lists at gmail dot com Modified Paths: -------------- branches/1.5/scripts/kamctl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

git:master: bugfix in cr and userblacklist modules (kamailio r5894)

by Henning Westerholt

Module: sip-router Branch: master Commit: e437fdeacce0b07180b4d445a2eb2e920731fcb0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e437fde… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 15 14:50:02 2009 +0200 bugfix in cr and userblacklist modules (kamailio r5894) - fix error in module initialization which happened if a custom table name was configured in carrierroute and also userblacklist - it was reported as table version mismatch, which was of course really misleading - many thanks to Uriel Rozenbaum (uriel dot rozenbaum at gmail dot com) for his help in debugging this problem with a sample cfg and a binary build --- modules/carrierroute/db_carrierroute.h | 6 +++--- modules_k/userblacklist/db_userblacklist.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/carrierroute/db_carrierroute.h b/modules/carrierroute/db_carrierroute.h index cebc30e..8fc4f7b 100644 --- a/modules/carrierroute/db_carrierroute.h +++ b/modules/carrierroute/db_carrierroute.h @@ -71,7 +71,7 @@ extern str carrierroute_description_col; /* table version */ extern const unsigned int carrierroute_version; -#define carrierfailureroute_DB_TABLE { "carrierfailureroute_table", STR_PARAM, &carrierroute_table.s }, +#define carrierfailureroute_DB_TABLE { "carrierfailureroute_table", STR_PARAM, &carrierfailureroute_table.s }, extern str carrierfailureroute_table; @@ -101,7 +101,7 @@ extern str carrierfailureroute_description_col; /* table version */ extern const unsigned int carrierfailureroute_version; -#define carrier_name_DB_TABLE { "carrier_name_table", STR_PARAM, &carrierroute_table.s }, +#define carrier_name_DB_TABLE { "carrier_name_table", STR_PARAM, &carrier_name_table.s }, extern str carrier_name_table; @@ -115,7 +115,7 @@ extern str carrier_name_carrier_col; /* table version */ extern const unsigned int carrier_name_version; -#define domain_name_DB_TABLE { "domain_name_table", STR_PARAM, &carrierroute_table.s }, +#define domain_name_DB_TABLE { "domain_name_table", STR_PARAM, &domain_name_table.s }, extern str domain_name_table; diff --git a/modules_k/userblacklist/db_userblacklist.h b/modules_k/userblacklist/db_userblacklist.h index cfe49a7..e7be1e6 100644 --- a/modules_k/userblacklist/db_userblacklist.h +++ b/modules_k/userblacklist/db_userblacklist.h @@ -57,7 +57,7 @@ extern str userblacklist_whitelist_col; /* table version */ extern const unsigned int userblacklist_version; -#define globalblacklist_DB_TABLE { "globalblacklist_table", STR_PARAM, &userblacklist_table.s }, +#define globalblacklist_DB_TABLE { "globalblacklist_table", STR_PARAM, &globalblacklist_table.s }, extern str globalblacklist_table;

15 years, 6 months

CVS:commitlog: sip_router/modules/iptrtpproxy/examples clean_rtpproxy_attrs

by Tomas Mandys

tma0 2009/07/15 12:45:38 CEST SER CVS Repository Modified files: modules/iptrtpproxy/examples clean_rtpproxy_attrs Log: - more -h messages Revision Changes Path 1.2 +19 -7 sip_router/modules/iptrtpproxy/examples/clean_rtpproxy_attrs http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/iptrtpprox…

15 years, 6 months

[tracker] Task opened: modules/mi_rpc should support t_uac_dlg async mi command

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - modules/mi_rpc should support t_uac_dlg async mi command Task Type - Improvement Category - Module Status - New Assigned To - Operating System - All Severity - High Priority - High Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - modules/mi_rpc should support t_uac_dlg async mi command, which is needed, for example, for implementing click-to-dial application. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=10 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

15 years, 6 months

mi t_uac_dlg not available

by jh＠tutpro.com

i tried a click2dial app and got "500 async my cmd not implemented yet" when the app executed "mi t_uac_dlg" command. i hope this command becomes available at some point so that i don't need to give up using click2dial. why doesn't modules/tm have a t_uac_dlg rpc function? -- juha

15 years, 6 months

CVS:commitlog: sip_router socket_info.c

by Andrei Pelinescu-Onciul

andrei 2009/07/15 02:12:03 CEST SER CVS Repository Modified files: . socket_info.c Log: core: interface names in socket list port fix Due to an unfortunate typo, the port number was always set to 5060 for a listen address containing an interface name (e.g. -l eth0:5070 or -l udp:eth1:5062). Revision Changes Path 1.25 +3 -3 sip_router/socket_info.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/socket_info.c.diff…

15 years, 6 months

CVS:commitlog: sip_router socket_info.c

by Andrei Pelinescu-Onciul

andrei 2009/07/15 02:11:41 CEST SER CVS Repository Modified files: . socket_info.c Log: core: startup socket list fix Fix crash on startup when dealing with consecutive duplicate socket ("listen") addresses. Revision Changes Path 1.24 +4 -2 sip_router/socket_info.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/socket_info.c.diff…

15 years, 6 months

CVS:commitlog: sip_router/modules/iptrtpproxy iptrtpproxy.c sip_router/modules/iptrtpproxy/examples clean_rtpproxy_attrs

by Tomas Mandys

tma0 2009/07/14 18:56:24 CEST SER CVS Repository Modified files: modules/iptrtpproxy iptrtpproxy.c Added files: modules/iptrtpproxy/examples clean_rtpproxy_attrs Log: - minor ERR message improvment - new clean_rtpproxy_attrs script Revision Changes Path 1.1 +217 -0 sip_router/modules/iptrtpproxy/examples/clean_rtpproxy_attrs (new) http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/iptrtpprox… 1.3 +9 -10 sip_router/modules/iptrtpproxy/iptrtpproxy.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/iptrtpprox…

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