sr-dev

sr-dev@lists.kamailio.org

3 participants
45197 discussions

git:master: tls: warning fix
by Andrei Pelinescu-Onciul 28 May '09

28 May '09

Module: sip-router Branch: master Commit: d4fc2324bde2fbbdac7ffa3d484a175dbc107bcd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4fc232… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 28 20:56:18 2009 +0200 tls: warning fix - tls_h_nonblocking_write() commented out for now. --- modules/tls/tls_server.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 1054438..5516fed 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -800,6 +800,7 @@ again: +#if 0 /* not used for now */ /* nonblocking version */ int tls_h_nonblocking_write(struct tcp_connection *c, int fd, const char *buf, unsigned int len) @@ -852,7 +853,7 @@ error: end: return n; } - +#endif /*

1 0

git:andrei/to_parser_fix: core: to parser fix
by Andrei Pelinescu-Onciul 28 May '09

28 May '09

Module: sip-router Branch: andrei/to_parser_fix Commit: ac7dd1cc97757e60d3d8e0b52767e89e2caa61be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac7dd1c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 28 20:38:37 2009 +0200 core: to parser fix - parse parameters without value in To/From headers (e.g.: To: <sip:nils@invalid.com>;foo or To: <sip:nils@invalid.com>;foo= ). Parameters with an empty value ('=' followed by nothing) will have their value field pointing to en empty string (len==0, but s non-null), while parameters without a value (no '=') will point to a null string (len==0, s==0). - better handling of parameters at the end of the string Reported-and-tested-by: Nils Ohlmeier <nils(a)iptel.org> --- parser/parse_to.c | 68 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 48 insertions(+), 20 deletions(-) diff --git a/parser/parse_to.c b/parser/parse_to.c index a493820..a8f3883 100644 --- a/parser/parse_to.c +++ b/parser/parse_to.c @@ -188,16 +188,17 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end, case 0: switch (status) { -#ifndef NO_PINGTEL_TAG_HACK case TAG3: param->type = TAG_PARAM; - param->name.len = 3; + case PARA_NAME: + case TAG1: + case TAG2: + param->name.len = tmp-param->name.s; status = S_EQUAL; case S_EQUAL: case S_PARA_VALUE: saved_status=status; goto endofheader; -#endif case PARA_VALUE_TOKEN: status = E_PARA_VALUE; param->value.len = tmp-param->value.s; @@ -261,23 +262,21 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end, { case PARA_VALUE_QUOTED: break; -#ifndef NO_PINGTEL_TAG_HACK case TAG3: param->type = TAG_PARAM; - param->name.len = 3; + case PARA_NAME: + case TAG1: + case TAG2: + param->name.len = tmp-param->name.s; case S_EQUAL: + param->value.s = 0; + param->value.len = 0; + goto semicolon_add_param; case S_PARA_VALUE: - if (param->type==TAG_PARAM) - param->value.s = tmp; - else { - LOG( L_ERR , "ERROR: parse_to_param : unexpected " - "char [%c] in status %d: <<%.*s>> .\n", - *tmp,status, (int)(tmp-buffer), ZSW(buffer)); - goto error; - } -#endif + param->value.s = tmp; case PARA_VALUE_TOKEN: param->value.len=tmp-param->value.s; +semicolon_add_param: add_param(param,to_b); case E_PARA_VALUE: param = (struct to_param*) @@ -466,18 +465,47 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end, } }/*switch*/ }/*for*/ + if (!(status==F_CR || status==F_LF || status==F_CRLF)) + saved_status=status; endofheader: -#ifndef NO_PINGTEL_TAG_HACK - if (param->type==TAG_PARAM - && (saved_status==S_EQUAL||saved_status==S_PARA_VALUE) ) { - saved_status = E_PARA_VALUE; - param->value.s= 0; + switch(saved_status){ + case TAG3: + param->type = TAG_PARAM; /* tag at the end */ + /* no break */ + case PARA_NAME: + case TAG1: + case TAG2: + param->name.len = tmp-param->name.s; + /* no break */ + case S_EQUAL: + /* parameter without '=', e.g. foo */ + param->value.s=0; param->value.len=0; add_param(param, to_b); + saved_status=E_PARA_VALUE; + break; + case S_PARA_VALUE: + /* parameter with null value, e.g. foo= */ + param->value.s=tmp; + param->value.len=0; + add_param(param, to_b); + saved_status=E_PARA_VALUE; + break; + case PARA_VALUE_TOKEN: + param->value.len=tmp-param->value.s; + add_param(param, to_b); + saved_status=E_PARA_VALUE; + break; + case E_PARA_VALUE: + break; + default: + LOG( L_ERR , "ERROR: parse_to_param : unexpected end of header," + " status %d: <<%.*s>> .\n", + saved_status, (int)(tmp-buffer), ZSW(buffer)); + goto error; } -#endif *returned_status=saved_status; return tmp;

1 0

SF.net SVN: openser:[5861] branches/1.3/modules/carrierroute
by Henning Westerholt 28 May '09

28 May '09

Revision: 5861 http://openser.svn.sourceforge.net/openser/?rev=5861&view=rev Author: henningw Date: 2009-05-28 16:50:14 +0000 (Thu, 28 May 2009) Log Message: ----------- - fix one bigger SHM memory leak and a few small PKG leaks in DB error paths - patch from Timo Reimann, timo dot reimann at 1und1 dot de Modified Paths: -------------- branches/1.3/modules/carrierroute/carrier_tree.c branches/1.3/modules/carrierroute/route_db.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

[ openser-Bugs-2796454 ] Problems on 'kamctl' script on CR command
by SourceForge.net 28 May '09

28 May '09

Bugs item #2796454, was opened at 2009-05-25 11:35 Message generated for change (Comment added) made by egschubert You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2796454&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: tools Group: ver devel Status: Open Resolution: None Priority: 5 Private: No Submitted By: Edson - 4lists (egschubert) Assigned to: Nobody/Anonymous (nobody) Summary: Problems on 'kamctl' script on CR command Initial Comment: Just updated to the last SVN: ... Kamailio-151:~/sip-server # kamailio -V version: kamailio 1.5.1-notls (i386/linux) flags: STATISTICS, USE_IPV6, USE_TCP, USE_SCTP, DISABLE_NAGLE, USE_MCAST, SHM_MMAP, PKG_MALLOC, F_MALLOC, FAST_LOCK-ADAPTIVE_WAIT ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, PKG_SIZE 4194304 poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. svnrevision: 2:5858M @(#) $Id: main.c 5608 2009-02-13 16:48:17Z henningw $ main.c compiled on 11:09:12 May 25 2009 with gcc 4.3 And 'kamctl cr' says: ... cr addcarrier <carrier> <scan_prefix> <domain> <rewrite_host> ................ <prob> <strip> <rewrite_prefix> <rewrite_suffix> ............... <flags> <mask> <comment> .........................add a carrier ... But command: ... Kamailio-151:~/sip-server # kamctl cr addcarrier 1 0 2 X.X.X.X 1 1 123456 '' '' '' 'Output_Route_X123' Output_Route_X123 ERROR 1064 (42000) at line 1: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' Rota_de_saida_pelo_IPIPGW)' at line 1 ERROR: cr - SQL Error Kamailio-151:~/sip-server # On script 'kamctl', line 1357: if [ $# -gt 8 ] ; then COMMENT=$9 Edson. ---------------------------------------------------------------------- >Comment By: Edson - 4lists (egschubert) Date: 2009-05-28 12:15 Message: re-sending... ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2796454&group_…

1 0

devel mailing lists to be unified in sr-dev@lists.sip-router.org
by Daniel-Constantin Mierla 28 May '09

28 May '09

Hello, as both SIP Express Router (SER) and Kamailio (OpenSER) projects have now the sources in the same GIT repository hosted by http://sip-router.org, next week the devel lists specific for each project (serdev(a)lists.iptel.org and devel(a)lists.kamailio.org) will be unified with sr-dev(a)lists.sip-router.org. In this way, new commits to the code, discussions about present and future development versions will be in one place. Current ML addresses will be aliased to sr-dev(a)lists.sip-router.org, so they will still be reachable. The archives to the date will stay independent, new registration will be directed to sr-dev. The whole process should be transparent to all existing subscribers, however, if you experience downtime, please be patient a bit, but if the issues last for long time, please report to me. The planned time for migration is Monday/Tuesday next week. . Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

2 3

[ openser-Bugs-2797928 ] Segfaults in dialog_update_db
by SourceForge.net 28 May '09

28 May '09

Bugs item #2797928, was opened at 2009-05-28 15:54 Message generated for change (Tracker Item Submitted) made by axlh You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2797928&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Alex Hermann (axlh) Assigned to: Nobody/Anonymous (nobody) Summary: Segfaults in dialog_update_db Initial Comment: dialog_update_db() is very crashy. It doesn't do any sanity checks on pointers and as a consequence crashes a lot. I've seen at least 2 occasions at which is crashes: 1) Calling dlg_manage() on a non-invite message 2) Worse, on an invalid message. When a 200 OK is missing a contact header, I get error messages from populate_leg_info(): ERROR:dialog:populate_leg_info: bad sip message or missing Contact hdr ERROR:dialog:dlg_onreply: could not add further info to the dialog But afterwards dialog_update_db segfaults on an invalid bind_addr, from the backtrace: (gdb) bt #0 0xb783c41a in dialog_update_db (ticks=771000, param=0x0) at dlg_db_handler.c:629 #1 0x080a9726 in start_timer_processes () at timer.c:282 #2 0x08069b38 in main (argc=10, argv=0xbfc6f2d4) at main.c:816 Line 629 is for my version: SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); (gdb) bt full <snip> {type = DB_STR, nul = 0, free = -1282894544, val = {int_val = 178, ll_val = -5201380350948802382, double_val = -7.7990737395388139e-40, time_val = 178, string_val = 0xb2 "", str_val = {s = 0xb2 "", len = -1211040735}, blob_val = {s = 0xb2 "", len = -1211040735}, bitmap_val = 178}} <snip> ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2797928&group_…

1 0

git:master: * Changed hardcoded string "ser" in paths to "$(MAIN_NAME)".
by Juha Heinanen 28 May '09

28 May '09

Module: sip-router Branch: master Commit: 14a7d974e047ec6d45f65f7705a6c69079ac5689 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14a7d97… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu May 28 16:20:53 2009 +0300 * Changed hardcoded string "ser" in paths to "$(MAIN_NAME)". --- Makefile.defs | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 2c2f057..1491503 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -165,38 +165,38 @@ endif CC_EXTRA_OPTS ?= # dirs -cfg_dir = etc/ser/ +cfg_dir = etc/$(MAIN_NAME)/ bin_dir = sbin/ -share_dir = share/ser/ -# lib/ser/modules , lib/ser/modules-s, lib/ser/modules-k -modules_dir = lib/ser/ -lib_dir = lib/ser/ +share_dir = share/$(MAIN_NAME)/ +# lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s, lib/$(MAIN_NAME)/modules-k +modules_dir = lib/$(MAIN_NAME)/ +lib_dir = lib/$(MAIN_NAME)/ ifeq ($(OS), linux) - doc_dir = share/doc/ser/ + doc_dir = share/doc/$(MAIN_NAME)/ man_dir = share/man/ LOCALBASE ?= /usr/local else ifeq ($(OS), freebsd) - doc_dir = share/doc/ser/ + doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ LOCALBASE ?= /usr/local else ifeq ($(OS), openbsd) - doc_dir = share/doc/ser/ + doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ LOCALBASE ?= /usr/local else ifeq ($(OS), netbsd) - doc_dir = share/doc/ser + doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ LOCALBASE ?= /usr/pkg else ifeq ($(OS), darwin) - doc_dir = share/doc/ser/ + doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ LOCALBASE ?= /usr/local else - doc_dir = doc/ser/ + doc_dir = doc/$(MAIN_NAME)/ man_dir = man/ LOCALBASE ?= /usr/local endif

1 0

got quite far, but got stuck in modules_k/uac_redirect
by jh＠tutpro.com 28 May '09

28 May '09

while compiling modules that i use, i got the 3rd last, before compilation failed. -- juha make[2]: Entering directory `/usr/src/trunk-src/openxg-sip-router/modules_k/uac_redirect' ... gcc -fPIC -DPIC -g -O9 -funroll-loops -Wcast-align -minline-all-stringops -falign-loops -ftree-vectorize -mtune=athlon64 -Wall -DNAME='"ser"' -DVERSION='"2.1.0-dev23-make"' -DARCH='"i386"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.3.2"' -D__CPU_i386 -D__OS_linux -DSER_VER=2001000 -DCFG_DIR='"/usr/local/etc/ser/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DF_MALLOC -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -DUSE_SCTP -DOPENSER_MOD_INTERFACE -DMOD_NAME='"uac_redirect"' -c rd_funcs.c -o rd_funcs.o rd_funcs.c: In function ??get_redirect??: rd_funcs.c:65: error: ??struct cell?? has no member named ??first_branch?? rd_funcs.c:65: error: ??struct cell?? has no member named ??first_branch?? rd_funcs.c:65: error: ??struct cell?? has no member named ??first_branch?? rd_funcs.c:65: error: ??struct cell?? has no member named ??first_branch?? rd_funcs.c:65: error: ??struct cell?? has no member named ??first_branch?? rd_funcs.c:71: error: ??struct cell?? has no member named ??first_branch?? rd_funcs.c: In function ??shmcontact2dset??: rd_funcs.c:267: warning: passing argument 2 of ??append_branch?? from incompatible pointer type rd_funcs.c:275: error: too many arguments to function ??rd_acc_fct?? make[2]: *** [rd_funcs.o] Error 1

2 1

git:master: dialog (k): safety check of main_rt list boundaries
by Daniel-Constantin Mierla 28 May '09

28 May '09

Module: sip-router Branch: master Commit: 0e8978b8853d44f6de3fb0a2bfcf9eef2d543372 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e8978b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 28 12:31:10 2009 +0300 dialog (k): safety check of main_rt list boundaries --- modules_k/dialog/dlg_handlers.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 0ebb4b1..f03951b 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -964,7 +964,8 @@ void dlg_ontimeout( struct dlg_tl *tl) dlg = ((struct dlg_cell*)((char *)(tl) - (unsigned long)(&((struct dlg_cell*)0)->tl))); - if(dlg->toroute>0 && main_rt.rlist[dlg->toroute]!=NULL) + if(dlg->toroute>0 && dlg->toroute<main_rt.entries + && main_rt.rlist[dlg->toroute]!=NULL) { dlg_set_ctx_dialog(dlg); fmsg = faked_msg_next();

1 0

git:master: dialog (k): lookup the index of timeout route
by Daniel-Constantin Mierla 28 May '09

28 May '09

Module: sip-router Branch: master Commit: a4c2f8086781f27648b6796ed10a93b91103f6e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4c2f80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 28 12:26:13 2009 +0300 dialog (k): lookup the index of timeout route - sr can have str name for routes, therefore K mode is no longer valid --- modules_k/dialog/dlg_handlers.c | 2 +- modules_k/dialog/dlg_var.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 2b3d53d..0ebb4b1 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -964,7 +964,7 @@ void dlg_ontimeout( struct dlg_tl *tl) dlg = ((struct dlg_cell*)((char *)(tl) - (unsigned long)(&((struct dlg_cell*)0)->tl))); - if(dlg->toroute>0 && dlg->toroute<RT_NO) + if(dlg->toroute>0 && main_rt.rlist[dlg->toroute]!=NULL) { dlg_set_ctx_dialog(dlg); fmsg = faked_msg_next(); diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index 588e231..48710e5 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -20,6 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "../../route.h" + #include "dlg_var.h" dlg_ctx_t _dlg_ctx; @@ -68,6 +70,8 @@ int pv_set_dlg_ctx(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { int n; + char *rtp; + if(param==NULL) return -1; @@ -88,7 +92,17 @@ int pv_set_dlg_ctx(struct sip_msg* msg, pv_param_t *param, _dlg_ctx.to_bye = n; break; case 4: - _dlg_ctx.to_route = n; + if(val->flags&PV_VAL_STR) { + if(val->rs.s[val->rs.len]=='\0') + _dlg_ctx.to_route = route_lookup(&main_rt, val->rs.s); + else _dlg_ctx.to_route = 0; + } else { + if(n!=0) { + rtp = int2str(n, NULL); + _dlg_ctx.to_route = route_lookup(&main_rt, rtp); + } else _dlg_ctx.to_route = 0; + } + if(_dlg_ctx.to_route <0) _dlg_ctx.to_route = 0; break; default: _dlg_ctx.on = n;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev