sr-dev August 2009

sr-dev@lists.kamailio.org

20 participants
75 discussions

git:master: core: support for include file in cfg

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d20565193c1176312a29d75710d494707abdf6a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d205651… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 25 19:27:01 2009 +0300 core: support for include file in cfg - syntax: include path/to/file - example: include checks.cfg - path can be absolute or relative - if path is relative: - first attempt is to open the file relative to current directory - second attempt is to open the file relative to the directory of the file including it - if include file fails, then print error and exit - cfg syntax error messages print file name - there is no restriction where 'include' can be used, can have global parameters, module configs or entire/parts of route blocks --- cfg.lex | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- cfg.y | 29 ++++++----- route_struct.h | 1 + 3 files changed, 174 insertions(+), 15 deletions(-) diff --git a/cfg.lex b/cfg.lex index ebe2b6d..079613d 100644 --- a/cfg.lex +++ b/cfg.lex @@ -122,6 +122,7 @@ int column=1; int startcolumn=1; int startline=1; + char *finame = 0; static int ign_lines=0; static int ign_columns=0; char* yy_number_str=0; /* str correspondent for the current NUMBER token */ @@ -132,12 +133,30 @@ static void count_more(); static void count_ignore(); + #define MAX_INCLUDE_DEPTH 10 + static struct sr_yy_state { + YY_BUFFER_STATE state; + int line; + int column; + int startcolumn; + int startline; + char *finame; + } include_stack[MAX_INCLUDE_DEPTH]; + static int include_stack_ptr = 0; + + static int sr_push_yy_state(char *fin); + static int sr_pop_yy_state(); + + static struct sr_yy_fname { + char *fname; + struct sr_yy_fname *next; + } *sr_yy_fname_list = 0; %} /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P -%x PVARID +%x PVARID INCL /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ SER_CFG SER @@ -201,6 +220,8 @@ CASE "case" DEFAULT "default" WHILE "while" +INCLUDE "include" + /*ACTION LVALUES*/ URIHOST "uri:host" URIPORT "uri:port" @@ -556,6 +577,8 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{DEFAULT} { count(); yylval.strval=yytext; return DEFAULT; } <INITIAL>{WHILE} { count(); yylval.strval=yytext; return WHILE; } +<INITIAL>{INCLUDE} { BEGIN(INCL); } + <INITIAL>{URIHOST} { count(); yylval.strval=yytext; return URIHOST; } <INITIAL>{URIPORT} { count(); yylval.strval=yytext; return URIPORT; } @@ -1097,6 +1120,13 @@ EAT_ABLE [\ \t\b\r] <SELECT>. { unput(yytext[0]); state = INITIAL_S; BEGIN(INITIAL); } /* Rescan the token in INITIAL state */ +<INCL>[ \t]* /* eat the whitespace */ +<INCL>[^ \t\n]+ { /* get the include file name */ + if(sr_push_yy_state(yytext)<0) + exit(-1); + BEGIN(INITIAL); +} + <<EOF>> { switch(state){ @@ -1141,7 +1171,8 @@ EAT_ABLE [\ \t\b\r] " while parsing" " avp or pvar name\n"); } - return 0; + if(sr_pop_yy_state()<0) + return 0; } %% @@ -1253,3 +1284,127 @@ int yywrap() { return 1; } + +static int sr_push_yy_state(char *fin) +{ + struct sr_yy_fname *fn = NULL; + char *x = NULL; + char *newf = NULL; + + if ( include_stack_ptr >= MAX_INCLUDE_DEPTH ) + { + LOG(L_CRIT, "too many includes\n"); + return -1; + } + + include_stack[include_stack_ptr].state = YY_CURRENT_BUFFER; + include_stack[include_stack_ptr].line = line; + include_stack[include_stack_ptr].column = column; + include_stack[include_stack_ptr].startline = startline; + include_stack[include_stack_ptr].startcolumn = startcolumn; + include_stack[include_stack_ptr].finame = finame; + include_stack_ptr++; + + line=1; + column=1; + startline=1; + startcolumn=1; + + yyin = fopen(fin, "r" ); + + if ( ! yyin ) + { + finame = (finame==0)?cfg_file:finame; + if(finame==0 || fin[0]=='/') + { + LOG(L_CRIT, "cannot open included file: %s\n", fin); + return -1; + } + x = strrchr(finame, '/'); + if(x) + { + newf = (char*)pkg_malloc(x-finame+strlen(fin)+2); + if(newf==0) + { + LOG(L_CRIT, "no more pkg\n"); + return -1; + } + newf[0] = '\0'; + strncat(newf, finame, x-finame); + strcat(newf, "/"); + strcat(newf, fin); + } + yyin = fopen(newf, "r" ); + if ( ! yyin ) + { + LOG(L_CRIT, "cannot open included file: %s (%s)\n", fin, newf); + return -1; + } + LOG(L_DBG, "including file: %s (%s)\n", fin, newf); + } else { + newf = fin; + } + + fn = sr_yy_fname_list; + while(fn!=0) + { + if(strcmp(fn->fname, newf)==0) + { + if(newf!=fin) + pkg_free(newf); + newf = fin; + break; + } + fn = fn->next; + } + if(fn==0) + { + fn = (struct sr_yy_fname*)pkg_malloc(sizeof(struct sr_yy_fname)); + if(fn==0) + { + if(newf!=fin) + pkg_free(newf); + LOG(L_CRIT, "no more pkg\n"); + return -1; + } + if(newf==fin) + { + fn->fname = (char*)pkg_malloc(strlen(fin)+1); + if(fn->fname==0) + { + pkg_free(fn); + LOG(L_CRIT, "no more pkg!\n"); + return -1; + } + strcpy(fn->fname, fin); + } else { + fn->fname = newf; + } + fn->next = sr_yy_fname_list; + sr_yy_fname_list = fn; + } + + finame = fn->fname; + + yy_switch_to_buffer( yy_create_buffer(yyin, YY_BUF_SIZE ) ); + + return 0; + +} + +static int sr_pop_yy_state() +{ + include_stack_ptr--; + if (include_stack_ptr<0 ) + return -1; + + yy_delete_buffer( YY_CURRENT_BUFFER ); + yy_switch_to_buffer(include_stack[include_stack_ptr].state); + line=include_stack[include_stack_ptr].line; + column=include_stack[include_stack_ptr].column; + startline=include_stack[include_stack_ptr].startline; + startcolumn=include_stack[include_stack_ptr].startcolumn; + finame = include_stack[include_stack_ptr].finame; + return 0; +} + diff --git a/cfg.y b/cfg.y index 6950d88..25dd635 100644 --- a/cfg.y +++ b/cfg.y @@ -3070,7 +3070,7 @@ extern int line; extern int column; extern int startcolumn; extern int startline; - +extern char *finame; static void get_cpos(struct cfg_pos* pos) { @@ -3078,6 +3078,9 @@ static void get_cpos(struct cfg_pos* pos) pos->e_line=line; pos->s_col=startcolumn; pos->e_col=column-1; + if(finame==0) + finame = (cfg_file!=0)?cfg_file:"default"; + pos->fname=finame; } @@ -3090,15 +3093,15 @@ static void warn_at(struct cfg_pos* p, char* format, ...) vsnprintf(s, sizeof(s), format, ap); va_end(ap); if (p->e_line!=p->s_line) - LOG(L_WARN, "warning in config file, from line %d, column %d to" + LOG(L_WARN, "warning in config file %s, from line %d, column %d to" " line %d, column %d: %s\n", - p->s_line, p->s_col, p->e_line, p->e_col, s); + p->fname, p->s_line, p->s_col, p->e_line, p->e_col, s); else if (p->s_col!=p->e_col) - LOG(L_WARN, "warning in config file, line %d, column %d-%d: %s\n", - p->s_line, p->s_col, p->e_col, s); + LOG(L_WARN, "warning in config file %s, line %d, column %d-%d: %s\n", + p->fname, p->s_line, p->s_col, p->e_col, s); else - LOG(L_WARN, "warning in config file, line %d, column %d: %s\n", - p->s_line, p->s_col, s); + LOG(L_WARN, "warning in config file %s, line %d, column %d: %s\n", + p->fname, p->s_line, p->s_col, s); cfg_warnings++; } @@ -3113,15 +3116,15 @@ static void yyerror_at(struct cfg_pos* p, char* format, ...) vsnprintf(s, sizeof(s), format, ap); va_end(ap); if (p->e_line!=p->s_line) - LOG(L_CRIT, "parse error in config file, from line %d, column %d" + LOG(L_CRIT, "parse error in config file %s, from line %d, column %d" " to line %d, column %d: %s\n", - p->s_line, p->s_col, p->e_line, p->e_col, s); + p->fname, p->s_line, p->s_col, p->e_line, p->e_col, s); else if (p->s_col!=p->e_col) - LOG(L_CRIT, "parse error in config file, line %d, column %d-%d: %s\n", - p->s_line, p->s_col, p->e_col, s); + LOG(L_CRIT,"parse error in config file %s, line %d, column %d-%d: %s\n", + p->fname, p->s_line, p->s_col, p->e_col, s); else - LOG(L_CRIT, "parse error in config file, line %d, column %d: %s\n", - p->s_line, p->s_col, s); + LOG(L_CRIT, "parse error in config file %s, line %d, column %d: %s\n", + p->fname, p->s_line, p->s_col, s); cfg_errors++; } diff --git a/route_struct.h b/route_struct.h index 9274340..fcc475e 100644 --- a/route_struct.h +++ b/route_struct.h @@ -136,6 +136,7 @@ struct cfg_pos{ int e_line; unsigned short s_col; unsigned short e_col; + char *fname; };

