sr-dev

sr-dev@lists.kamailio.org

15 participants
44215 discussions

SF.net SVN: openser:[5913] branches/1.5/modules/perl/openserxs.xs

by Daniel-Constantin Mierla

Revision: 5913 http://openser.svn.sourceforge.net/openser/?rev=5913&view=rev Author: miconda Date: 2009-08-26 18:07:09 +0000 (Wed, 26 Aug 2009) Log Message: ----------- - use the dedicated append_branch() in Perl function instead of mk_action() - avoid lot of pkg operations and fixes the memory leak (reported by James Puckett) Modified Paths: -------------- branches/1.5/modules/perl/openserxs.xs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 4 months

git:master: core: included file name must be between double quotes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: eb31249895a52c351529c05ce7622b6382c87d83 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb31249… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 26 13:19:36 2009 +0300 core: included file name must be between double quotes - better suggestion that is a static string value (Jan Janak) - new syntax: include "file_name" - inside double quotes, following escape are allowed for now - \t - tab - \w - white space - \r - CR - \n - LF --- cfg.lex | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 63 insertions(+), 13 deletions(-) diff --git a/cfg.lex b/cfg.lex index 079613d..ac7032d 100644 --- a/cfg.lex +++ b/cfg.lex @@ -1290,12 +1290,61 @@ static int sr_push_yy_state(char *fin) struct sr_yy_fname *fn = NULL; char *x = NULL; char *newf = NULL; +#define MAX_INCLUDE_FNAME 128 + char fbuf[MAX_INCLUDE_FNAME]; + int i, j, l; if ( include_stack_ptr >= MAX_INCLUDE_DEPTH ) { LOG(L_CRIT, "too many includes\n"); return -1; } + l = strlen(fin); + if(l>=MAX_INCLUDE_FNAME) + { + LOG(L_CRIT, "included file name too long\n"); + return -1; + } + if(fin[0]!='"' || fin[l-1]!='"') + { + LOG(L_CRIT, "included file name must be between quotes\n"); + return -1; + } + j = 0; + for(i=1; i<l-1; i++) + { + switch(fin[i]) { + case '\\': + if(i+1==l-1) + { + LOG(L_CRIT, "invalid escape in included file name\n"); + return -1; + } + i++; + switch(fin[i]) { + case 't': + fbuf[j++] = '\t'; + break; + case 'n': + fbuf[j++] = '\n'; + break; + case 'r': + fbuf[j++] = '\r'; + break; + default: + fbuf[j++] = fin[i]; + } + break; + default: + fbuf[j++] = fin[i]; + } + } + if(j==0) + { + LOG(L_CRIT, "invalid included file name\n"); + return -1; + } + fbuf[j] = '\0'; include_stack[include_stack_ptr].state = YY_CURRENT_BUFFER; include_stack[include_stack_ptr].line = line; @@ -1310,12 +1359,12 @@ static int sr_push_yy_state(char *fin) startline=1; startcolumn=1; - yyin = fopen(fin, "r" ); + yyin = fopen(fbuf, "r" ); if ( ! yyin ) { finame = (finame==0)?cfg_file:finame; - if(finame==0 || fin[0]=='/') + if(finame==0 || fbuf[0]=='/') { LOG(L_CRIT, "cannot open included file: %s\n", fin); return -1; @@ -1323,7 +1372,7 @@ static int sr_push_yy_state(char *fin) x = strrchr(finame, '/'); if(x) { - newf = (char*)pkg_malloc(x-finame+strlen(fin)+2); + newf = (char*)pkg_malloc(x-finame+strlen(fbuf)+2); if(newf==0) { LOG(L_CRIT, "no more pkg\n"); @@ -1332,27 +1381,28 @@ static int sr_push_yy_state(char *fin) newf[0] = '\0'; strncat(newf, finame, x-finame); strcat(newf, "/"); - strcat(newf, fin); + strcat(newf, fbuf); } yyin = fopen(newf, "r" ); if ( ! yyin ) { - LOG(L_CRIT, "cannot open included file: %s (%s)\n", fin, newf); + LOG(L_CRIT, "cannot open included file: %s (%s)\n", fbuf, newf); return -1; } - LOG(L_DBG, "including file: %s (%s)\n", fin, newf); + LOG(L_DBG, "including file: %s (%s)\n", fbuf, newf); } else { - newf = fin; + newf = fbuf; } + /* make a copy in PKG if does not exist */ fn = sr_yy_fname_list; while(fn!=0) { if(strcmp(fn->fname, newf)==0) { - if(newf!=fin) + if(newf!=fbuf) pkg_free(newf); - newf = fin; + newf = fbuf; break; } fn = fn->next; @@ -1362,21 +1412,21 @@ static int sr_push_yy_state(char *fin) fn = (struct sr_yy_fname*)pkg_malloc(sizeof(struct sr_yy_fname)); if(fn==0) { - if(newf!=fin) + if(newf!=fbuf) pkg_free(newf); LOG(L_CRIT, "no more pkg\n"); return -1; } - if(newf==fin) + if(newf==fbuf) { - fn->fname = (char*)pkg_malloc(strlen(fin)+1); + fn->fname = (char*)pkg_malloc(strlen(fbuf)+1); if(fn->fname==0) { pkg_free(fn); LOG(L_CRIT, "no more pkg!\n"); return -1; } - strcpy(fn->fname, fin); + strcpy(fn->fname, fbuf); } else { fn->fname = newf; }

