sr-dev July 2009

sr-dev@lists.kamailio.org

35 participants
328 discussions

CVS:commitlog: sip_router cfg.y
by Andrei Pelinescu-Onciul 17 Jul '09

17 Jul '09

andrei 2009/07/17 18:26:23 CEST SER CVS Repository Modified files: . cfg.y Log: core: config parser minor fix Backport from sip-router, c5e8ac: - use a pkg_malloc'ed copy of yy_number_str for host_if_id - always free ID/NUM_ID/host_if_id after copying them (bug introduced in the last commit). Revision Changes Path 1.185 +9 -2 sip_router/cfg.y http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/cfg.y.diff?r1=1.18…

1 0

git:master: core: config parser minor fix
by Andrei Pelinescu-Onciul 17 Jul '09

17 Jul '09

Module: sip-router Branch: master Commit: c5e8ac5603f5a770b2306cd0d574c20586d788ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5e8ac5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 17 18:15:44 2009 +0200 core: config parser minor fix - use a pkg_malloc'ed copy of yy_number_str for host_if_id - always free ID/NUM_ID/host_if_id after copying them (bug introduced in the … [View More]

1 0

git:master: Merge commit 'origin/ser_core_cvs'
by Andrei Pelinescu-Onciul 17 Jul '09

17 Jul '09

Module: sip-router Branch: master Commit: 4d601c6d0b41eb26cc3a89ae3661b8be555f8dad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d601c6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 17 18:09:01 2009 +0200 Merge commit 'origin/ser_core_cvs' * commit 'origin/ser_core_cvs': core: config parser listen if names fix core: config parser listen fix core: interface names in … [View More]

1 0

git:master: Merge commit 'origin/ser_modules'
by Andrei Pelinescu-Onciul 17 Jul '09

17 Jul '09

Module: sip-router Branch: master Commit: 98c5d63ebb246b1c640f228dcf0035e957246dd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98c5d63… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 17 17:45:40 2009 +0200 Merge commit 'origin/ser_modules' * commit 'origin/ser_modules': - socket support - more -h messages - minor ERR message improvment presence_b2b: fix from & … [View More]

1 0

git:ser_core_cvs: core: config parser listen if names fix
by Andrei Pelinescu-Onciul 17 Jul '09

17 Jul '09

