sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

CVS:commitlog: sip_router NEWS sctp_options.c sctp_server.c sctp_server.h
by Andrei Pelinescu-Onciul 29 May '09

29 May '09

andrei 2009/05/29 10:42:30 CEST SER CVS Repository Modified files: . NEWS sctp_options.c sctp_server.c sctp_server.h Log: sctp: sctp autoclose can now be changed at runtime sctp_autoclose can now be changed at runtime, but it will affect only new associations (autoclose for the pre-existing ones will not be changed). E.g.: $ sercmd cfg.set_now_int sctp autoclose 120 Revision Changes Path 1.103 +8 -5 sip_router/NEWS http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/NEWS.diff?r1=1.102… 1.6 +37 -2 sip_router/sctp_options.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_options.c.dif… 1.26 +18 -1 sip_router/sctp_server.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_server.c.diff… 1.5 +3 -1 sip_router/sctp_server.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_server.h.diff…

1 0

git:master: makefile: enable K STATISTICS def if KMSTATS=1
by Daniel-Constantin Mierla 29 May '09

29 May '09

Module: sip-router Branch: master Commit: 6343018d50f9b88024ccf64729185d6ffd49e621 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6343018… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 28 15:30:54 2009 +0300 makefile: enable K STATISTICS def if KMSTATS=1 --- Makefile.defs | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 1491503..623c318 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -517,6 +517,9 @@ endif ifeq ($(TLS_HOOKS), 1) C_DEFS+= -DUSE_TLS -DTLS_HOOKS endif +ifeq ($(KMSTATS), 1) + C_DEFS+= -DSTATISTICS +endif ifneq ($(STUN),) C_DEFS+= -DUSE_STUN

1 0

git:master: uac_redirect: module compiles now with sr
by Daniel-Constantin Mierla 29 May '09

29 May '09

Module: sip-router Branch: master Commit: 2d278ad3bb3a70cb4ff00648254e8786c5f72015 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d278ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 28 15:29:24 2009 +0300 uac_redirect: module compiles now with sr --- modules_k/uac_redirect/rd_funcs.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modules_k/uac_redirect/rd_funcs.c b/modules_k/uac_redirect/rd_funcs.c index 295e36d..ef92fcb 100644 --- a/modules_k/uac_redirect/rd_funcs.c +++ b/modules_k/uac_redirect/rd_funcs.c @@ -53,6 +53,7 @@ int get_redirect( struct sip_msg *msg , int maxt, int maxb, int cts_added; int n; int i; + int first_branch; /* get transaction */ t = rd_tmb.t_gett(); @@ -61,14 +62,22 @@ int get_redirect( struct sip_msg *msg , int maxt, int maxb, LM_CRIT("no current transaction found\n"); goto error; } + for(first_branch=t->nr_of_outgoings-1; first_branch>=0; first_branch--) + if(t->uac[first_branch].flags&TM_UAC_FLAG_FB) + break; + if(first_branch<0) + { + LM_CRIT("no current first branch found\n"); + goto error; + } - LM_DBG("resume branch=%d\n", t->first_branch); + LM_DBG("resume branch=%d\n", first_branch); cts_added = 0; /* no contact added */ backup_uri = msg->new_uri; /* shmcontact2dset will ater this value */ /* look if there are any 3xx branches starting from resume_branch */ - for( i=t->first_branch ; i<t->nr_of_outgoings ; i++) { + for( i=first_branch ; i<t->nr_of_outgoings ; i++) { LM_DBG("checking branch=%d (added=%d)\n", i, cts_added); /* is a redirected branch? */ if (t->uac[i].last_received<300 || t->uac[i].last_received>399) @@ -264,7 +273,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, /* add the sortet contacts as branches in dset and log this! */ for ( i=0 ; i<n ; i++ ) { LM_DBG("adding contact <%.*s>\n", scontacts[i]->uri.len, scontacts[i]->uri.s); - if (append_branch( 0, &scontacts[i]->uri, 0, 0, sqvalues[i], bflags, 0)<0) { + if (km_append_branch( 0, &scontacts[i]->uri, 0, 0, sqvalues[i], bflags, 0)<0) { LM_ERR("failed to add contact to dset\n"); } else { added++; @@ -272,7 +281,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, /* log the redirect */ req->new_uri = scontacts[i]->uri; //FIXME - rd_acc_fct( req, (char*)reason, acc_db_table, NULL, NULL, NULL, NULL); + rd_acc_fct( req, (char*)reason, acc_db_table); } } }

1 0

git:master: kex: implemented shmem:* K statistics
by Daniel-Constantin Mierla 29 May '09

29 May '09

Module: sip-router Branch: master Commit: b306eb10e6943e7ab9b973f18734b9c9c719fcad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b306eb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 28 15:32:00 2009 +0300 kex: implemented shmem:* K statistics - shared memory related statistics are now implemented in kex module --- modules_k/kex/core_stats.c | 73 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 70 insertions(+), 3 deletions(-) diff --git a/modules_k/kex/core_stats.c b/modules_k/kex/core_stats.c index b72fa0e..d46cb0d 100644 --- a/modules_k/kex/core_stats.c +++ b/modules_k/kex/core_stats.c @@ -37,6 +37,9 @@ #include "../../lib/kcore/statistics.h" #include "../../lib/kmi/mi.h" #include "../../dprint.h" +#include "../../timer.h" +#include "../../mem/meminfo.h" +#include "../../mem/shm_mem.h" #ifdef STATISTICS @@ -70,6 +73,23 @@ stat_export_t core_stats[] = { {0,0,0} }; +unsigned long shm_stats_get_size(void); +unsigned long shm_stats_get_used(void); +unsigned long shm_stats_get_rused(void); +unsigned long shm_stats_get_mused(void); +unsigned long shm_stats_get_free(void); +unsigned long shm_stats_get_frags(void); + +stat_export_t shm_stats[] = { + {"total_size" , STAT_IS_FUNC, (stat_var**)shm_stats_get_size }, + {"used_size" , STAT_IS_FUNC, (stat_var**)shm_stats_get_used }, + {"real_used_size" , STAT_IS_FUNC, (stat_var**)shm_stats_get_rused }, + {"max_used_size" , STAT_IS_FUNC, (stat_var**)shm_stats_get_mused }, + {"free_size" , STAT_IS_FUNC, (stat_var**)shm_stats_get_free }, + {"fragments" , STAT_IS_FUNC, (stat_var**)shm_stats_get_frags }, + {0,0,0} +}; + static struct mi_root *mi_get_stats(struct mi_root *cmd, void *param); static struct mi_root *mi_reset_stats(struct mi_root *cmd, void *param); @@ -82,7 +102,7 @@ static mi_export_t mi_stat_cmds[] = { int register_mi_stats(void) { /* register MI commands */ - if (register_mi_mod( "statistics", mi_stat_cmds)<0) { + if (register_mi_mod( "core", mi_stat_cmds)<0) { LM_ERR("unable to register MI cmds\n"); return -1; } @@ -95,13 +115,11 @@ int register_core_stats(void) LM_ERR("failed to register core statistics\n"); return -1; } -#if 0 /* register sh_mem statistics */ if (register_module_stats( "shmem", shm_stats)!=0 ) { LM_ERR("failed to register sh_mem statistics\n"); return -1; } -#endif return 0; } @@ -244,4 +262,53 @@ static struct mi_root *mi_reset_stats(struct mi_root *cmd, void *param) return rpl_tree; } +/*** shm stats ***/ + +static struct mem_info _stats_shm_mi; +static ticks_t _stats_shm_tm = 0; +void stats_shm_update(void) +{ + ticks_t t; + t = get_ticks(); + if(t!=_stats_shm_tm) { + shm_info(&_stats_shm_mi); + _stats_shm_tm = t; + } +} +unsigned long shm_stats_get_size(void) +{ + stats_shm_update(); + return _stats_shm_mi.total_size; +} + +unsigned long shm_stats_get_used(void) +{ + stats_shm_update(); + return _stats_shm_mi.used; +} + +unsigned long shm_stats_get_rused(void) +{ + stats_shm_update(); + return _stats_shm_mi.real_used; +} + +unsigned long shm_stats_get_mused(void) +{ + stats_shm_update(); + return _stats_shm_mi.max_used; +} + +unsigned long shm_stats_get_free(void) +{ + stats_shm_update(); + return _stats_shm_mi.free; +} + +unsigned long shm_stats_get_frags(void) +{ + stats_shm_update(); + return _stats_shm_mi.total_frags; +} + #endif

1 0

git:master: core: remove compile-time warning about K statistics
by Daniel-Constantin Mierla 29 May '09

29 May '09

Module: sip-router Branch: master Commit: a6e3cd19e5bad2b819a7584dabe5f03f7a8fad0b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6e3cd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 28 15:29:57 2009 +0300 core: remove compile-time warning about K statistics - all statistics but core:* from K are now available --- statistics.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/statistics.h b/statistics.h index 2e7917a..e9e430a 100644 --- a/statistics.h +++ b/statistics.h @@ -30,8 +30,4 @@ #include "lib/kcore/statistics.h" -#ifdef STATISTICS -#warning "sorry sip-router does not support all STATISTICS" -#endif - #endif /* _STATISTICS_H_ */

1 0

git:master: tm: mark first branch in a fwd step
by Daniel-Constantin Mierla 29 May '09

29 May '09

Module: sip-router Branch: master Commit: 7718bd4d601526179fc82df683d1e2b0af0b837b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7718bd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 28 15:26:36 2009 +0300 tm: mark first branch in a fwd step - a flag is used to mark the uac_client that is first in current destination set --- modules/tm/h_table.h | 1 + modules/tm/t_fwd.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index dd18820..d6c36e4 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -199,6 +199,7 @@ typedef struct ua_server /* UAC internal flags */ #define TM_UAC_FLAG_RR 1 /* Record-Route applied */ #define TM_UAC_FLAG_R2 2 /* 2nd Record-Route applied */ +#define TM_UAC_FLAG_FB 4 /* Mark first entry in new branch set */ #endif typedef struct ua_client diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 97b36c2..01a3699 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1115,6 +1115,12 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , ser_error=lowest_ret; return lowest_ret; } + +#ifdef TM_UAC_FLAGS + /* mark the fist branch in this fwd step */ + t->uac[first_branch].flags |= TM_UAC_FLAG_FB; +#endif + ser_error=0; /* clear branch adding errors */ /* send them out now */ success_branch=0;

1 0

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

29 May '09

Bugs item #2796454, was opened at 2009-05-25 14:35 Message generated for change (Comment added) made by henningw 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 1.5.x >Status: Closed >Resolution: Fixed Priority: 5 Private: No Submitted By: Edson - 4lists (egschubert) >Assigned to: Henning Westerholt (henningw) 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: Henning Westerholt (henningw) Date: 2009-05-29 07:40 Message: Hi Edson, thanks for the report. Indeed the order of inserted data was not consistent to the help output, should be fixed now. Please keep in mind that if you specify the flags as empty strings '' the statement will also not work, use 0 instead. ./kamctl cr addcarrier 1 0 2 X.X.X.X 1 1 123456 '' '0' '0' 'Output_Route_X123' Henning ---------------------------------------------------------------------- Comment By: Edson - 4lists (egschubert) Date: 2009-05-28 15:15 Message: re-sending... ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2796454&group_…

1 0

SF.net SVN: openser:[5862] branches/1.5/scripts/kamctl
by Henning Westerholt 29 May '09

29 May '09

Revision: 5862 http://openser.svn.sourceforge.net/openser/?rev=5862&view=rev Author: henningw Date: 2009-05-29 07:37:12 +0000 (Fri, 29 May 2009) Log Message: ----------- - fix bug #2796454, wrong order of inserted data in kamctl command Modified Paths: -------------- branches/1.5/scripts/kamctl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:master: * tls_config.c didn't compile due to extra }.
by Juha Heinanen 29 May '09

29 May '09

Module: sip-router Branch: master Commit: 9de27eba9c93eb924a8960e3abc6a787220a7267 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9de27eb… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 29 09:39:30 2009 +0300 * tls_config.c didn't compile due to extra }. --- modules/tls/tls_config.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_config.c b/modules/tls/tls_config.c index 5dbd4c5..740c9be 100644 --- a/modules/tls/tls_config.c +++ b/modules/tls/tls_config.c @@ -204,7 +204,6 @@ static int parse_hostport(int* type, struct ip_addr* ip, unsigned int* port, " support)\n", st->file, t.start.line, t.start.col); return -1; - } #endif /* USE_IPV6 */ } else if (t.type == CFG_TOKEN_ALPHA) { opt = cfg_lookup_token(token_default, &t.val);

1 0

[ openser-Bugs-2798154 ] [dialog] Crash when receiving empry "Record-Route"
by SourceForge.net 29 May '09

29 May '09

Bugs item #2798154, was opened at 2009-05-29 00:30 Message generated for change (Comment added) made by ibc_sf You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2798154&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: None Status: Open Resolution: None Priority: 4 Private: No Submitted By: Iñaki Baz Castillo (ibc_sf) Assigned to: Nobody/Anonymous (nobody) Summary: [dialog] Crash when receiving empry "Record-Route" Initial Comment: Kamailio 1.5 rev 5834. I use 'dialog" module and "uac" module (this one to change From username). Kamailio receives an INVITE, changes From (so addes a long "vsf" parameter to Record-Route) and forwards it to a gateway. The gateway replies 183 and 200 containing a "Record-Route" with no value (empty). Then Kamailio shows this error and crashes: ERROR:core:print_rr_body: failed to parse RR ERROR:dialog:populate_leg_info: failed to print route records ERROR:dialog:dlg_onreply: could not add further info to the dialog CRITICAL:core:receive_fd: EOF on 12 INFO:core:handle_sigs: child process 4505 exited by a signal 11 INFO:core:handle_sigs: core was not generated INFO:core:handle_sigs: terminating due to SIGCHLD INFO:core:sig_usr: signal 15 received I attach the output of the coredump and also the SIP trace showing it. ---------------------------------------------------------------------- >Comment By: Iñaki Baz Castillo (ibc_sf) Date: 2009-05-29 08:28 Message: Note that the crash also occur with: modparam("dialog", "db_mode", 0) This is: without storing dialogs in database. ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-05-29 08:20 Message: Seems similar to what Alex Hermann reported in #2797928. I will check. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2798154&group_…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009