sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

[tracker] Task closed: modules_s/domain should export is_local API function

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#9 - modules_s/domain should export is_local API function User who did this - Juha Heinanen (jh) Reason for closing: Fixed Additional comments about closing: Jan included is_domain_local API function to modules_s/domain. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=9 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

RegExp RURI matching broken?!

by Nils Ohlmeier

Hi, when I try to use a regexp matching for the RURI like this (code is git master): if (uri =~ "sip:\+[0-9]+@.*") { and then send a request with an RURI like this: sip:+123456789@127.0.0.1 I get the following error message: 2(85781) : <core> [route.c:1190]: BUG: comp_str: Bad operator type 1, for ~= and the if statement is obviously not executed?! Ideas, comments and even more bug fixes are welcome :-) Regards Nils

15 years, 6 months

CVS:commitlog: sip_router cfg.y

by Andrei Pelinescu-Onciul

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…

15 years, 6 months

git:master: Merge commit 'origin/ser_core_cvs'

by Andrei Pelinescu-Onciul

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 socket list port fix core: startup socket list fix core: parse_headers flags fix tm: fifo access From fix cfg framework: fix the group handles in the main process Conflicts: cfg.lex cfg.y ---

15 years, 6 months

git:master: core: config parser minor fix

by Andrei Pelinescu-Onciul

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 last merge) --- cfg.y | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/cfg.y b/cfg.y index a70c56c..51df90e 100644 --- a/cfg.y +++ b/cfg.y @@ -1932,6 +1932,7 @@ host: } pkg_free($1); } + if ($3) pkg_free($3); } | host MINUS ID { if ($1){ @@ -1947,6 +1948,7 @@ host: } pkg_free($1); } + if ($3) pkg_free($3); } | host DOT error { $$=0; pkg_free($1); yyerror("invalid hostname"); } | host MINUS error { $$=0; pkg_free($1); yyerror("invalid hostname"); } @@ -1954,7 +1956,12 @@ host: host_if_id: ID | NUM_ID - | NUMBER { $$=yy_number_str /* text version */; } + | NUMBER { + /* get string version */ + $$=pkg_malloc(strlen(yy_number_str)+1); + if ($$) + strcpy($$, yy_number_str); + } ; host_or_if: @@ -1973,6 +1980,7 @@ host_or_if: } pkg_free($1); } + if ($3) pkg_free($3); } | host_or_if MINUS host_if_id { if ($1){ @@ -1988,6 +1996,7 @@ host_or_if: } pkg_free($1); } + if ($3) pkg_free($3); } | host_or_if DOT error { $$=0; pkg_free($1); yyerror("invalid host or interface name"); }

15 years, 6 months

git:master: Merge commit 'origin/ser_modules'

by Andrei Pelinescu-Onciul

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 & to header access rr: fix from header access ---

15 years, 6 months

git:ser_core_cvs: cfg framework: fix the group handles in the main process

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: c0f12714391fa6b359cceaed22ed238ba5387457 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0f1271… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jul 13 15:13:12 2009 +0000 cfg framework: fix the group handles in the main process (backport from GIT) The main process does not have a local configuration, it has access only to the config values that were set before forking. As a result, the group handles cannot ponint to the shared memory address because the shared memory block may be freed later by one of the child processes. This problem resulted sometimes in a core dump after the processes were killed when the main process tried to access a variable from shared mem which was no longer available. --- cfg/cfg_script.c | 1 - cfg/cfg_struct.c | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cfg/cfg_script.c b/cfg/cfg_script.c index 39a4068..8804e40 100644 --- a/cfg/cfg_script.c +++ b/cfg/cfg_script.c @@ -143,7 +143,6 @@ error: /* fix-up the dynamically declared group: * - allocate memory for the arrays * - set the values within the memory block - * - notify the drivers about the new group */ int cfg_script_fixup(cfg_group_t *group, unsigned char *block) { diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index fe7d8d6..966443e 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -194,21 +194,23 @@ int cfg_shmize(void) /* clone the strings to shm mem */ if (cfg_shmize_strings(group)) goto error; - /* copy the values to the new block, - and update the module's handle */ + /* copy the values to the new block */ memcpy(block->vars+group->offset, group->vars, group->size); - *(group->handle) = block->vars+group->offset; } else { /* The group was declared with NULL values, * we have to fix it up. * The fixup function takes care about the values, * it fills up the block */ if (cfg_script_fixup(group, block->vars+group->offset)) goto error; - *(group->handle) = block->vars+group->offset; - /* notify the drivers about the new config definition */ + /* Notify the drivers about the new config definition. + * Temporary set the group handle so that the drivers have a chance to + * overwrite the default values. The handle must be reset after this + * because the main process does not have a local configuration. */ + *(group->handle) = block->vars+group->offset; cfg_notify_drivers(group->name, group->name_len, group->mapping->def); + *(group->handle) = NULL; } } /* try to fixup the selects that failed to be fixed-up previously */

15 years, 6 months

git:ser_core_cvs: core: interface names in socket list port fix

by Andrei Pelinescu-Onciul

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 (e.g. -l eth0:5070 or -l udp:eth1:5062). --- socket_info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/socket_info.c b/socket_info.c index 46a57f5..0fc0c8f 100644 --- a/socket_info.c +++ b/socket_info.c @@ -870,7 +870,7 @@ static int addr_info_to_si_lst(struct addr_info* ai_lst, unsigned short port, struct addr_info* ail; for (ail=ai_lst; ail; ail=ail->next){ - if(new_sock2list(ail->name.s, 0, port_no, proto, ail->flags | flags, + if(new_sock2list(ail->name.s, 0, port, proto, ail->flags | flags, list)==0) return -1; } @@ -892,7 +892,7 @@ static int addr_info_to_si_lst_after(struct addr_info* ai_lst, struct socket_info* new_si; for (ail=ai_lst; ail; ail=ail->next){ - if((new_si=new_sock2list_after(ail->name.s, 0, port_no, proto, + if((new_si=new_sock2list_after(ail->name.s, 0, port, proto, ail->flags | flags, el))==0) return -1; el=new_si;

15 years, 6 months

git:ser_core_cvs: core: startup socket list fix

by Andrei Pelinescu-Onciul

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 changed, 3 insertions(+), 1 deletions(-) diff --git a/socket_info.c b/socket_info.c index 1b260dd..46a57f5 100644 --- a/socket_info.c +++ b/socket_info.c @@ -1077,7 +1077,9 @@ static int fix_socket_list(struct socket_info **list, int* type_flags) ) add_alias(del_si->name.s, del_si->name.len, l->port_no, l->proto); - + /* make sure next_si doesn't point to del_si */ + if (del_si==next_si) + next_si=next_si->next; /* remove del_si*/ sock_listrm(list, del_si); free_sock_info(del_si);

15 years, 6 months

git:ser_core_cvs: core: config parser listen fix

by Andrei Pelinescu-Onciul

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 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");

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