sr-dev May 2011

sr-dev@lists.kamailio.org

28 participants
166 discussions

[tracker] Comment added: Debian / Ubuntu Packages for Kamailio 3.1.3 Broken
by sip-router 04 May '11

04 May '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#128 - Debian / Ubuntu Packages for Kamailio 3.1.3 Broken User who did this - Florian Friedrich (FloFri) ---------- It looks like this Bug is still present in all of the latest lucid-builds (3.1.3+lucid2, 3.2 and latest nightly) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=128#comment208 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.

1 0

git:carstenbock/ims: presence modules: removed invalid lib path
by Carsten Bock 03 May '11

03 May '11

Module: sip-router Branch: carstenbock/ims Commit: 84b92c64525be08c395eaf0bfe467971ed1f365a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=84b92c6… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue May 3 11:06:39 2011 +0200 presence modules: removed invalid lib path - invalid /usr/include/lib was removed from lib path --- modules_k/presence_reginfo/Makefile | 2 +- modules_k/pua_reginfo/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/presence_reginfo/Makefile b/modules_k/presence_reginfo/Makefile index 8496529..669917b 100644 --- a/modules_k/presence_reginfo/Makefile +++ b/modules_k/presence_reginfo/Makefile @@ -9,7 +9,7 @@ auto_gen= NAME=presence_reginfo.so DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/pua_reginfo/Makefile b/modules_k/pua_reginfo/Makefile index a122fe4..d67aa37 100644 --- a/modules_k/pua_reginfo/Makefile +++ b/modules_k/pua_reginfo/Makefile @@ -12,7 +12,7 @@ LIBS= DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE

1 0

Fwd: crash & 100% CPU usage problem with kamailio 3.1.2
by Zunnun 02 May '11

02 May '11

