sr-dev April 2010

sr-dev@lists.kamailio.org

27 participants
495 discussions

git:kamailio_3.0: modules/ carrierroute Improved usefulness of error messages in case of a incorrect AVP value
by Marius Zbihlei 09 Apr '10

09 Apr '10

Module: sip-router Branch: kamailio_3.0 Commit: 6c51d903f5a314f4116df81121d1faa5ea8c95d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c51d90… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Apr 9 12:09:33 2010 +0300 modules/carrierroute Improved usefulness of error messages in case of a incorrect AVP value --- modules/carrierroute/cr_func.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 8effe12..d37d658 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -104,12 +104,11 @@ static inline int cr_gp2id(struct sip_msg *_msg, gparam_t *gp, struct name_map_t id = map_name2id(map, size, &avp_val.s); if (id < 0) { if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_STR) - LM_ERR("could not find id '%.*s' from AVP\n", - gp->v.pve->spec.pvp.pvn.u.isname.name.s.len, + LM_ERR("cannot map carrier with id %.*s from AVP '%.*s'\n", avp_val.s.len, avp_val.s.s, gp->v.pve->spec.pvp.pvn.u.isname.name.s.len, gp->v.pve->spec.pvp.pvn.u.isname.name.s.s); else if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_RE) - LM_ERR("could not find id regex\n"); - else LM_ERR("could not find id '%d'\n", gp->v.pve->spec.pvp.pvn.u.isname.name.n); + LM_ERR("cannot map carrier with id %.*s from AVP regex\n", avp_val.s.len, avp_val.s.s); + else LM_ERR("cannot map carrier with id %.*s from AVP '%d'\n", avp_val.s.len, avp_val.s.s, gp->v.pve->spec.pvp.pvn.u.isname.name.n); return -1; } return id;

1 0

[tracker] Comment added: kamailio 3.0.x: segfault in carrierroute
by sip-router 09 Apr '10

09 Apr '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#60 - kamailio 3.0.x: segfault in carrierroute User who did this - marius zbihlei (marius.zbihlei) ---------- Hello Indeed the error messages are misleading. I will replace a.s.a.p. those strings with something that makes more sense in the carrierroute context. Cheers Marius ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=60#comment76 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

[tracker] Comment added: kamailio 3.0.x: segfault in carrierroute
by sip-router 09 Apr '10

09 Apr '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#60 - kamailio 3.0.x: segfault in carrierroute User who did this - marius zbihlei (marius.zbihlei) ---------- Hello Ovidiu, I have done a couple of tests and I get the following results: 1. The crash happens only in kamailio-3.0 branch (not it ser or kamailio 1.5) 2. The crash happens only when I use an string value for the avp As it seems the handling of the name of the avp in case of an error is wrong, because the code always behaves like the avp name is AVP_VAL_STR which is not the case in smth like $avp(i:707) I have commited a patch on the kamailio_3.0 branch that fixes the bug by checking the type of avp name. (http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5604e51…) As I side note I still can't figure it out why in ser or kamailio 1.5 it doesn't crash. If anyone can shed more light on the subject, I would be very thankful. Marius ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=60#comment75 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:master: pv: added $true
by Daniel-Constantin Mierla 08 Apr '10

08 Apr '10

