sr-dev August 2009

sr-dev@lists.kamailio.org

20 participants
75 discussions

git:master: core: use count() for 'include' directive
by Daniel-Constantin Mierla 27 Aug '09

27 Aug '09

Module: sip-router Branch: master Commit: 0fa738b70e8978587f0a1ca7e5db54b12ece4e43 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0fa738b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 27 11:28:33 2009 +0300 core: use count() for 'include' directive --- cfg.lex | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index ac7032d..a5941e4 100644 --- a/cfg.lex +++ b/cfg.lex @@ -577,7 +577,7 @@ 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>{INCLUDE} { count(); BEGIN(INCL); } <INITIAL>{URIHOST} { count(); yylval.strval=yytext; return URIHOST; } <INITIAL>{URIPORT} { count(); yylval.strval=yytext; return URIPORT; }

1 0

git:master: domain(k): register check self function
by Daniel-Constantin Mierla 27 Aug '09

27 Aug '09

Module: sip-router Branch: master Commit: a9f1019eea67956117677bb2566106db07128c86 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9f1019… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 27 11:20:29 2009 +0300 domain(k): register check self function - list of domains handled by module match now the 'myself' condition - the module register a callback function for 'myself' checks - port and proto are ignored since it has only domain names --- modules_k/domain/domain.c | 6 ++++++ modules_k/domain/domain.h | 2 ++ modules_k/domain/domain_mod.c | 6 ++++++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules_k/domain/domain.c b/modules_k/domain/domain.c index 302b248..3b217c7 100644 --- a/modules_k/domain/domain.c +++ b/modules_k/domain/domain.c @@ -220,6 +220,12 @@ int w_is_domain_local(struct sip_msg* _msg, char* _sp, char* _s2) } } +int domain_check_self(str* host, unsigned short port, unsigned short proto) +{ + if(is_domain_local(host)>0) + return 1; + return 0; +} /* * Reload domain table to new hash table and when done, make new hash table diff --git a/modules_k/domain/domain.h b/modules_k/domain/domain.h index 6f1d8da..34fc1ce 100644 --- a/modules_k/domain/domain.h +++ b/modules_k/domain/domain.h @@ -54,6 +54,8 @@ int w_is_domain_local(struct sip_msg* _msg, char* _s1, char* _s2); int is_domain_local(str* domain); +int domain_check_self(str* host, unsigned short port, unsigned short proto); + int domain_db_bind(const str* db_url); int domain_db_init(const str* db_url); void domain_db_close(void); diff --git a/modules_k/domain/domain_mod.c b/modules_k/domain/domain_mod.c index 431f5ab..afefee5 100644 --- a/modules_k/domain/domain_mod.c +++ b/modules_k/domain/domain_mod.c @@ -40,6 +40,7 @@ #include "../../mem/mem.h" #include "../../sr_module.h" #include "../../pvar.h" +#include "../../forward.h" #include "../../mod_fix.h" #include "domain.h" #include "mi.h" @@ -153,6 +154,11 @@ static int mod_init(void) LM_ERR("failed to register MI commands\n"); return -1; } + if(register_check_self_func(domain_check_self)<0) + { + LM_ERR("failed to register check self function\n"); + return -1; + } db_url.len = strlen(db_url.s); domain_table.len = strlen(domain_table.s);

1 0

SF.net SVN: openser:[5914] branches/1.4/modules/perl/openserxs.xs
by Daniel-Constantin Mierla 26 Aug '09

26 Aug '09

Revision: 5914 http://openser.svn.sourceforge.net/openser/?rev=5914&view=rev Author: miconda Date: 2009-08-26 18:35:18 +0000 (Wed, 26 Aug 2009) Log Message: ----------- - backport from 1.5 - fix memleak in perl module and use append_branch() C function Modified Paths: -------------- branches/1.4/modules/perl/openserxs.xs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:master: perl: use C append_branch() in Perl function
by Daniel-Constantin Mierla 26 Aug '09

26 Aug '09

Module: sip-router Branch: master Commit: b3368c5296efeba88b4823fa50903e2d4f9a975d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b3368c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 26 20:23:03 2009 +0200 perl: use C append_branch() in Perl function - perviously mk_action() was used resulting in lot of pkg operations at runtime - fixes the memory leak reported by James Pucket --- modules_k/perl/openserxs.xs | 44 +++++++----------------------------------- 1 files changed, 8 insertions(+), 36 deletions(-) diff --git a/modules_k/perl/openserxs.xs b/modules_k/perl/openserxs.xs index 7791e63..418f1e3 100644 --- a/modules_k/perl/openserxs.xs +++ b/modules_k/perl/openserxs.xs @@ -42,6 +42,7 @@ #include "../../action.h" #include "../../flags.h" #include "../../pvar.h" +#include "../../dset.h" #include "../../mem/mem.h" #include "../../route_struct.h" #include "../../qvalue.h" @@ -1185,11 +1186,8 @@ append_branch(self, branch = NULL, qval = NULL) char *qval; PREINIT: struct sip_msg *msg = sv2msg(self); - action_u_t elems[MAX_ACTIONS]; - qvalue_t q; - int err = 0; - struct action *act = NULL; - struct run_act_ctx ra_ctx; + qvalue_t q = Q_UNSPECIFIED; + str b = {0, 0}; INIT: CODE: if (!msg) { @@ -1200,43 +1198,17 @@ append_branch(self, branch = NULL, qval = NULL) if (str2q(&q, qval, strlen(qval)) < 0) { LM_ERR("append_branch: Bad q value."); } else { /* branch and qval set */ - elems[0].type = STRING_ST; - elems[0].u.data = branch; - elems[1].type = NUMBER_ST; - elems[1].u.data = (void *)(long)q; - act = mk_action(APPEND_BRANCH_T, - 2, - elems, - 0); + b.s = branch; + b.len = strlen(branch); } } else { if (branch) { /* branch set, qval unset */ - elems[0].type = STRING_ST; - elems[0].u.data = branch; - elems[1].type = NUMBER_ST; - elems[1].u.data = (void *)Q_UNSPECIFIED; - act = mk_action(APPEND_BRANCH_T, - 2, - elems, - 0); - } else { /* neither branch nor qval set */ - elems[0].type = STRING_ST; - elems[0].u.data = NULL; - elems[1].type = NUMBER_ST; - elems[1].u.data = (void *)Q_UNSPECIFIED; - act = mk_action(APPEND_BRANCH_T, - 2, - elems, - 0); + b.s = branch; + b.len = strlen(branch); } } - if (act) { - init_run_actions_ctx(&ra_ctx); - RETVAL = do_action(&ra_ctx, act, msg); - } else { - RETVAL = -1; - } + RETVAL = km_append_branch(msg, (b.s!=0)?&b:0, 0, 0, q, 0, 0); } OUTPUT: RETVAL

1 0

SF.net SVN: openser:[5913] branches/1.5/modules/perl/openserxs.xs
by Daniel-Constantin Mierla 26 Aug '09

26 Aug '09

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.

1 0

git:master: core: included file name must be between double quotes
by Daniel-Constantin Mierla 26 Aug '09

26 Aug '09

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

1 0

git:master: core: action struct holds cfg file name and line
by Daniel-Constantin Mierla 26 Aug '09

26 Aug '09

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…

1 0

git:master: core: print cfg position for action's runtime error
by Daniel-Constantin Mierla 26 Aug '09

26 Aug '09

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…

1 0

error when referencing variable
by jh＠tutpro.com 26 Aug '09

26 Aug '09

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

2 2

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 25 Aug '09

25 Aug '09

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…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2009