14 years, 8 months

git:master: rls: memory leak fix

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: 778c4352f2cbbc572a001e7ef9f2bf18d453a302 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=778c435… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Tue Aug 25 11:36:59 2009 +0300 rls: memory leak fix - port of K #5909 --- modules_k/rls/notify.c | 19 +++++++++++-------- modules_k/rls/resource_notify.c | 34 +++++++++++++++++++--------------- modules_k/rls/subscribe.c | 25 ++++++++++++++++--------- 3 files changed, 46 insertions(+), 32 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index eaefad1..9734d6c 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -216,13 +216,13 @@ int agg_body_sendn_update(str* rl_uri, char* boundary_string, str* rlmi_body, cid= generate_cid(rl_uri->s, rl_uri->len); - len= 2*strlen(boundary_string)+ 4+ 102+ strlen(cid)+ 2+ rlmi_body->len+50; + len= 2*strlen(boundary_string)+4+102+strlen(cid)+2+rlmi_body->len+50; if(multipart_body) len+= multipart_body->len; init_len= len; - body.s= (char*)pkg_malloc(len* sizeof(char)); + body.s= (char*)pkg_malloc((len+1)* sizeof(char)); if(body.s== NULL) { ERR_MEM(PKG_MEM_STR); @@ -469,6 +469,7 @@ str* constr_multipart_body(db1_res_t* result, char** cid_array, db_val_t *row_vals; char* content_id= NULL; str body= {0, 0}; + str ctype= {0, 0}; int antet_len; str* multi_body= NULL; @@ -489,6 +490,11 @@ str* constr_multipart_body(db1_res_t* result, char** cid_array, if(row_vals[auth_state_col].val.int_val!= ACTIVE_STATE) continue; + body.s= (char*)row_vals[pres_state_col].val.string_val; + body.len= strlen(body.s); + ctype.s = (char*)row_vals[content_type_col].val.string_val; + ctype.len = strlen(ctype.s); + if(length+ antet_len+ body.len+ 4 > size) { REALLOC_BUF @@ -505,13 +511,10 @@ str* constr_multipart_body(db1_res_t* result, char** cid_array, } length+= sprintf(buf+ length, "Content-ID: <%s>\r\n",content_id); - length+= sprintf(buf+ length, "Content-Type: %s\r\n\r\n", - row_vals[content_type_col].val.string_val); + length+= sprintf(buf+ length, "Content-Type: %.*s\r\n\r\n", + ctype.len, ctype.s); - body.s= (char*)row_vals[pres_state_col].val.string_val; - body.len= strlen(body.s); - - length+= sprintf(buf+length,"%s\r\n\r\n", body.s); + length+= sprintf(buf+length,"%.*s\r\n\r\n", body.len, body.s); } if(length+ strlen( boundary_string)+ 7> size ) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 3afc2d7..ff9a037 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -406,9 +406,17 @@ done: goto error; } + pkg_free(res_id->s); + pkg_free(res_id); + return 1; error: + if(res_id!=NULL) + { + pkg_free(res_id->s); + pkg_free(res_id); + } return -1; } /* callid, from_tag, to_tag parameters must be allocated */ @@ -563,11 +571,6 @@ void timer_send_notify(unsigned int ticks,void *param) goto error; } xmlFree(rlmi_cont.s); - if(buf_len) - { - pkg_free(buf); - buf= NULL; - } xmlFreeDoc(rlmi_doc); rlmi_doc= NULL; pkg_free(rl_uri); @@ -576,14 +579,16 @@ void timer_send_notify(unsigned int ticks,void *param) dialog= NULL; } - if(prev_did== NULL || strcmp(prev_did, curr_did)) /*if first or different*/ + /*if first or different*/ + if(prev_did==NULL || strcmp(prev_did, curr_did)!=0) { /* search the subscription in rlsubs_table*/ if( parse_rlsubs_did(curr_did, &callid, &from_tag, &to_tag)< 0) { LM_ERR("bad format for " "resource list Subscribe dialog indentifier(rlsubs did)\n"); - goto done; + prev_did = NULL; + continue; } hash_code= core_hash(&callid, &to_tag, hash_size); @@ -598,6 +603,7 @@ void timer_send_notify(unsigned int ticks,void *param) callid.len, callid.s,from_tag.len,from_tag.s, to_tag.len,to_tag.s); lock_release(&rls_table[hash_code].lock); + prev_did = NULL; continue; } LM_DBG("Found rl-subs record in hash table\n"); @@ -634,8 +640,10 @@ void timer_send_notify(unsigned int ticks,void *param) rl_uri[dialog->pres_uri.len]= '\0'; xmlNewProp(list_node, BAD_CAST "uri", BAD_CAST rl_uri); - xmlNewProp(list_node, BAD_CAST "xmlns", BAD_CAST "urn:ietf:params:xml:ns:rlmi"); - xmlNewProp(list_node, BAD_CAST "version", BAD_CAST int2str(dialog->version, &len)); + xmlNewProp(list_node, BAD_CAST "xmlns", + BAD_CAST "urn:ietf:params:xml:ns:rlmi"); + xmlNewProp(list_node, BAD_CAST "version", + BAD_CAST int2str(dialog->version, &len)); xmlNewProp(list_node, BAD_CAST "fullState", BAD_CAST "false"); xmlDocSetRootElement(rlmi_doc, list_node); @@ -702,7 +710,8 @@ void timer_send_notify(unsigned int ticks,void *param) REALLOC_BUF } buf_len+= sprintf(buf+ buf_len, "--%s\r\n\r\n", bstr.s); - buf_len+= sprintf(buf+ buf_len, "Content-Transfer-Encoding: binary\r\n"); + buf_len+= sprintf(buf+ buf_len, + "Content-Transfer-Encoding: binary\r\n"); buf_len+= sprintf(buf+ buf_len, "Content-ID: <%s>\r\n", cid); buf_len+= sprintf(buf+ buf_len, "Content-Type: %s\r\n\r\n", row_vals[content_type_col].val.string_val); @@ -750,11 +759,6 @@ void timer_send_notify(unsigned int ticks,void *param) goto error; } xmlFree(rlmi_cont.s); - if(buf_len) - { - pkg_free(buf); - buf= NULL; - } pkg_free(rl_uri); rl_uri= NULL; pkg_free(dialog); diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 7f1c365..bdf311f 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -688,6 +688,21 @@ int update_rlsubs( subs_t* subs, unsigned int hash_code) memcpy(subs->pres_uri.s, s->pres_uri.s, s->pres_uri.len); subs->pres_uri.len= s->pres_uri.len; + if(s->record_route.s!=NULL && s->record_route.len>0) + { + subs->record_route.s = + (char*)pkg_malloc(s->record_route.len* sizeof(char)); + if(subs->record_route.s==NULL) + { + ERR_MEM(PKG_MEM_STR); + } + memcpy(subs->record_route.s, s->record_route.s, s->record_route.len); + subs->record_route.len= s->record_route.len; + } + + subs->local_cseq= s->local_cseq; + subs->version= s->version; + if(subs->expires== 0) { /* delete record from hash table */ @@ -710,15 +725,7 @@ int update_rlsubs( subs_t* subs, unsigned int hash_code) ps->next= s->next; shm_free(s); } - else - { - s->remote_cseq= subs->remote_cseq; - s->expires= subs->expires+ (int)time(NULL); - } - subs->local_cseq= s->local_cseq; - subs->version= s->version; - lock_release(&rls_table[hash_code].lock); return 0; @@ -745,7 +752,7 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr rl_node) char* uri= NULL; subs_info_t s; str wuri= {0, 0}; - static char buf[64]; + static char buf[256]; str extra_headers; str did_str= {0, 0};