Module: sip-router Branch: master Commit: bbab41f73fc086f8d14668c40a9879fb47ecfbc0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bbab41f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 8 23:34:15 2010 +0200 pv: added $true - return integer value 1, useful to create infinite loops via while($true) { ...} - suggested by Ovidiu Sas and Juha Heinanen --- modules_k/pv/pv.c | 3 +++ modules_k/pv/pv_core.c | 7 +++++++ modules_k/pv/pv_core.h | 4 ++++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 5475271..2076de0 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -351,6 +351,9 @@ static pv_export_t mod_pvs[] = { {{"to.user", (sizeof("to.user")-1)}, /* */ PVT_OTHER, pv_get_to_attr, 0, 0, 0, pv_init_iname, 2}, + {{"true", (sizeof("true")-1)}, /* */ + PVT_OTHER, pv_get_true, 0, + 0, 0, 0, 0}, {{"Tf", (sizeof("Tf")-1)}, /* */ PVT_CONTEXT, pv_get_timef, 0, 0, 0, 0, 0}, diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index f52905a..966bed8 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -49,6 +49,7 @@ static str str_udp = { "UDP", 3 }; static str str_5060 = { "5060", 4 }; +static str pv_str_1 = { "1", 1 }; int _pv_pid = 0; @@ -78,6 +79,12 @@ int pv_get_5060(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_strintval(msg, param, res, &str_5060, 5060); } +int pv_get_true(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + return pv_get_intstrval(msg, param, res, 1, &pv_str_1); +} + /*extern int _last_returned_code; int pv_get_return_code(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) diff --git a/modules_k/pv/pv_core.h b/modules_k/pv/pv_core.h index f0e4e0e..1831071 100644 --- a/modules_k/pv/pv_core.h +++ b/modules_k/pv/pv_core.h @@ -186,6 +186,10 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_scriptvar(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); + +int pv_get_true(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + /********* end PV get functions *********/ /********* start PV set functions *********/

1 0

git:master: tm: notes about avp parameters format
by Daniel-Constantin Mierla 08 Apr '10

08 Apr '10

Module: sip-router Branch: master Commit: accf0388ffaf208fd9f0f31a2618fe1a429b3cc6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=accf038… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 8 23:21:53 2010 +0200 tm: notes about avp parameters format - they can be either PV style $avp(name) for K compat mode or just the name of avp for S compat mode (cherry picked from commit 2bbb798da2e332f5558646e6faa285e6377286bd) --- modules/tm/README | 101 ++++++++++++++++++++++++++------------------ modules/tm/doc/params.xml | 25 +++++++++++ 2 files changed, 85 insertions(+), 41 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=acc…

1 0

git:kamailio_3.0: tm: notes about avp parameters format
by Daniel-Constantin Mierla 08 Apr '10

08 Apr '10

Module: sip-router Branch: kamailio_3.0 Commit: 2bbb798da2e332f5558646e6faa285e6377286bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bbb798… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 8 23:21:53 2010 +0200 tm: notes about avp parameters format - they can be either PV style $avp(name) for K compat mode or just the name of avp for S compat mode --- modules/tm/README | 101 ++++++++++++++++++++++++++------------------ modules/tm/doc/params.xml | 25 +++++++++++ 2 files changed, 85 insertions(+), 41 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2bb…

1 0

git:kamailio_3.0: tm: don't fix timeout AVP value for K compat mode
by Daniel-Constantin Mierla 08 Apr '10

08 Apr '10

Module: sip-router Branch: kamailio_3.0 Commit: 4e5748d50b6a586fb45f312ade6aa572b4044d82 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e5748d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 8 22:57:48 2010 +0200 tm: don't fix timeout AVP value for K compat mode - the avps for timeout still expect second values unlike module parameters that expect miliseconds - therefore do not adjust the value if it is too low - reported by Andreas Granig (cherry picked from commit 5aa3167b088bdf2e7a5d74fdbbd83c0e150f7741) --- modules/tm/t_funcs.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 988e22b..0f935c3 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -517,7 +517,8 @@ static inline int avp2timer(unsigned int* timer, int type, int_str name) } else { *timer = val_istr.n; } - +#if 0 + /* value of AVP is expected to be sec, not milisec lile mod params */ if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { if(*timer>0 && *timer<=120) { LM_WARN("too small given timer value: %ums (using T*1000)\n", @@ -525,6 +526,7 @@ static inline int avp2timer(unsigned int* timer, int type, int_str name) *timer *= 1000; } } +#endif return *timer==0; /* 1 if 0 (use default), 0 if !=0 (use *timer) */ }

1 0

git:master: tm: don't fix timeout AVP value for K compat mode
by Daniel-Constantin Mierla 08 Apr '10

08 Apr '10

Module: sip-router Branch: master Commit: 5aa3167b088bdf2e7a5d74fdbbd83c0e150f7741 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5aa3167… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 8 22:57:48 2010 +0200 tm: don't fix timeout AVP value for K compat mode - the avps for timeout still expect second values unlike module parameters that expect miliseconds - therefore do not adjust the value if it is too low - reported by Andreas Granig --- modules/tm/t_funcs.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 988e22b..0f935c3 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -517,7 +517,8 @@ static inline int avp2timer(unsigned int* timer, int type, int_str name) } else { *timer = val_istr.n; } - +#if 0 + /* value of AVP is expected to be sec, not milisec lile mod params */ if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { if(*timer>0 && *timer<=120) { LM_WARN("too small given timer value: %ums (using T*1000)\n", @@ -525,6 +526,7 @@ static inline int avp2timer(unsigned int* timer, int type, int_str name) *timer *= 1000; } } +#endif return *timer==0; /* 1 if 0 (use default), 0 if !=0 (use *timer) */ }

1 0

'permissions' module and confused error "no shm memory"
by Iñaki Baz Castillo 08 Apr '10

08 Apr '10

Hi, using kamailio 1.5.4. By error I filled the 'address' table as follows: +------+-----------------+------+------+ | grp | ip_addr | mask | port | +------+-----------------+------+------+ | 1000 | 2.2.2.23 | 31 | 0 | | 1001 | DELETEME | 32 | 0 | +------+-----------------+------+------+ When starting kamailio I get this error: ERROR:permissions:reload_address_table: database problem CRITICAL:permissions:init_addresses: reload of address table failed ERROR:permissions:init_addresses: no more shm memory ERROR:permissions:mod_init: failed to initialize the allow_address function ERROR:core:init_mod: failed to initialize module permissions "no more shm memory"? :) -- Iñaki Baz Castillo <ibc(a)aliax.net>

3 4

git:master: modules_k/permissions: fixed incorrect error message
by Juha Heinanen 08 Apr '10

08 Apr '10

Module: sip-router Branch: master Commit: 7ca703c25a24b38a95c3493aae4ae0be3820b881 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ca703c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Apr 8 19:47:35 2010 +0300 modules_k/permissions: fixed incorrect error message - Error message "no more shm memory" was generated by init_addresses function also when the error was not related to shared memory. --- modules_k/permissions/address.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index bc27be2..469e21a 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -219,7 +219,10 @@ int init_addresses(void) addr_hash_table = (struct addr_list ***)shm_malloc (sizeof(struct addr_list **)); - if (!addr_hash_table) goto error; + if (!addr_hash_table) { + LM_ERR("no more shm memory for addr_hash_table\n"); + goto error; + } *addr_hash_table = addr_hash_table_1; @@ -230,7 +233,10 @@ int init_addresses(void) if (!subnet_table_2) goto error; subnet_table = (struct subnet **)shm_malloc(sizeof(struct subnet *)); - if (!subnet_table) goto error; + if (!subnet_table) { + LM_ERR("no more shm memory for subnet_table\n"); + goto error; + } *subnet_table = subnet_table_1; @@ -245,7 +251,6 @@ int init_addresses(void) return 0; error: - LM_ERR("no more shm memory\n"); if (addr_hash_table_1) { free_addr_hash_table(addr_hash_table_1); addr_hash_table_1 = 0;

1 0

← Newer
1
...
43
44
45
46
47
48
49
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2010