Module: sip-router Branch: ser_core_cvs Commit: f9276a5b4875a1e3ecda29d50013725642cc8af2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9276a5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 17 13:37:11 2009 +0000 core: config parser listen if names fix If no quotes were used in listen=x, it was assumed that x was an ip or a valid hostname (each domain part starts with a … [View More]letter, numbers and '_' are not allowed as first chars). However this assumption failed when interface names were used, e.g. eth0.1 is a valid interface name, but listen=eth0.1 resulted in error (it worked only if quotes were used, e.g. listen="eth0.1"). --- cfg.lex | 41 +++++++++++++++++++++++++++++------------ cfg.y | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 15 deletions(-) diff --git a/cfg.lex b/cfg.lex index 13225ab..2c9ab8f 100644 --- a/cfg.lex +++ b/cfg.lex @@ -112,6 +112,7 @@ int line=1; int column=1; int startcolumn=1; + char* yy_number_str=0; /* str correspondent for the current NUMBER token */ static char* addchar(struct str_buf *, char); static char* addstr(struct str_buf *, char*, int); @@ -403,6 +404,7 @@ LETTER [a-zA-Z] DIGIT [0-9] ALPHANUM {LETTER}|{DIGIT}|[_] ID {LETTER}{ALPHANUM}* +NUM_ID {ALPHANUM}+ HEX [0-9a-fA-F] HEXNUMBER 0x{HEX}+ OCTNUMBER 0[0-7]+ @@ -784,10 +786,14 @@ EAT_ABLE [\ \t\b\r] <SELECT>{DOT} { count(); return DOT; } <SELECT>{LBRACK} { count(); return LBRACK; } <SELECT>{RBRACK} { count(); return RBRACK; } -<SELECT>{DECNUMBER} { count(); yylval.intval=atoi(yytext);return NUMBER; } -<SELECT>{HEXNUMBER} { count(); yylval.intval=(int)strtol(yytext, 0, 16); return NUMBER; } -<SELECT>{OCTNUMBER} { count(); yylval.intval=(int)strtol(yytext, 0, 8); return NUMBER; } -<SELECT>{BINNUMBER} { count(); yylval.intval=(int)strtol(yytext, 0, 2); return NUMBER; } +<SELECT>{DECNUMBER} { count(); yylval.intval=atoi(yytext); + yy_number_str=yytext; return NUMBER; } +<SELECT>{HEXNUMBER} { count(); yylval.intval=(int)strtol(yytext, 0, 16); + yy_number_str=yytext; return NUMBER; } +<SELECT>{OCTNUMBER} { count(); yylval.intval=(int)strtol(yytext, 0, 8); + yy_number_str=yytext; return NUMBER; } +<SELECT>{BINNUMBER} { count(); yylval.intval=(int)strtol(yytext, 0, 2); + yy_number_str=yytext; return NUMBER; } <INITIAL>{ATTR_MARK} { count(); state = ATTR_S; BEGIN(ATTR); return ATTR_MARK; } @@ -804,7 +810,8 @@ EAT_ABLE [\ \t\b\r] <ATTR>{LBRACK} { count(); return LBRACK; } <ATTR>{RBRACK} { count(); return RBRACK; } <ATTR>{STAR} { count(); return STAR; } -<ATTR>{DECNUMBER} { count(); yylval.intval=atoi(yytext);return NUMBER; } +<ATTR>{DECNUMBER} { count(); yylval.intval=atoi(yytext); + yy_number_str=yytext; return NUMBER; } <ATTR>{ID} { count(); addstr(&s_buf, yytext, yyleng); yylval.strval=s_buf.s; memset(&s_buf, 0, sizeof(s_buf)); @@ -814,26 +821,32 @@ EAT_ABLE [\ \t\b\r] } <INITIAL>{IPV6ADDR} { count(); yylval.strval=yytext; return IPV6ADDR; } -<INITIAL>{DECNUMBER} { count(); yylval.intval=atoi(yytext);return NUMBER; } +<INITIAL>{DECNUMBER} { count(); yylval.intval=atoi(yytext); + yy_number_str=yytext; return NUMBER; } <INITIAL>{HEXNUMBER} { count(); yylval.intval=(int)strtol(yytext, 0, 16); - return NUMBER; } + yy_number_str=yytext; return NUMBER; } <INITIAL>{OCTNUMBER} { count(); yylval.intval=(int)strtol(yytext, 0, 8); return NUMBER; } -<INITIAL>{BINNUMBER} { count(); yylval.intval=(int)strtol(yytext, 0, 2); return NUMBER; } -<INITIAL>{YES} { count(); yylval.intval=1; return NUMBER; } -<INITIAL>{NO} { count(); yylval.intval=0; return NUMBER; } +<INITIAL>{BINNUMBER} { count(); yylval.intval=(int)strtol(yytext, 0, 2); + yy_number_str=yytext; return NUMBER; } +<INITIAL>{YES} { count(); yylval.intval=1; + yy_number_str=yytext; return NUMBER; } +<INITIAL>{NO} { count(); yylval.intval=0; + yy_number_str=yytext; return NUMBER; } <INITIAL>{TCP} { count(); return TCP; } <INITIAL>{UDP} { count(); return UDP; } <INITIAL>{TLS} { count(); return TLS; } <INITIAL>{SCTP} { count(); return SCTP; } -<INITIAL>{INET} { count(); yylval.intval=AF_INET; return NUMBER; } +<INITIAL>{INET} { count(); yylval.intval=AF_INET; + yy_number_str=yytext; return NUMBER; } <INITIAL>{INET6} { count(); #ifdef USE_IPV6 yylval.intval=AF_INET6; #else yylval.intval=-1; /* no match*/ #endif - return NUMBER; } + yy_number_str=yytext; + return NUMBER; } <INITIAL>{SSLv23} { count(); yylval.strval=yytext; return SSLv23; } <INITIAL>{SSLv2} { count(); yylval.strval=yytext; return SSLv2; } <INITIAL>{SSLv3} { count(); yylval.strval=yytext; return SSLv3; } @@ -907,6 +920,10 @@ EAT_ABLE [\ \t\b\r] yylval.strval=s_buf.s; memset(&s_buf, 0, sizeof(s_buf)); return ID; } +<INITIAL>{NUM_ID} { count(); addstr(&s_buf, yytext, yyleng); + yylval.strval=s_buf.s; + memset(&s_buf, 0, sizeof(s_buf)); + return NUM_ID; } <SELECT>. { unput(yytext[0]); state = INITIAL_S; BEGIN(INITIAL); } /* Rescan the token in INITIAL state */ diff --git a/cfg.y b/cfg.y index 389b0cd..85eb9f7 100644 --- a/cfg.y +++ b/cfg.y @@ -180,6 +180,9 @@ extern int yylex(); +/* safer then using yytext which can be array or pointer */ +extern char* yy_number_str; + static void yyerror(char* s); static char* tmp; static int i_tmp; @@ -477,6 +480,7 @@ static void free_socket_id_lst(struct socket_id* i); /* values */ %token <intval> NUMBER %token <strval> ID +%token <strval> NUM_ID %token <strval> STRING %token <strval> IPV6ADDR @@ -501,7 +505,7 @@ static void free_socket_id_lst(struct socket_id* i); %type <action> action actions cmd fcmd if_cmd stm exp_stm assign_action %type <ipaddr> ipv4 ipv6 ipv6addr ip %type <ipnet> ipnet -%type <strval> host +%type <strval> host host_or_if host_if_id %type <strval> listen_id %type <name_l> listen_id_lst %type <name_l> listen_id2 @@ -582,7 +586,7 @@ listen_id: strncpy($$, $1, strlen($1)+1); } } - | host { + | host_or_if { if ($1){ $$=pkg_malloc(strlen($1)+1); if ($$==0) { @@ -1920,10 +1924,37 @@ host: } pkg_free($1); } - pkg_free($3); } | host DOT error { $$=0; pkg_free($1); yyerror("invalid hostname"); } ; + +host_if_id: ID + | NUM_ID + | NUMBER { $$=yy_number_str /* text version */; } + ; + +host_or_if: + host_if_id { $$=$1; } + | host_or_if host_sep host_if_id { + if ($1){ + $$=(char*)pkg_malloc(strlen($1)+1+strlen($3)+1); + if ($$==0) { + LOG(L_CRIT, "ERROR: cfg. parser: memory allocation" + " failure while parsing host/interface name\n"); + } else { + memcpy($$, $1, strlen($1)); + $$[strlen($1)]=*$2; + memcpy($$+strlen($1)+1, $3, strlen($3)); + $$[strlen($1)+1+strlen($3)]=0; + } + pkg_free($1); + } + } + | host_or_if host_sep error { $$=0; pkg_free($1); + yyerror("invalid host or interface name"); } + ; + + /* filtered cmd */ fcmd: cmd { @@ -2561,6 +2592,7 @@ func_param: extern int line; extern int column; extern int startcolumn; + static void warn(char* s) { LOG(L_WARN, "cfg. warning: (%d,%d-%d): %s\n", line, startcolumn, [View Less]

1 0

git:ser_core_cvs: tm: fifo access From fix
by Andrei Pelinescu-Onciul 17 Jul '09

17 Jul '09

Module: sip-router Branch: ser_core_cvs Commit: 2b038252c53ebf3e149249037983c4bad6827a04 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b03825… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 14 07:38:32 2009 +0000 tm: fifo access From fix Access the From header contents only if non-null. --- modules/tm/t_fifo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) … [View More]