14 years, 8 months

git:master: rls: fixed supported header name

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: a3b0f700d10d0b310766a34ec6e7390455e5ba64 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3b0f70… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Tue Aug 25 11:16:53 2009 +0300 rls: fixed supported header name - port of K #5908 --- modules_k/rls/subscribe.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index eada0c6..7f1c365 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -476,7 +476,7 @@ int rls_handle_subscribe(struct sip_msg* msg, char* s1, char* s2) lock_release(&rls_table[hash_code].lock); } -/*** verify if it contains the 'Support: eventlist' header +/*** verify if it contains the 'Supported: eventlist' header * and if not - reply with '421 (Extension Required)' */ /* @@ -490,7 +490,7 @@ int rls_handle_subscribe(struct sip_msg* msg, char* s1, char* s2) hdr= msg->headers; while(hdr) { - if(cmp_hdrname_strzn(&hdr->name, "Support", 7)== 0) + if(cmp_hdrname_strzn(&hdr->name, "Supported", 9)== 0) break; hdr= hdr->next; }

14 years, 8 months

kamailio 3.0 - the time before freezing

by Daniel-Constantin Mierla

Hello everybody, during the last IRC devel meeting, we pinned end of summer to be the time to enter testing phase for the new major release - codenamed kamailio 3.0. There was quite a lot of brand new features, considering that most of devel effort was directed to integration. A try to collect new items is available at: http://sip-router.org/wiki/features/new-in-devel Of course, all ser features are available as well, resulting a large amount of new stuff in kamailio 3.0 vs kamailio 1.5.x. See: http://sip-router.org/benefits/ http://www.iptel.org/ser/features I propose to start the testing phase sometime next week. Meanwhile, let's see if something important was forgotten from kamailio core or tm. To my knowledge: - path support in tm - Andrei has it on his todo afaik - in a way or another, it must get in next release - drop compatibility - drop reply in reply_route - internally drop and exit are now differentiated by core, needs review and update of handling after running the routes - on my to-do Apart seas, all Kamailio modules are fully ugraded to new core - I started but lack of test env + busy summer resulted in delays - can be done during testing period, being just api updates. If you have discovered something else, let us know. Thanks, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