---------- Forwarded message ---------- From: Zunnun <zunnun(a)gmail.com> Date: Wed, Mar 30, 2011 at 10:51 AM Subject: crash & 100% CPU usage problem with kamailio 3.1.2 To: sr-dev(a)lists.sip-router.org *kamailio 3.1.2 issues* *Problem 1:* Running heavy stress (for few hours), we have seen 100 % CPU usage Reason: the linked list is circular. next pointer points itself & the loop never breaks. file: tcp_main.c function: inline static int _tcpconn_add_alias_unsafe(struct tcp_connection* c, int port,struct ip_addr* l_ip, int l_port,int flags) for (a=tcpconn_aliases_hash[hash], nxt=0; a; a=nxt){ nxt=a->next; here a->next points to a & loop never breaks *Problem 2: * kamailio process terminates (heavy stress for over 24 hours) Reason: it calls abort() file: tcp_main.c function inline static int tcpconn_chld_put(struct tcp_connection* tcpconn) { if (unlikely(atomic_dec_and_test(&tcpconn->refcnt))){ DBG("tcpconn_chld_put: destroying connection %p (%d, %d) " "flags %04x\n", tcpconn, tcpconn->id, tcpconn->s, tcpconn->flags); /* sanity checks */ membar_read_atomic_op(); /* make sure we see the current flags */ if (unlikely(!(tcpconn->flags & F_CONN_FD_CLOSED) || (tcpconn->flags & (F_CONN_HASHED|F_CONN_MAIN_TIMER| F_CONN_READ_W|F_CONN_WRITE_W)) )){ LOG(L_CRIT, "BUG: tcpconn_chld_put: %p bad flags = %0x\n", tcpconn, tcpconn->flags); abort(); //CALLS abort } _tcpconn_free(tcpconn); /* destroys also the wbuf_q if still present*/ return 1; } return 0; } *Problem 3: * kamailio crashed (heavy stress, seen it twice after 4 days 8 hours) Reason: Circular link list is bad, prev pointer is NULL & kamailio access it #0 local_timer_list_expire (lt=0x82eea0, saved_ticks=1295476481) at local_timer.c:221 221 _timer_rm_list(tl); /* detach */ (gdb) bt #0 local_timer_list_expire (lt=0x82eea0, saved_ticks=1295476481) at local_timer.c:221 #1 local_timer_expire (lt=0x82eea0, saved_ticks=1295476481) at local_timer.c:250 #2 local_timer_run (lt=0x82eea0, saved_ticks=1295476481) at local_timer.c:274 #3 0x0000000000510c3e in tcp_timer_run () at tcp_main.c:4384 #4 tcp_main_loop () at tcp_main.c:4564 #5 0x0000000000469eba in main_loop () at main.c:1641 #6 0x000000000046c04f in main (argc=<value optimized out>, argv=0x7fff3d28a3c8) at main.c:2398 (gdb) print tl $1 = <value optimized out> (gdb) print h $2 = (struct timer_head *) 0x855eb8 (gdb) print *h $3 = {next = 0x0, prev = 0x2acbac5398b8} (gdb) print *h->prev $4 = {next = 0x0, prev = 0x855eb8, expire = 1295476481, initial_timeout = 1920, data = 0x2acbac5397d0, f = 0x4f8310 <tcpconn_main_timeout>, flags = 512, slow_idx = 0} (gdb) once prev pointer was NULL & next crash next pointer was NULL *Problem 4:* kamailio process terminated (heavy stress, found it twice, after 16 hours) Reason: it calls abort() file : mem/q_malloc.c function void qm_free(struct qm_block* qm, void* p) partial code: #ifdef DBG_QM_MALLOC qm_debug_frag(qm, f); if (f->u.is_free){ LOG(L_CRIT, "BUG: qm_free: freeing already freed pointer," " first free: %s: %s(%ld) - aborting\n", f->file, f->func, f->line); abort(); //CALLS ABORT } MDBG("qm_free: freeing frag. %p alloc'ed from %s: %s(%ld)\n", f, f->file, f->func, f->line); #endif *problem 5*: infinite loop - log file is full of these messages 100% CPU at that time /kamailio[21562]: : <core> [io_wait.h:617]: BUG: io_watch_del: invalid fd -1, not in [0, 2) //kamailio[21562]: : <core> [tcp_read.c:1218]: ERROR: tcpconn_receive: handle_io: io_watch_del failed for 0x2acbac5397d0

2 3

[tracker] Comment added: Segfault parsing STUN body
by sip-router 02 May '11

02 May '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#129 - Segfault parsing STUN body User who did this - Francesco Castellano (fcastellano) ---------- Andrei, I'm sorry but we're unable to test the fix on our production server. As soon as I'll be able to replicate it on our test server, I'll update you. Best regards, Francesco Castellano ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=129#comment207 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.

1 0

New module ipops
by Iñaki Baz Castillo 02 May '11

02 May '11

Hi, I've commited a new module named 'ipops' which provides operations with IPv4 and IPv6: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5940394… The README describes the module functions: http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules/… The module has no dependecies on other siprouter modules or external libraries, so if it's ok for you it could be enabled by default. Cheers. -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 1

git:master: sdpops: added sdpops_remove_codecs_by_name(list)
by Daniel-Constantin Mierla 01 May '11

01 May '11

Module: sip-router Branch: master Commit: e8ae4acb4e8f7b13606aaf16ec89d2a6e37959fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8ae4ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 1 17:36:38 2011 +0200 sdpops: added sdpops_remove_codecs_by_name(list) - it takes as parameter a csv list with codec names - works for now with codecs that have ID assigned by IANA, the rest will follow --- modules/sdpops/README | 47 ++++++++++---- modules/sdpops/doc/sdpops_admin.xml | 26 +++++++ modules/sdpops/sdpops_data.c | 124 ++++++++++++++++++++++++++++++++++- modules/sdpops/sdpops_data.h | 5 +- modules/sdpops/sdpops_mod.c | 80 +++++++++++++++-------- 5 files changed, 240 insertions(+), 42 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e8a…

1 0

git:master: htable: readme was regenerated
by Daniel-Constantin Mierla 01 May '11

01 May '11

Module: sip-router Branch: master Commit: ca91d71fd177ca9d40528c8f497a1ba789d16abf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca91d71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 1 15:11:34 2011 +0200 htable: readme was regenerated --- modules_k/htable/README | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules_k/htable/README b/modules_k/htable/README index 83f2cec..02a527d 100644 --- a/modules_k/htable/README +++ b/modules_k/htable/README @@ -11,7 +11,7 @@ Elena-Ramona Modroiu <ramona(a)rosdev.ro> - Copyright © 2008-2011 http://www.asipto.com + Copyright � 2008-2011 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -130,7 +130,7 @@ Chapter 1. Admin Guide You can read more about hash tables at: http://en.wikipedia.org/wiki/Hash_table. - The “name” can be a static string or can include pseudo- variables that + The "name" can be a static string or can include pseudo- variables that will be replaced at runtime. Example 1.1. Accessing $sht(htname=>key) @@ -153,7 +153,7 @@ $sht(a=>$ci::srcip) = $si; the failed authentications per user and one for storing the time of last authentication attempt. To ensure unique name per user, the hash table uses a combination of authentication username and text - “::auth_count” and “::last_auth”. + "::auth_count" and "::last_auth". Example 1.2. Dictionary attack limitation ... @@ -268,6 +268,8 @@ if(is_present_hf("Authorization")) database table when the SIP server is stopped (i.e., ensure persistency over restarts). Default value is 0 (no write back to db table). + * initval - the integer value to be returned insted of $null when a + requested key is not set. Default value is NULL. @@ -275,6 +277,7 @@ if(is_present_hf("Authorization")) ... modparam("htable", "htable", "a=>size=4;autoexpire=7200;dbtable=htable_a;") modparam("htable", "htable", "b=>size=5;") +modparam("htable", "htable", "c=>size=4;autoexpire=7200;initval=1;") ... 3.2. db_url (str) @@ -427,6 +430,10 @@ sht_rm_value_re("ha=>.*"); * $sht(htable=>key) * $shtex(htable=>key) + * $shtcn(htable=>key) + * $shtcv(htable=>key) + * $shtinc(htable=>key) + * $shtval(htable=>key) Exported pseudo-variables are documented at http://www.kamailio.org/dokuwiki/.

1 0

git:master: htable: added missing PVs to short listing in the docs
by Daniel-Constantin Mierla 01 May '11

01 May '11

Module: sip-router Branch: master Commit: 35eff4462cb1907a09603c7911e7e38aeab33210 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35eff44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 30 19:54:46 2011 +0200 htable: added missing PVs to short listing in the docs --- modules_k/htable/doc/htable_admin.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/doc/htable_admin.xml b/modules_k/htable/doc/htable_admin.xml index eabc0a6..b5c8065 100644 --- a/modules_k/htable/doc/htable_admin.xml +++ b/modules_k/htable/doc/htable_admin.xml @@ -535,6 +535,18 @@ sht_rm_value_re("ha=>.*"); <listitem><para> <emphasis>$shtex(htable=>key)</emphasis> </para></listitem> + <listitem><para> + <emphasis>$shtcn(htable=>key)</emphasis> + </para></listitem> + <listitem><para> + <emphasis>$shtcv(htable=>key)</emphasis> + </para></listitem> + <listitem><para> + <emphasis>$shtinc(htable=>key)</emphasis> + </para></listitem> + <listitem><para> + <emphasis>$shtval(htable=>key)</emphasis> + </para></listitem> </itemizedlist> <para> Exported pseudo-variables are documented at &kamwikilink;.

1 0

git:master: htable: added two new PVs
by Daniel-Constantin Mierla 01 May '11

01 May '11

Module: sip-router Branch: master Commit: 116fceb0da9768e9e146e6d90dc3b36630475329 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=116fceb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 30 19:50:32 2011 +0200 htable: added two new PVs - $shtinc(htable=>key) - add atomically 1 to the value of the item - $shtdec(htable=>key) - decrement atomically 1 to the value of the item - both return the new value of the item - they work only with items having iteger values --- modules_k/htable/ht_api.c | 107 +++++++++++++++++++++++++++++++++++++++++++++ modules_k/htable/ht_api.h | 2 + modules_k/htable/ht_var.c | 49 ++++++++++++++++++++ modules_k/htable/ht_var.h | 5 ++- modules_k/htable/htable.c | 4 ++ 5 files changed, 166 insertions(+), 1 deletions(-) diff --git a/modules_k/htable/ht_api.c b/modules_k/htable/ht_api.c index 23bc59e..da473e6 100644 --- a/modules_k/htable/ht_api.c +++ b/modules_k/htable/ht_api.c @@ -516,6 +516,113 @@ int ht_del_cell(ht_t *ht, str *name) return 0; } +ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, + ht_cell_t *old) +{ + unsigned int idx; + unsigned int hid; + ht_cell_t *it, *prev, *cell; + time_t now; + int_str isval; + + if(ht==NULL || ht->entries==NULL) + return NULL; + + hid = ht_compute_hash(name); + + idx = ht_get_entry(hid, ht->htsize); + + now = 0; + if(ht->htexpire>0) + now = time(NULL); + prev = NULL; + if(mode) lock_get(&ht->entries[idx].lock); + it = ht->entries[idx].first; + while(it!=NULL && it->cellid < hid) + { + prev = it; + it = it->next; + } + while(it!=NULL && it->cellid == hid) + { + if(name->len==it->name.len + && strncmp(name->s, it->name.s, name->len)==0) + { + /* update value */ + if(it->flags&AVP_VAL_STR) + { + /* string value cannot be incremented */ + if(mode) lock_release(&ht->entries[idx].lock); + return NULL; + } else { + it->value.n += val; + it->expire = now + ht->htexpire; + if(old!=NULL) + { + if(old->msize>=it->msize) + { + memcpy(old, it, it->msize); + lock_release(&ht->entries[idx].lock); + return old; + } + } + cell = (ht_cell_t*)pkg_malloc(it->msize); + if(cell!=NULL) + memcpy(cell, it, it->msize); + + if(mode) lock_release(&ht->entries[idx].lock); + return cell; + } + } + prev = it; + it = it->next; + } + /* add val if htable has an integer init value */ + if(ht->flags!=PV_VAL_INT) + return NULL; + isval.n = ht->initval.n + val; + it = ht_cell_new(name, 0, &isval, hid); + if(it == NULL) + { + LM_ERR("cannot create new cell.\n"); + if(mode) lock_release(&ht->entries[idx].lock); + return NULL; + } + it->expire = now + ht->htexpire; + if(prev==NULL) + { + if(ht->entries[idx].first!=NULL) + { + it->next = ht->entries[idx].first; + ht->entries[idx].first->prev = it; + } + ht->entries[idx].first = it; + } else { + it->next = prev->next; + it->prev = prev; + if(prev->next) + prev->next->prev = it; + prev->next = it; + } + ht->entries[idx].esize++; + if(old!=NULL) + { + if(old->msize>=it->msize) + { + memcpy(old, it, it->msize); + lock_release(&ht->entries[idx].lock); + return old; + } + } + cell = (ht_cell_t*)pkg_malloc(it->msize); + if(cell!=NULL) + memcpy(cell, it, it->msize); + + if(mode) lock_release(&ht->entries[idx].lock); + return cell; +} + + ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old) { unsigned int idx; diff --git a/modules_k/htable/ht_api.h b/modules_k/htable/ht_api.h index 6a92f29..831267e 100644 --- a/modules_k/htable/ht_api.h +++ b/modules_k/htable/ht_api.h @@ -74,6 +74,8 @@ int ht_init_tables(void); int ht_destroy(void); int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode); int ht_del_cell(ht_t *ht, str *name); +ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, + ht_cell_t *old); int ht_dbg(void); ht_cell_t* ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old); diff --git a/modules_k/htable/ht_var.c b/modules_k/htable/ht_var.c index 0d52254..627e70b 100644 --- a/modules_k/htable/ht_var.c +++ b/modules_k/htable/ht_var.c @@ -292,3 +292,52 @@ int pv_get_ht_cv(struct sip_msg *msg, pv_param_t *param, return pv_get_sintval(msg, param, res, cnt); } +int pv_get_ht_add(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res, int val) +{ + str htname; + ht_cell_t *htc=NULL; + ht_pv_t *hpv; + + hpv = (ht_pv_t*)param->pvn.u.dname; + + if(hpv->ht==NULL) + { + hpv->ht = ht_get_table(&hpv->htname); + if(hpv->ht==NULL) + return pv_get_null(msg, param, res); + } + if(pv_printf_s(msg, hpv->pve, &htname)!=0) + { + LM_ERR("cannot get $ht name\n"); + return -1; + } + htc = ht_cell_value_add(hpv->ht, &htname, val, 1, _htc_local); + if(htc==NULL) + { + return pv_get_null(msg, param, res); + } + if(_htc_local!=htc) + { + ht_cell_pkg_free(_htc_local); + _htc_local=htc; + } + + if(htc->flags&AVP_VAL_STR) + return pv_get_null(msg, param, res); + + /* integer */ + return pv_get_sintval(msg, param, res, htc->value.n); +} + +int pv_get_ht_inc(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + return pv_get_ht_add(msg, param, res, 1); +} + +int pv_get_ht_dec(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + return pv_get_ht_add(msg, param, res, -1); +} diff --git a/modules_k/htable/ht_var.h b/modules_k/htable/ht_var.h index e6856b2..4ee895f 100644 --- a/modules_k/htable/ht_var.h +++ b/modules_k/htable/ht_var.h @@ -38,6 +38,9 @@ int pv_get_ht_cn(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_ht_cv(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); - +int pv_get_ht_inc(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); +int pv_get_ht_dec(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); #endif diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 461817f..7d387cc 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -76,6 +76,10 @@ static pv_export_t mod_pvs[] = { pv_parse_ht_name, 0, 0, 0 }, { {"shtcv", sizeof("shtcv")-1}, PVT_OTHER, pv_get_ht_cv, 0, pv_parse_ht_name, 0, 0, 0 }, + { {"shtinc", sizeof("shtinc")-1}, PVT_OTHER, pv_get_ht_inc, 0, + pv_parse_ht_name, 0, 0, 0 }, + { {"shtdec", sizeof("shtdec")-1}, PVT_OTHER, pv_get_ht_dec, 0, + pv_parse_ht_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } };

1 0

git:master: htable: documented the new 'initval' attribute for htable parameter
by Daniel-Constantin Mierla 01 May '11

01 May '11

Module: sip-router Branch: master Commit: bd6a3df6f639c004d91018507ded1ea3480a6d96 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd6a3df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 30 19:13:09 2011 +0200 htable: documented the new 'initval' attribute for htable parameter --- modules_k/htable/doc/htable_admin.xml | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/doc/htable_admin.xml b/modules_k/htable/doc/htable_admin.xml index dc27cb8..eabc0a6 100644 --- a/modules_k/htable/doc/htable_admin.xml +++ b/modules_k/htable/doc/htable_admin.xml @@ -261,6 +261,12 @@ if(is_present_hf("Authorization")) write back to db table). </para> </listitem> + <listitem> + <para> + <emphasis>initval</emphasis> - the integer value to be returned + insted of $null when a requested key is not set. + </para> + </listitem> </itemizedlist> <para> <emphasis> @@ -273,6 +279,7 @@ if(is_present_hf("Authorization")) ... modparam("htable", "htable", "a=>size=4;autoexpire=7200;dbtable=htable_a;") modparam("htable", "htable", "b=>size=5;") +modparam("htable", "htable", "c=>size=4;autoexpire=7200;initval=1;") ... </programlisting> </example>

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 May 2011