sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
149 discussions

Using t_suspend()/t_continue() multiple times on the same transaction
by Peter Dunkley 02 Jul '14

02 Jul '14

Hi, I am trying to use t_suspend()/t_continue() multiple times on the same transaction. Calling t_suspend() more than once works, but the second time I call t_continue() the transaction is killed and a 500 response is sent. It is the "if (branch == t->nr_of_outgoings)" check from the code fragment below (from t_suspend.c:t_continue()) that results in the transaction being killed - you can see the debug/error line I added to determine this in the fragment. Is using t_suspend()/t_continue() multiple times something that should work? Thanks, Peter if (t->uas.status < 200) { /* No final reply has been sent yet. * Check whether or not there is any pending branch. */ for ( branch = 0; branch < t->nr_of_outgoings; branch++ ) { if ((t->uac[branch].request.buffer != NULL) && (t->uac[branch].last_received < 200) ) break; } if (branch == t->nr_of_outgoings) { /* There is not any open branch so there is * no chance that a final response will be received. */ ret = 0; LM_ERR("branch == t->nr_of_outgoings\n"); goto kill_trans; } } -- Peter Dunkley Technical Director Crocodile RCS Ltd

5 12

git:master: pv: use msg context id when caching the value for $TV
by Daniel-Constantin Mierla 17 Apr '12

17 Apr '12

Module: sip-router Branch: master Commit: e4972ebd926b1fea6af795f58785a2b766439e5d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4972eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 23 12:53:31 2012 +0100 pv: use msg context id when caching the value for $TV - reported by Klaus Darilion --- modules_k/pv/pv_time.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/modules_k/pv/pv_time.c b/modules_k/pv/pv_time.c index ad7dd2c..9cbc375 100644 --- a/modules_k/pv/pv_time.c +++ b/modules_k/pv/pv_time.c @@ -35,17 +35,15 @@ #include "pv_time.h" -static unsigned int _pv_msg_id = 0; -static int _pv_msg_pid = 0; +static msg_ctx_id_t _pv_time_msgid = { 0 }; static time_t _pv_msg_tm = 0; -static int pv_update_time(struct sip_msg *msg, time_t *t) +static int pv_update_time(sip_msg_t *msg, time_t *t) { - if(_pv_msg_id != msg->id || _pv_msg_pid != msg->pid || _pv_msg_tm==0) + if(msg_ctx_id_match(msg, &_pv_time_msgid)!=1 || _pv_msg_tm==0) { _pv_msg_tm = time(NULL); - _pv_msg_id = msg->id; - _pv_msg_pid = msg->pid; + msg_ctx_id_set(msg, &_pv_time_msgid); if(t!=NULL) *t=_pv_msg_tm; @@ -124,7 +122,7 @@ int pv_parse_strftime_name(pv_spec_p sp, str *in) } static struct tm _cfgutils_ts; -static unsigned int _cfgutils_msg_id = 0; +static msg_ctx_id_t _cfgutils_msgid = { 0 }; /** * return broken-down time attributes @@ -137,10 +135,10 @@ int pv_get_time(struct sip_msg *msg, pv_param_t *param, if(msg==NULL || param==NULL) return -1; - if(_cfgutils_msg_id != msg->id) + if(msg_ctx_id_match(msg, &_cfgutils_msgid)!=1) { pv_update_time(msg, &t); - _cfgutils_msg_id = msg->id; + msg_ctx_id_set(msg, &_cfgutils_msgid); if(localtime_r(&t, &_cfgutils_ts) == NULL) { LM_ERR("unable to break time to attributes\n"); @@ -189,10 +187,10 @@ int pv_get_strftime(struct sip_msg *msg, pv_param_t *param, if(msg==NULL || param==NULL) return -1; - if(_cfgutils_msg_id != msg->id) + if(msg_ctx_id_match(msg, &_cfgutils_msgid)!=1) { pv_update_time(msg, &t); - _cfgutils_msg_id = msg->id; + msg_ctx_id_set(msg, &_cfgutils_msgid); if(localtime_r(&t, &_cfgutils_ts) == NULL) { LM_ERR("unable to break time to attributes\n"); @@ -267,7 +265,7 @@ int pv_get_timeb(struct sip_msg *msg, pv_param_t *param, } static struct timeval _timeval_ts; -static unsigned int _timeval_msg_id = 0; +static msg_ctx_id_t _timeval_msgid = { 0 }; static char _timeval_ts_buf[32]; int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, @@ -282,14 +280,14 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, switch(param->pvn.u.isname.name.n) { case 1: - if(_timeval_msg_id != msg->id) + if(msg_ctx_id_match(msg, &_timeval_msgid)!=1) { if(gettimeofday(&_timeval_ts, NULL)!=0) { LM_ERR("unable to get time val attributes\n"); return -1; } - _timeval_msg_id = msg->id; + msg_ctx_id_set(msg, &_timeval_msgid); } return pv_get_uintval(msg, param, res, (unsigned int)_timeval_ts.tv_usec); case 2: @@ -319,14 +317,14 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, s.s = _timeval_ts_buf; return pv_get_strval(msg, param, res, &s); default: - if(_timeval_msg_id != msg->id) + if(msg_ctx_id_match(msg, &_timeval_msgid)!=1) { if(gettimeofday(&_timeval_ts, NULL)!=0) { LM_ERR("unable to get time val attributes\n"); return -1; } - _timeval_msg_id = msg->id; + msg_ctx_id_set(msg, &_timeval_msgid); } return pv_get_uintval(msg, param, res, (unsigned int)_timeval_ts.tv_sec); }