14 years, 8 months

[tracker] Task opened: TLS modul problem

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 - Anonymous user () Attached to Project - sip-router Summary - TLS modul problem Task Type - Bug Report Category - tls Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - Linux Severity - Critical Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - I am experiencing problem "Invalid connection state (bug in TCP code)"in tls_server.c in function <code> static int tls_complete_init(struct tcp_connection* c) </code> <code> if (c->state == S_CONN_ACCEPT) { dom = tls_lookup_cfg(cfg, TLS_DOMAIN_SRV, &c->rcv.dst_ip, c->rcv.dst_port); } else if (c->state == S_CONN_CONNECT) { dom = tls_lookup_cfg(cfg, TLS_DOMAIN_CLI, &c->rcv.dst_ip, c->rcv.dst_port); } else { BUG("Invalid connection state (bug in TCP code)\n"); goto error; } </code> Incoming tls connection is working fine. The problem only occurs if a worker received a new invite and want forward and open a new TLS connection by <code>int tls_h_blocking_write(struct tcp_connection *c, int fd, const char *buf, unsigned int len) </code> I am debugged with gdb and i catch that c->state is S_CONN_OK So it seems it TCP is already connected. My TCP config in ser.cfg <code> #TLS enable_tls=yes #TCP settings disable_tcp=no tcp_async=no tcp_send_timeout=2 #tcp_accept_aliases=yes # accepts the tcp alias via option (see NEWS) tcp_delayed_ack=no tcp_fd_cache=no </code> More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=14 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.