15 years, 4 months

git:master: core: print cfg position for action's runtime error

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8c69c5036d520d9b846f0a9fc0c8d20e686cdcb8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c69c50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 26 11:50:25 2009 +0300 core: print cfg position for action's runtime error --- action.c | 67 ++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 28 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8c6…

15 years, 4 months

git:master: core: action struct holds cfg file name and line

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: eac773a6d4701391739a61e7eca8c23b80e1e429 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eac773a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 26 11:51:51 2009 +0300 core: action struct holds cfg file name and line - useful to print cfg file position for runtime action errors --- cfg.y | 231 +++++++++++++++++++++++++++++++++----------------------- route_struct.h | 2 + 2 files changed, 137 insertions(+), 96 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=eac…

15 years, 4 months

error when referencing variable

by jh＠tutpro.com

according to s domain module documentation In addition to that domain-level attributes, if any, will be available as either $fd.<name> or $td.<name>. i tried like this: if (lookup_domain("$fd", "$var(from_uri_domain)")) { xlog("L_INFO", "Got lcr_id <$fd.lcr_id>\n"); but got error at startup: Aug 26 10:39:10 localhost /usr/sbin/sip-router[9075]: ERROR: <core> [pvapi.c:500]: error searching pvar "fd.lcr_id" why? -- juha

15 years, 4 months

CVS:commitlog: sip_router/modules/iptrtpproxy iptrtpproxy.c sip_router/modules/iptrtpproxy/doc iptrtpproxy.xml sip_router/modules/iptrtpproxy/examples ser.cfg

by Tomas Mandys

tma0 2009/08/25 21:30:15 CEST SER CVS Repository Modified files: modules/iptrtpproxy iptrtpproxy.c modules/iptrtpproxy/doc iptrtpproxy.xml modules/iptrtpproxy/examples ser.cfg Log: - iptrtpproxy.cfg support (share config data between iptables and ser module) Revision Changes Path 1.3 +14 -3 sip_router/modules/iptrtpproxy/doc/iptrtpproxy.xml http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/iptrtpprox… 1.3 +2 -1 sip_router/modules/iptrtpproxy/examples/ser.cfg http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/iptrtpprox… 1.4 +318 -95 sip_router/modules/iptrtpproxy/iptrtpproxy.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/modules/iptrtpprox…

15 years, 4 months

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; };

15 years, 4 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; }

15 years, 4 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};

15 years, 4 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/

15 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev