sr-dev November 2010

sr-dev@lists.kamailio.org

17 participants
108 discussions

git:master: modules_k/dialog: Enhance unref_dlg_from_cb() robustness.
by Timo Reimann 02 Nov '10

02 Nov '10

Module: sip-router Branch: master Commit: 75fc49f74d13774f1ecc0cdd8f0adfe168915b4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=75fc49f… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Nov 2 19:06:12 2010 +0100 modules_k/dialog: Enhance unref_dlg_from_cb() robustness. - Check parameter for NULL pointer. - Call unreference_dlg(), thus being more wrapper-ish. - Fix indention. --- modules_k/dialog/dlg_handlers.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index ebed8a9..a118a91 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -820,10 +820,13 @@ static void unreference_dialog(void *dialog) */ static void unref_dlg_from_cb(struct cell* t, int type, struct tmcb_params *param) { - struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + + if (!dlg) + return; /* destroy dialog */ - unref_dlg(dlg, 1); + unreference_dialog(dlg); }

1 0

git:kamailio_3.0: trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used
by Marius Zbihlei 02 Nov '10

02 Nov '10

Module: sip-router Branch: kamailio_3.0 Commit: 0c36835ce2cce98454cd10bd53f855787f1bbc9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c36835… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Nov 2 11:45:15 2010 +0200 trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used Now the function behaves as expected, freeing previous allocated resources, logging the OOM condition , and returning -1 (cherry picked from commit 49837c37aea72c1e4f0cc3290382c0adbf72e3f8) --- lib/trie/dtrie.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 9965263..90cb52f 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -39,8 +39,6 @@ #include "dtrie.h" -#include <assert.h> - #include "../../dprint.h" #include "../../mem/shm_mem.h" #include "../../mem/mem.h" @@ -142,12 +140,20 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i if (node->child[digit] == NULL) { node->child[digit] = shm_malloc(sizeof(struct dtrie_node_t)); - assert(node->child[digit] != NULL); + if(node->child[digit] == NULL ){ + SHM_MEM_ERROR; + return -1; + } + LM_DBG("allocate %lu bytes for node at %p\n", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); memset(node->child[digit], 0, sizeof(struct dtrie_node_t)); node->child[digit]->child = shm_malloc(sizeof(struct dtrie_node_t *) * branches); - assert(node->child[digit]->child != NULL); + if(node->child[digit]->child == NULL){ + SHM_MEM_ERROR; + shm_free(node->child[digit]); + return -1; + } LM_DBG("allocate %lu bytes for %d root children pointer at %p\n", (long unsigned)sizeof(struct dtrie_node_t *) * branches, branches, node->child[digit]->child);

1 0

git:3.1: trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used
by Marius Zbihlei 02 Nov '10

02 Nov '10

Module: sip-router Branch: 3.1 Commit: 759083ad159e3a9d5b52501b2f1f99a6976f9aeb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=759083a… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Nov 2 11:45:15 2010 +0200 trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used Now the function behaves as expected, freeing previous allocated resources, logging the OOM condition , and returning -1 (cherry picked from commit 49837c37aea72c1e4f0cc3290382c0adbf72e3f8) --- lib/trie/dtrie.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 9965263..90cb52f 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -39,8 +39,6 @@ #include "dtrie.h" -#include <assert.h> - #include "../../dprint.h" #include "../../mem/shm_mem.h" #include "../../mem/mem.h" @@ -142,12 +140,20 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i if (node->child[digit] == NULL) { node->child[digit] = shm_malloc(sizeof(struct dtrie_node_t)); - assert(node->child[digit] != NULL); + if(node->child[digit] == NULL ){ + SHM_MEM_ERROR; + return -1; + } + LM_DBG("allocate %lu bytes for node at %p\n", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); memset(node->child[digit], 0, sizeof(struct dtrie_node_t)); node->child[digit]->child = shm_malloc(sizeof(struct dtrie_node_t *) * branches); - assert(node->child[digit]->child != NULL); + if(node->child[digit]->child == NULL){ + SHM_MEM_ERROR; + shm_free(node->child[digit]); + return -1; + } LM_DBG("allocate %lu bytes for %d root children pointer at %p\n", (long unsigned)sizeof(struct dtrie_node_t *) * branches, branches, node->child[digit]->child);

1 0

git:master: trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used
by Marius Zbihlei 02 Nov '10

02 Nov '10