2 5

redis module support for array responses.
by Vicente Hernando 10 Apr '12

10 Apr '12

Hello, I am studying the use case when a redis command returns an array (REDIS_REPLY_ARRAY type in hiredis.h from https://github.com/antirez/hiredis ) Function pv_get_redisc in kamailio/modules/ndb_redis/ndb_redis_mod.c : 365 returns a pv_value_t structure and currently only deals with REDIS_REPLY_STRING and REDIS_REPLY_INTEGER cases. It seems looking at pvar.h that pv_value_t structure does not deal with arrays. Is that correct? So returning an array is not an option... Then a better aproach could be changing pv_parse_redisc_name function: right now from README in ndb_redis: after executing redis_cmd("srvN", "SET foo bar", "r"); I could get $redis(r->type) and $redis(r->value) it could be a good idea to add options like: $redis(r->size) and $redis(r->value[Number]) when changing pv_parse_redisk_name function. Do you think of that as a good approach? Thanks in advance! Vicente.

2 4

git:master: db_cluster: new module for generic database clustering
by Daniel-Constantin Mierla 03 Apr '12

03 Apr '12

Module: sip-router Branch: master Commit: 201fc2d600e48fbb717531c79013c1b971f82d76 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=201fc2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 27 14:38:57 2012 +0200 db_cluster: new module for generic database clustering - the module allow to group several DB connections and perform commands over them, based on policies such as round robin, serial try or parallel execution - any kind of db connection can make part from a cluster - example use case: write in parallel to two databases and do round robin read from them - the module is a middle layer between modules and databases, reusing existing db connectors. A module that wants to use such cluster, just have to set the db_url to "cluster://clusterid" - the module allow definition of multiple clusters - see README for more details - todo: enable/disable connections at runtime and via rpc --- modules_k/db_cluster/Makefile | 15 + modules_k/db_cluster/README | 162 +++++++++ modules_k/db_cluster/db_cluster_mod.c | 112 ++++++ modules_k/db_cluster/dbcl_api.c | 437 ++++++++++++++++++++++ modules_k/db_cluster/dbcl_api.h | 142 ++++++++ modules_k/db_cluster/dbcl_data.c | 479 +++++++++++++++++++++++++ modules_k/db_cluster/dbcl_data.h | 89 +++++ modules_k/db_cluster/doc/Makefile | 4 + modules_k/db_cluster/doc/db_cluster.xml | 37 ++ modules_k/db_cluster/doc/db_cluster_admin.xml | 167 +++++++++ 10 files changed, 1644 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=201…

4 10

Throttling NOTIFY requests from presence
by Peter Dunkley 02 Apr '12

02 Apr '12

Hi, RFC 3856 section 6.10 states: "A PA SHOULD NOT generate notifications for a single presentity at a rate of more than once every five seconds." I would like to add this to the presence module (making the rate configurable). I have an idea as to how I would like to do it: - Add a last notified time-stamp field to each presentity - Add a updated since last notified flag field to each presentity - Add a notify required flag field to each active_watcher - When a presentity is updated the last notified time-stamp is checked. If the time is far enough in the past the notifies are sent and the time-stamp is updated. If enough time has not passed the updated since flag is set for the presentity and the notify required flag is set for all active_watchers of that presentity. - When a presentity is subscribed to (this includes re-subscribes) the last notified time-stamp is checked. If the time is far enough in the past the (single) notify is sent and the time-stamp is updated. If enough time has not passed the updated since flag is set for the presentity and the notify required flag is set for this active_watcher record. - A timer (the minimum time between subscribes - default 5 seconds) is run. On expiry a query is done on the presentity table for presentities that have been updated _AND_ the last notified time is more than the minimum time ago. For each of these presentities, a query is done on the active_watchers for watchers of that presentity that have the notify required flag set. Notifies containing the presentities are then sent to the watchers waiting on them. This should ensure that no presentity notifies more than it should, while ensuring that all changes are (eventually) sent out, and all subscribes result in a notify (eventually) being sent. Eventually being typically within 5 seconds and in under 10 seconds in the worst case (assuming the default setting of 5 seconds). Can anyone see any problems with this? Are there any objections to me implementing this? In theory running a (5 second) timer could make presence "lumpy" in the same way RLS is (see my previous email). However, if this proves to be the case I believe the same mechanism I have proposed for RLS can be used here. Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

3 4

Broken link.
by Vicente Hernando 31 Mar '12

31 Mar '12

Hi all, not sure if this is the right mailing list for this issue but: in http://www.asipto.com/pub/kamailio-devel-guide/ Kamailio SIP Server v3.2.0 Development Guide, this broken link to doxygen documentation appears: http://devel.kamailio.org/doxygen/ I think correct one should be this: http://sip-router.org/doxygen/sip-router/branch/3.2/index.html Regards, Vicente.

1 0

[tracker] Task closed: Dialog module loses profile state on proxy restart
by sip-router 31 Mar '12

31 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#209 - Dialog module loses profile state on proxy restart User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented Additional comments about closing: This was implemented already. Closing here, further discussions can be done on mailing lists. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=209 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] Task closed: dlg_manage() after t_newtran() does not work
by sip-router 31 Mar '12

31 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#189 - dlg_manage() after t_newtran() does not work User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented Additional comments about closing: This should be ok after the commit 7a8ad6740c244d48911f0216f6baac4804ea2f3b (Feb 25, master branch). Reopen if still an issue. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=189 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

Problem with app_mono module
by Pirjo Ahvenainen 30 Mar '12

30 Mar '12

Hi all, I've been playing with the new mono api on the development version of Kamailio. I'm having some problems with it, perhaps there's something someone here knows that would help. If there's a better place to post this question please guide me to the right direction. I'm using CentOS 6.2, installed mono with yum, the mono version is 2.4.3.1. I had problems compiling the app_mono module, I got errors like: Package mono-2 was not found in the pkg-config search path. Perhaps you should add the directory containing `mono-2.pc' to the PKG_CONFIG_PATH environment variable No package 'mono-2' found ... So I changed the makefile to the one below (replaced "mono-2" to "mono" from the default). Then got it compiled and app_mono.so was generated. I don't know much about makefiles but me guessing what to do with it got the thing compiled. # # include ../../Makefile.defs auto_gen= NAME=app_mono.so BUILDER = $(shell which pkg-config) ifeq ($(BUILDER),) DEFS+=-D_REENTRANT -I/usr/include/mono LIBS= -lmono -lm -lrt -ldl -lpthread else DEFS+= $(shell pkg-config --cflags mono) LIBS = $(shell pkg-config --libs mono) endif DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kcore/kcore include ../../Makefile.modules Then I compiled Kamailio with the app_mono module included, during compilation I got output like this: [root@monotest kamailio]# make all CC (gcc) [M app_mono.so] app_mono_api.o app_mono_api.c: In function âsr_mono_logâ: app_mono_api.c:318: warning: implicit declaration of function âmono_freeâ CC (gcc) [M app_mono.so] app_mono_mod.o make[2]: `libkcore.so.1.0' is up to date. LD (gcc) [M app_mono.so] app_mono.so ... I added my params on the config: loadmodule "app_mono.so" ... modparam("app_mono", "load", "/usr/local/etc/kamailio/mono/MonoTest1.exe") Everything compiled though and I did not notice any errors. However, there must be something wrong with either my environment, mono version, compiling something or something else, command kamailio -c gives output with errors (note the warning before and the error below about mono_free): [root@monotest kamailio]# kamailio -c loading modules under /usr/local/lib/kamailio/modules_k/:/usr/local/lib/kamailio/modules/ 0(26471) ERROR: <core> [sr_module.c:572]: ERROR: load_module: could not open module </usr/local/lib/kamailio/modules/app_mono.so>: /usr/local/lib/kamailio/modules/app_mono.so: undefined symbol: mono_free 0(26471) : <core> [cfg.y:3565]: parse error in config file /usr/local/etc/kamailio/modules.cfg, line 90, column 12-24: failed to load module 0(26471) ERROR: <core> [modparam.c:162]: set_mod_param_regex: No module matching <app_mono> found 0(26471) : <core> [cfg.y:3568]: parse error in config file /usr/local/etc/kamailio/modules.cfg, line 281, column 74: Can't set module parameter 0(26471) ERROR: <core> [cfg.y:3429]: cfg. parser: failed to find command mono_run Any ideas on what's the problem? I'll try the same on Ubuntu to compare but any suggestions and advice would be appreciated! cheers, Pirjo Ahvenainen

2 2

git:master: modules/mqueue: Updated mq_pv_free() to be able to take the queue name from a pv
by Peter Dunkley 30 Mar '12

30 Mar '12

Module: sip-router Branch: master Commit: ecbaab806f2af86c3c956b37806f5645eebf5898 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecbaab8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 30 17:15:13 2012 +0100 modules/mqueue: Updated mq_pv_free() to be able to take the queue name from a pv --- modules/mqueue/mqueue_mod.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/mqueue/mqueue_mod.c b/modules/mqueue/mqueue_mod.c index b4b9517..458701c 100644 --- a/modules/mqueue/mqueue_mod.c +++ b/modules/mqueue/mqueue_mod.c @@ -64,7 +64,7 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"mq_add", (cmd_function)w_mq_add, 3, fixup_mq_add, 0, ANY_ROUTE}, - {"mq_pv_free", (cmd_function)w_mq_pv_free, 1, fixup_str_null, + {"mq_pv_free", (cmd_function)w_mq_pv_free, 1, fixup_spve_null, 0, ANY_ROUTE}, {"bind_mq", (cmd_function)bind_mq, 1, 0, 0, ANY_ROUTE}, @@ -155,7 +155,14 @@ static int w_mq_add(struct sip_msg* msg, char* mq, char* key, char* val) static int w_mq_pv_free(struct sip_msg* msg, char* mq, char* str2) { - mq_pv_free((str*)mq); + str q; + + if(fixup_get_svalue(msg, (gparam_t*)mq, &q)<0) + { + LM_ERR("cannot get the queue\n"); + return -1; + } + mq_pv_free(&q); return 1; }

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 March 2012