14 years, 8 months

[tracker] Assignee added: TLS modul problem

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#14 - TLS modul problem User who did this - Anonymous user () http://sip-router.org/tracker/index.php?do=details&task_id=14 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.

14 years, 8 months

are selects documented somewhere?

by Daniel-Constantin Mierla

Hello, is there a list with available selects in ser? I only found short introduction at: http://www.iptel.org/introduction_to_selects_and_attribute_value_pairs_avpa… Thanks, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

14 years, 8 months

new PV class: $sel(name)

by Daniel-Constantin Mierla

Hello, there is a new PV class that provides access to SER select variables. A list with available selects can be found at: http://sip-router.org/wiki/cookbooks/selects/devel Therefore, all Kamailio modules relying on PV framework can get access to select values without any change. See example of usage from config at: http://sip-router.org/wiki/cookbooks/pseudo-variables/devel#selects Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

14 years, 8 months

async (delayed reply) support for t_uac_dlg in first release?

by jh＠tutpro.com

andrei you wrote in july regarding async (delayed reply) support for t_uac_dlg: Ok, I'll add async support (in fact delayed reply support since it's not true async), at least to xmlrpc (turns out that it's quite easy since xmlrpc reuses sr tcp). For ctl/binrpc it would be easy for datagram sockets (udp or unix datagram socket) and more difficult (but possible) for stream sockets (tcp or unix stream). However it might take a while until there will be a workable version. any idea, if this will be available in first release of sip-router? if yes, i could plan to start using sip-router. if not, i need to plan for something else. -- juha

14 years, 8 months

git:master: pv: new pv class $sel(name)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6dac6b618015314811b94127490e906d535f44fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6dac6b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 20 16:12:35 2009 +0300 pv: new pv class $sel(name) - access select (ser cfg variables) values via PV framework - read-only PV - examples: $sel(@ruri), $sel((a)via[2].host) --- modules_k/pv/pv.c | 4 +++ modules_k/pv/pv_select.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_select.h | 36 ++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index f990a55..b284bbd 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -35,6 +35,7 @@ #include "pv_shv.h" #include "pv_time.h" #include "pv_trans.h" +#include "pv_select.h" MODULE_VERSION @@ -64,6 +65,9 @@ static pv_export_t mod_pvs[] = { { {"stat", sizeof("stat")-1}, /* statistics */ PVT_OTHER, pv_get_stat, 0, pv_parse_stat_name, 0, 0, 0 }, + { {"sel", sizeof("sel")-1}, /* select */ + PVT_OTHER, pv_get_select, 0, + pv_parse_select_name, 0, 0, 0 }, {{"avp", (sizeof("avp")-1)}, PVT_AVP, pv_get_avp, pv_set_avp, pv_parse_avp_name, pv_parse_index, 0, 0}, diff --git a/modules_k/pv/pv_select.c b/modules_k/pv/pv_select.c new file mode 100644 index 0000000..8634052 --- /dev/null +++ b/modules_k/pv/pv_select.c @@ -0,0 +1,67 @@ +/* + * $Id$ + * + * Copyright (C) 2001-2003 FhG Fokus + * + * 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 Implementation for Select Pseudo-variables + */ + +#include "../../select.h" +#include "pv_select.h" + +int pv_parse_select_name(pv_spec_p sp, str *in) +{ + select_t *sel = 0; + char c; + char *p; + if (in == NULL || in->s == NULL || sp == NULL) + return -1; + + c = in->s[in->len]; + in->s[in->len] = '\0'; + p = in->s; + if(parse_select(&p, &sel)<0) + { + LM_ERR("invalid select name [%.*s]\n", + in->len, in->s); + in->s[in->len] = c; + return -1; + } + in->s[in->len] = c; + sp->pvp.pvn.u.dname = (void*)sel; + sp->pvp.pvn.type = PV_NAME_OTHER; + return 0; +} + + +int pv_get_select(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +{ + str s = {0, 0}; + select_t *sel = 0; + + sel = (select_t*)param->pvn.u.dname; + + if(sel==0 || run_select(&s, sel, msg)<0 || s.s==0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &s); +} + diff --git a/modules_k/pv/pv_select.h b/modules_k/pv/pv_select.h new file mode 100644 index 0000000..84c872f --- /dev/null +++ b/modules_k/pv/pv_select.h @@ -0,0 +1,36 @@ +/* + * $Id$ + * + * Copyright (C) 2001-2003 FhG Fokus + * + * 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 Headers for Stats Pseudo-variables + */ + +#ifndef _PV_SELECT_H_ +#define _PV_SELECT_H_ + +#include "../../pvar.h" + +int pv_parse_select_name(pv_spec_p sp, str *in); +int pv_get_select(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); + +#endif

14 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2009