1 0

git:ser_core_cvs: core: parse_headers flags fix
by Andrei Pelinescu-Onciul 17 Jul '09

17 Jul '09

Module: sip-router Branch: ser_core_cvs Commit: 418a2312875436ca0402f9b0b39831c6353f8403 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=418a231… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 14 07:40:17 2009 +0000 core: parse_headers flags fix Restore original flags after parse_headers was called with "next" (without restoring them, if parse_headers doesn't find again all … [View More]

1 0

git:ser_core_cvs: core: config parser listen fix
by Andrei Pelinescu-Onciul 17 Jul '09

17 Jul '09

Module: sip-router Branch: ser_core_cvs Commit: 06020e851fcab3b4cdec6b613170214606fbbfb0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=06020e8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 17 13:37:01 2009 +0000 core: config parser listen fix - do not crash when the listen=host line contains an invalid host (e.g. foo.1) - more null checks Reported-by: Cristian Constantin … [View More] cristian.constantin at iptel org --- cfg.y | 75 ++++++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 44 insertions(+), 31 deletions(-) diff --git a/cfg.y b/cfg.y index 8d552f9..389b0cd 100644 --- a/cfg.y +++ b/cfg.y @@ -556,18 +556,20 @@ statement: ; listen_id: ip { - tmp=ip_addr2a($1); - if (tmp==0) { - LOG(L_CRIT, "ERROR: cfg. parser: bad ip " - "address.\n"); - $$=0; - } else { - $$=pkg_malloc(strlen(tmp)+1); - if ($$==0) { - LOG(L_CRIT, "ERROR: cfg. parser: out of " - "memory.\n"); + if ($1){ + tmp=ip_addr2a($1); + if (tmp==0) { + LOG(L_CRIT, "ERROR: cfg. parser: bad ip " + "address.\n"); + $$=0; } else { - strncpy($$, tmp, strlen(tmp)+1); + $$=pkg_malloc(strlen(tmp)+1); + if ($$==0) { + LOG(L_CRIT, "ERROR: cfg. parser: out of " + "memory.\n"); + } else { + strncpy($$, tmp, strlen(tmp)+1); + } } } } @@ -581,12 +583,14 @@ listen_id: } } | host { - $$=pkg_malloc(strlen($1)+1); - if ($$==0) { - LOG(L_CRIT, "ERROR: cfg. parser: out of " - "memory.\n"); - } else { - strncpy($$, $1, strlen($1)+1); + if ($1){ + $$=pkg_malloc(strlen($1)+1); + if ($$==0) { + LOG(L_CRIT, "ERROR: cfg. parser: out of " + "memory.\n"); + } else { + strncpy($$, $1, strlen($1)+1); + } } } ; @@ -633,7 +637,7 @@ listen_phostport: id_lst: listen_phostport { $$=$1 ; } - | listen_phostport id_lst { $$=$1; $$->next=$2; } + | listen_phostport id_lst { $$=$1; if ($$) $$->next=$2; } ; flags_decl: FLAGS_DECL flag_list @@ -1300,7 +1304,8 @@ assign_stm: } free_socket_id_lst($3); } - | LISTEN EQUAL error { yyerror("ip address or hostname expected"); } + | LISTEN EQUAL error { yyerror("ip address, interface name or" + " hostname expected"); } | ALIAS EQUAL id_lst { for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next){ add_alias( lst_tmp->addr_lst->name, @@ -1314,8 +1319,10 @@ assign_stm: } | ALIAS EQUAL error { yyerror(" hostname expected"); } | ADVERTISED_ADDRESS EQUAL listen_id { - default_global_address.s=$3; - default_global_address.len=strlen($3); + if ($3){ + default_global_address.s=$3; + default_global_address.len=strlen($3); + } } | ADVERTISED_ADDRESS EQUAL error {yyerror("ip address or hostname expected"); } | ADVERTISED_PORT EQUAL NUMBER { @@ -1900,16 +1907,19 @@ host_sep: host: ID { $$=$1; } | host host_sep ID { - $$=(char*)pkg_malloc(strlen($1)+1+strlen($3)+1); - if ($$==0) { - LOG(L_CRIT, "ERROR: cfg. parser: memory allocation failure while parsing host\n"); - } else { - memcpy($$, $1, strlen($1)); - $$[strlen($1)]=*$2; - memcpy($$+strlen($1)+1, $3, strlen($3)); - $$[strlen($1)+1+strlen($3)]=0; + if ($1){ + $$=(char*)pkg_malloc(strlen($1)+1+strlen($3)+1); + if ($$==0) { + LOG(L_CRIT, "ERROR: cfg. parser: memory allocation" + " failure while parsing host\n"); + } else { + memcpy($$, $1, strlen($1)); + $$[strlen($1)]=*$2; + memcpy($$+strlen($1)+1, $3, strlen($3)); + $$[strlen($1)+1+strlen($3)]=0; + } + pkg_free($1); } - pkg_free($1); pkg_free($3); } | host DOT error { $$=0; pkg_free($1); yyerror("invalid hostname"); } @@ -2476,7 +2486,7 @@ cmd: LOG(L_CRIT, "ERROR: cfg. parser: out of memory.\n"); } else { str_tmp->s=$3; - str_tmp->len=strlen($3); + str_tmp->len=$3?strlen($3):0; $$=mk_action(SET_ADV_ADDR_T, 1, STR_ST, str_tmp); } } @@ -2569,6 +2579,7 @@ static void yyerror(char* s) static struct name_lst* mk_name_lst(char* host, int flags) { struct name_lst* l; + if (host==0) return 0; l=pkg_malloc(sizeof(struct name_lst)); if (l==0) { LOG(L_CRIT,"ERROR: cfg. parser: out of memory.\n"); @@ -2584,6 +2595,7 @@ static struct name_lst* mk_name_lst(char* host, int flags) static struct socket_id* mk_listen_id(char* host, int proto, int port) { struct socket_id* l; + if (host==0) return 0; l=pkg_malloc(sizeof(struct socket_id)); if (l==0) { LOG(L_CRIT,"ERROR: cfg. parser: out of memory.\n"); @@ -2618,6 +2630,7 @@ static struct socket_id* mk_listen_id2(struct name_lst* addr_l, int proto, int port) { struct socket_id* l; + if (addr_l==0) return 0; l=pkg_malloc(sizeof(struct socket_id)); if (l==0) { LOG(L_CRIT,"ERROR: cfg. parser: out of memory.\n"); [View Less]

1 0

git:ser_core_cvs: core: startup socket list fix
by Andrei Pelinescu-Onciul 17 Jul '09

17 Jul '09

Module: sip-router Branch: ser_core_cvs Commit: 786670ec30e349f79a4237a5bdcd0edc513ac234 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=786670e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jul 15 00:11:40 2009 +0000 core: startup socket list fix Fix crash on startup when dealing with consecutive duplicate socket ("listen") addresses. --- socket_info.c | 4 +++- 1 files … [View More]

1 0

git:ser_core_cvs: core: interface names in socket list port fix
by Andrei Pelinescu-Onciul 17 Jul '09

17 Jul '09

Module: sip-router Branch: ser_core_cvs Commit: 5e06f219ce6d3c0572c31cd5fe0efff004e596fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e06f21… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jul 15 00:12:03 2009 +0000 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 … [View More]

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2009