Module: sip-router Branch: master Commit: 49837c37aea72c1e4f0cc3290382c0adbf72e3f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49837c3… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Nov 2 11:45:15 2010 +0200 trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used Now the function behaves as expected, freeing previous allocated resources, logging the OOM condition , and returning -1 --- lib/trie/dtrie.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 9965263..90cb52f 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -39,8 +39,6 @@ #include "dtrie.h" -#include <assert.h> - #include "../../dprint.h" #include "../../mem/shm_mem.h" #include "../../mem/mem.h" @@ -142,12 +140,20 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i if (node->child[digit] == NULL) { node->child[digit] = shm_malloc(sizeof(struct dtrie_node_t)); - assert(node->child[digit] != NULL); + if(node->child[digit] == NULL ){ + SHM_MEM_ERROR; + return -1; + } + LM_DBG("allocate %lu bytes for node at %p\n", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); memset(node->child[digit], 0, sizeof(struct dtrie_node_t)); node->child[digit]->child = shm_malloc(sizeof(struct dtrie_node_t *) * branches); - assert(node->child[digit]->child != NULL); + if(node->child[digit]->child == NULL){ + SHM_MEM_ERROR; + shm_free(node->child[digit]); + return -1; + } LM_DBG("allocate %lu bytes for %d root children pointer at %p\n", (long unsigned)sizeof(struct dtrie_node_t *) * branches, branches, node->child[digit]->child);

1 0

SF.net SVN: openser:[6048] branches/1.5/trie/dtrie.c
by Marius Zbihlei 02 Nov '10

02 Nov '10

Revision: 6048 http://openser.svn.sourceforge.net/openser/?rev=6048&view=rev Author: mariuszbihlei Date: 2010-11-02 09:40:31 +0000 (Tue, 02 Nov 2010) Log Message: ----------- trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used Now the function behaves as expected, freeing previous allocated resources, logging the OOM condition , and returning -1 Modified Paths: -------------- branches/1.5/trie/dtrie.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:master: modules/lcr: fixed setting of tag_avp by next_gw() function
by Juha Heinanen 01 Nov '10

01 Nov '10

Module: sip-router Branch: master Commit: a1b6e569c20b3c2a926022951e5303b7d8df2405 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1b6e56… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Nov 1 23:00:47 2010 +0200 modules/lcr: fixed setting of tag_avp by next_gw() function --- modules/lcr/lcr_mod.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index a02b7d9..96c236b 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -1854,7 +1854,8 @@ static int generate_uris(struct sip_msg* _m, char *r_uri, str *r_uri_user, { int_str gw_uri_val; struct usr_avp *gu_avp; - str scheme, prefix, hostname, port, params, transport, addr_str; + str scheme, prefix, hostname, port, params, transport, addr_str, + tmp_tag; char *at; unsigned int strip; struct ip_addr a; @@ -1864,7 +1865,8 @@ static int generate_uris(struct sip_msg* _m, char *r_uri, str *r_uri_user, if (!gu_avp) return 0; /* No more gateways left */ decode_avp_value(gw_uri_val.s.s, gw_index, &scheme, &strip, &prefix, - tag, addr, &hostname, &port, &params, &transport, flags); + &tmp_tag, addr, &hostname, &port, &params, &transport, + flags); if (*addr > 0) { a.af = AF_INET; @@ -1946,6 +1948,9 @@ static int generate_uris(struct sip_msg* _m, char *r_uri, str *r_uri_user, *dst_uri_len = 0; } + memcpy(tag->s, tmp_tag.s, tmp_tag.len); + tag->len = tmp_tag.len; + destroy_avp(gu_avp); LM_DBG("r_uri <%.*s>, dst_uri <%.*s>\n", @@ -2030,10 +2035,13 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) int_str ruri_user_val, val; struct usr_avp *ru_avp; int rval; - str uri_str, tag; + str uri_str, tag_str; + char tag[MAX_TAG_LEN]; unsigned int flags, r_uri_len, dst_uri_len, addr, gw_index; char r_uri[MAX_URI_LEN], dst_uri[MAX_URI_LEN]; + tag_str.s = &(tag[0]); + ru_avp = search_first_avp(ruri_user_avp_type, ruri_user_avp, &ruri_user_val, 0); @@ -2049,7 +2057,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) } if (!generate_uris(_m, r_uri, &(_m->parsed_uri.user), &r_uri_len, dst_uri, &dst_uri_len, &addr, &gw_index, &flags, - &tag)) { + &tag_str)) { return -1; } @@ -2067,7 +2075,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) * and Destination URIs. */ if (!generate_uris(_m, r_uri, &(ruri_user_val.s), &r_uri_len, dst_uri, - &dst_uri_len, &addr, &gw_index, &flags, &tag)) { + &dst_uri_len, &addr, &gw_index, &flags, &tag_str)) { return -1; } } @@ -2099,7 +2107,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) /* Set tag_avp */ if (tag_avp_param) { - val.s = tag; + val.s = tag_str; add_avp(tag_avp_type, tag_avp, val); LM_DBG("added tag_avp <%.*s>\n", val.s.len, val.s.s); }

1 0

seeing segfaults in get_profile_size()
by Eugene Oden 01 Nov '10

01 Nov '10

hello, just started using the dialog module with kamailio 3.1.0 and getting segfaults whenever get_profile_size() is executed. here's a stack trace: Core was generated by `kamailio'. Program terminated with signal 11, Segmentation fault. #0 0x003c729e in w_get_profile_size (msg=0x834d8b4, profile=0xb60823f8 "\224$\b\266\t", value=0x831cb40 "\004", result=0x8340900 "\001") at dialog.c:767 767 if(sp_dest->setf(msg, &sp_dest->pvp, (int)EQ_T, &val)<0) (gdb) bt #0 0x003c729e in w_get_profile_size (msg=0x834d8b4, profile=0xb60823f8 "\224$\b\266\t", value=0x831cb40 "\004", result=0x8340900 "\001") at dialog.c:767 #1 0x08057770 in do_action (h=0xbff5fcb8, a=0x8328f2c, msg=0x834d8b4) at action.c:1105 #2 0x0805ea3c in run_actions (h=0xbff5fcb8, a=0x8328f2c, msg=0x834d8b4) at action.c:1553 #3 0x080576c0 in do_action (h=0xbff5fcb8, a=0x832c794, msg=0x834d8b4) at action.c:711 #4 0x0805ea3c in run_actions (h=0xbff5fcb8, a=0x832c794, msg=0x834d8b4) at action.c:1553 #5 0x0805ed71 in run_actions_safe (h=0xbff606e8, a=0x832c794, msg=0x834d8b4) at action.c:1605 #6 0x080f5d44 in rval_get_int (h=0xbff606e8, msg=0x0, i=0xbff600d8, rv=0xbff5f694, cache=0x0) at rvalue.c:904 #7 0x080fb4fb in rval_expr_eval_int (h=0xbff606e8, msg=0x834d8b4, res=0xbff600d8, rve=0x832c9c4) at rvalue.c:1866 #8 0x080fb5d0 in rval_expr_eval_int (h=0xbff606e8, msg=0x834d8b4, res=0xbff60394, rve=0x832cdac) at rvalue.c:1873 #9 0x08057511 in do_action (h=0xbff606e8, a=0x832db7c, msg=0x834d8b4) at action.c:1069 #10 0x0805ea3c in run_actions (h=0xbff606e8, a=0x832be40, msg=0x834d8b4) at action.c:1553 #11 0x080576c0 in do_action (h=0xbff606e8, a=0x8313b88, msg=0x834d8b4) at action.c:711 #12 0x0805ea3c in run_actions (h=0xbff606e8, a=0x83003cc, msg=0x834d8b4) at action.c:1553 #13 0x0805ecf4 in run_top_route (a=0x83003cc, msg=0x834d8b4, c=0x0) at action.c:1626 #14 0x080dceab in receive_msg ( buf=0x82a7740 "INVITE sip:*98@pipeline.bbpsphone.net SIP/2.0\r\nCall-ID: 6fb1466b73075c7ad55f278f86ff6b27@0:0:0:0:0:0:0:0\r\nCSeq: 2 INVITE\r\nFrom: \"Eugene Oden\" <sip:goden.atl1@pipeline.bbpsphone.net<sip%3Agoden.atl1(a)pipeline.bbpsphone.net>>;tag=56dc2460\r\nTo: "..., len=1538, rcv_info=0xbff608f8) at receive.c:205 #15 0x0816eef7 in udp_rcv_loop () at udp_server.c:532 #16 0x080ad9e1 in main_loop () at main.c:1554 #17 0x080b1126 in main (argc=1, argv=0xbff60bd4) at main.c:2398 and the relevant bits of configuration - not sure if its correct: ... loadmodule "dialog.so" modparam("dialog", "dlg_flag", 4); modparam("dialog", "profiles_no_value", "voicemail"); ... route { ... if (is_method("INVITE")) { dlg_manage(); setflag(4); } ... if (! route(LIMIT_VOICEMAIL)) { xdbg(" SCRIPT: Voicemail limit exceeded\n"); sl_send_reply("503", "Service Unavailable"); exit; } ... } ... route[LIMIT_VOICEMAIL] { get_profile_size("voicemail", "$avp(size)"); if ($avp(size) >= 1) { return -1; } set_dlg_profile("voicemail"); return 1; } any thoughts? gene

2 5

textops Design Question
by m tawfik 01 Nov '10

01 Nov '10

I noticed that the textops module assumes that it is always operating on the original message; with no regard to the existing lumped modifications. This makes the successive application of textops (and some other operations as well such as nathelper) incorrect. Is this true, or am I missing something? maged

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2010