sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
251 discussions

dialplan and empty repl_exp
by Andreas Granig 19 Jun '12

19 Jun '12

Hi all, We ran into an issue with dialplan in regex mode when we leave the repl_exp empty. Consider this scenario: if(dp_translate("1", "$rU/$var(out)") { # translation successful $rU = $var(out); } If the dialplan entry has match_exp="^999" and subst_exp="^999" and repl_exp="" and my $rU is "999123", I'd expect $var(out) to be "123", because an empty replacement part is perfectly valid for a regex. The result however is that $var(out) is untouched, so whatever $var(out) was before the function call, will end up in $rU in this case. That's not what I'd expect if dp_translate returns success. It should be fairly easy to fix and we can provide a patch for that, I'd just want to get some feedback if you agree on changing dp_translate behavior in such a case, as it might break existing scripts if you rely on the current way of working. Comments? Andreas

4 10

[tracker] Task closed: ndb_redis redis_free function
by sip-router 19 Jun '12

19 Jun '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#231 - ndb_redis redis_free function User who did this - Vicente Hernando (vicente) Reason for closing: Implemented Additional comments about closing: Pushed into master branch. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=231 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: ndb_redis: README file update for redis_free function.
by Vicente Hernando 19 Jun '12

19 Jun '12

Module: sip-router Branch: master Commit: 95ca295c7db108c688d7f9278d089dcd6660d712 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95ca295… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Tue Jun 19 12:18:30 2012 +0200 ndb_redis: README file update for redis_free function. --- modules/ndb_redis/README | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/modules/ndb_redis/README b/modules/ndb_redis/README index e0258a3..f66c4db 100644 --- a/modules/ndb_redis/README +++ b/modules/ndb_redis/README @@ -10,7 +10,13 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2011 asipto.com +Vicente Hernando + + <vhernando(a)systemonenoc.com> + + Copyright © 2011 asipto.com + + Copyright © 2012 www.systemonenoc.com __________________________________________________________________ Table of Contents @@ -30,11 +36,13 @@ Daniel-Constantin Mierla 4. Functions 4.1. redis_cmd(srvname, command, replyid) + 4.2. redis_free(replyid) List of Examples 1.1. Set server parameter 1.2. redis_cmd usage + 1.3. redis_free usage Chapter 1. Admin Guide @@ -53,6 +61,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. redis_cmd(srvname, command, replyid) + 4.2. redis_free(replyid) 1. Overview @@ -107,8 +116,9 @@ modparam("ndb_redis", "server", "name=srvX;addr=127.0.0.2;port=6379;db=4") 4. Functions 4.1. redis_cmd(srvname, command, replyid) + 4.2. redis_free(replyid) -4.1. redis_cmd(srvname, command, replyid) +4.1. redis_cmd(srvname, command, replyid) Send a command to REDIS server identified by srvname. The reply will be stored in a local continer identified by replyid. All the parameters @@ -148,3 +158,22 @@ if(redis_cmd("srvN", "HMGET foo_key field1 field3", "r")) { xlog("first values: $redis(r=>value[0]) , $redis(r=>value[1])\n"); } ... + +4.2. redis_free(replyid) + + Free a previous reply from memory. After this function call, accessing + to a freed replyid returns null value. + + It is not necessary to free a reply to use it again in a new redis_cmd + function. When ndb_redis module closes, all pending replies are freed + automatically, so you only need to use this function if you perform a + lot of redis command requests with different replyid. + + Example 1.3. redis_free usage +... +After a redis command call: + redis_cmd("srvN", "INCR cnt", "r"); + +when reply not used anymore: + redis_free("r"); +...

1 0

git:master: ndb_redis: redis_free function.
by Vicente Hernando 19 Jun '12

19 Jun '12

Module: sip-router Branch: master Commit: 13bbe5ef4575cb9018bea5b1d6871214ab7287d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13bbe5e… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Tue Jun 19 05:56:24 2012 -0400 ndb_redis: redis_free function. - Free an unused ndb_redis reply, including also its inner rplRedis structure. --- modules/ndb_redis/doc/ndb_redis.xml | 9 ++++++ modules/ndb_redis/doc/ndb_redis_admin.xml | 27 +++++++++++++++++ modules/ndb_redis/ndb_redis_mod.c | 24 +++++++++++++++- modules/ndb_redis/redis_client.c | 44 +++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+), 1 deletions(-) diff --git a/modules/ndb_redis/doc/ndb_redis.xml b/modules/ndb_redis/doc/ndb_redis.xml index f9caa15..cd1d752 100644 --- a/modules/ndb_redis/doc/ndb_redis.xml +++ b/modules/ndb_redis/doc/ndb_redis.xml @@ -23,11 +23,20 @@ <surname>Mierla</surname> <email>miconda(a)gmail.com</email> </editor> + <author> + <firstname>Vicente</firstname> + <surname>Hernando</surname> + <email>vhernando(a)systemonenoc.com</email> + </author> </authorgroup> <copyright> <year>2011</year> <holder>asipto.com</holder> </copyright> + <copyright> + <year>2012</year> + <holder>www.systemonenoc.com</holder> + </copyright> </bookinfo> <toc></toc> diff --git a/modules/ndb_redis/doc/ndb_redis_admin.xml b/modules/ndb_redis/doc/ndb_redis_admin.xml index 1b4aa18..11345c5 100644 --- a/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -158,6 +158,33 @@ if(redis_cmd("srvN", "HMGET foo_key field1 field3", "r")) { </programlisting> </example> </section> + <section> + <title> + <function moreinfo="none">redis_free(replyid)</function> + </title> + <para> + Free a previous reply from memory. + After this function call, accessing to a freed replyid returns null value. + </para> + <para> + It is not necessary to free a reply to use it again in a new redis_cmd + function. When ndb_redis module closes, all pending replies are freed + automatically, so you only need to use this function if you perform a + lot of redis command requests with different replyid. + </para> + <example> + <title><function>redis_free</function> usage</title> + <programlisting format="linespecific"> +... +After a redis command call: + redis_cmd("srvN", "INCR cnt", "r"); + +when reply not used anymore: + redis_free("r"); +... + </programlisting> + </example> + </section> </section> </chapter> diff --git a/modules/ndb_redis/ndb_redis_mod.c b/modules/ndb_redis/ndb_redis_mod.c index d91626c..c1f2b13 100644 --- a/modules/ndb_redis/ndb_redis_mod.c +++ b/modules/ndb_redis/ndb_redis_mod.c @@ -52,6 +52,8 @@ static int w_redis_cmd6(struct sip_msg* msg, char* ssrv, char* scmd, char *sargv1, char *sargv2, char *sargv3, char* sres); static int fixup_redis_cmd6(void** param, int param_no); +static int w_redis_free_reply(struct sip_msg* msg, char* res); + static int mod_init(void); static void mod_destroy(void); static int child_init(int rank); @@ -76,6 +78,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"redis_cmd", (cmd_function)w_redis_cmd6, 6, fixup_redis_cmd6, 0, ANY_ROUTE}, + {"redis_free", (cmd_function)w_redis_free_reply, 1, fixup_spve_null, + 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -291,12 +295,30 @@ static int fixup_redis_cmd6(void** param, int param_no) /** * */ +static int w_redis_free_reply(struct sip_msg* msg, char* res) +{ + str name; + + if(fixup_get_svalue(msg, (gparam_t*)res, &name)!=0) + { + LM_ERR("no redis reply name\n"); + return -1; + } + + if(redisc_free_reply(&name)<0) + return -1; + + return 1; +} + +/** + * + */ int redis_srv_param(modparam_t type, void *val) { return redisc_add_server((char*)val); } - /** * */ diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 9066fda..34d2314 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -364,3 +364,47 @@ redisc_reply_t *redisc_get_reply(str *name) _redisc_rpl_list = rpl; return rpl; } + + +/** + * + */ +int redisc_free_reply(str *name) +{ + redisc_reply_t *rpl, *prev_rpl, *next_rpl; + unsigned int hid; + + hid = get_hash1_raw(name->s, name->len); + + prev_rpl = NULL; + rpl = _redisc_rpl_list; + while(rpl) { + + if(rpl->hname==hid && rpl->rname.len==name->len + && strncmp(rpl->rname.s, name->s, name->len)==0) { + next_rpl = rpl->next; + if(rpl->rplRedis) + freeReplyObject(rpl->rplRedis); + + if(rpl->rname.s != NULL) + pkg_free(rpl->rname.s); + + pkg_free(rpl); + + if(prev_rpl==NULL) { + /* We delete first element in the list. */ + _redisc_rpl_list = next_rpl; + } else { + prev_rpl->next = next_rpl; + } + + return 0; + } + + prev_rpl = rpl; + rpl = rpl->next; + } + + /* reply entry not found. */ + return -1; +}

1 0

Kamailio support for User Agent configuration
by Owen Lynch 19 Jun '12

19 Jun '12

I am investigating Kamailio's suitability as a SIP proxy that supports UA configuration per RFC 6080. In the lateset release (3.3), a stub implementation exists (presence_profile module) but it depends on the presence module. The presence module implements the generic SIP eventing mechanism as well as presence-specific event handling. It allows for other events to be handled via extension modules but there remains significant handling that presumes 'presence'. I would like to support configuration of a device independent of any presence support, but this would appear to require significant refactoring of the presence module. Have I got this right? If so, any suggestions on the best way forward? Thanks, Owen Lynch

1 0

WebSocket (RFC 6455) and draft-ibc-sipcore-sip-websocket on Kamailio
by Peter Dunkley 18 Jun '12

18 Jun '12

Hello, Crocodile is looking at adding WebSocket as a SIP transport to Kamailio (including WebSockets over TLS). I wanted to check to see if anyone else was working on this, or if anyone else is interested in working on this with us? Also, I would be interested in any advice or notes anyone has on adding a new protocol/transport, as this touches on a lot of parts of Kamailio I am not familiar with. Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

5 12

git:3.3: pkg/rpms: version set to 3.3.0 for kamailio old rpm specs
by Daniel-Constantin Mierla 18 Jun '12

18 Jun '12

Module: sip-router Branch: 3.3 Commit: 0a4d234b96fa7387a6a33775ce5e411b645230b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a4d234… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 18 13:04:19 2012 +0200 pkg/rpms: version set to 3.3.0 for kamailio old rpm specs --- pkg/kamailio/rpm/kamailio.spec-4.1 | 2 +- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- pkg/kamailio/rpm/kamailio.spec.SuSE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 12b02f0..8c6683c 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 1.2.0 +%define ver 3.3.0 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 4170ee7..f329292 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.2.0 +%define ver 3.3.0 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 77af948..4e529b8 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 1.2.0 +%define ver 3.3.0 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:3.3: Makefile.defs: version set to 3.3.0
by Daniel-Constantin Mierla 18 Jun '12

18 Jun '12

Module: sip-router Branch: 3.3 Commit: e75049356d061700475bb062231bdc2d1f64c73c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e750493… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 18 13:23:23 2012 +0200 Makefile.defs: version set to 3.3.0 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 0a5a2ed..0e27865 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -rc0 +EXTRAVERSION = # memory debugger switcher # 0 - off (release mode)

1 0

git:3.3: ChangeLog: updated the content for v3.3.0
by Daniel-Constantin Mierla 18 Jun '12

18 Jun '12

Module: sip-router Branch: 3.3 Commit: c889a925f0beacd89970731d0c3f83c4fbeffd3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c889a92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 18 13:23:02 2012 +0200 ChangeLog: updated the content for v3.3.0 --- ChangeLog |16676 ++++++++++++++++++++++++------------------------------------- 1 files changed, 6655 insertions(+), 10021 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c88…

1 0

git:3.3: pkg/debs: version set to 3.3.0 for kamailio deb specs
by Daniel-Constantin Mierla 18 Jun '12

18 Jun '12

Module: sip-router Branch: 3.3 Commit: 8e15ac0ec2d9c154898b52378441f4d68d268caa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8e15ac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 18 13:01:43 2012 +0200 pkg/debs: version set to 3.3.0 for kamailio deb specs --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/lenny/changelog | 6 ++++++ pkg/kamailio/deb/lucid/changelog | 6 ++++++ pkg/kamailio/deb/precise/changelog | 6 ++++++ pkg/kamailio/deb/squeeze/changelog | 6 ++++++ pkg/kamailio/deb/wheezy/changelog | 6 ++++++ 6 files changed, 36 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index f3858c9..a6d9fdc 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (3.3.0) unstable; urgency=low + + * update to 3.3.0 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 18 Jun 2011 10:20:00 +0100 + kamailio (3.3.0-rc0) unstable; urgency=low * update version to 3.3.0-rc0 diff --git a/pkg/kamailio/deb/lenny/changelog b/pkg/kamailio/deb/lenny/changelog index f3858c9..74257cc 100644 --- a/pkg/kamailio/deb/lenny/changelog +++ b/pkg/kamailio/deb/lenny/changelog @@ -1,3 +1,9 @@ +kamailio (3.3.0) unstable; urgency=low + + * update to 3.3.0 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 18 Jun 2012 10:20:00 +0100 + kamailio (3.3.0-rc0) unstable; urgency=low * update version to 3.3.0-rc0 diff --git a/pkg/kamailio/deb/lucid/changelog b/pkg/kamailio/deb/lucid/changelog index f3858c9..a6d9fdc 100644 --- a/pkg/kamailio/deb/lucid/changelog +++ b/pkg/kamailio/deb/lucid/changelog @@ -1,3 +1,9 @@ +kamailio (3.3.0) unstable; urgency=low + + * update to 3.3.0 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 18 Jun 2011 10:20:00 +0100 + kamailio (3.3.0-rc0) unstable; urgency=low * update version to 3.3.0-rc0 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index f3858c9..a6d9fdc 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (3.3.0) unstable; urgency=low + + * update to 3.3.0 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 18 Jun 2011 10:20:00 +0100 + kamailio (3.3.0-rc0) unstable; urgency=low * update version to 3.3.0-rc0 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index f3858c9..a6d9fdc 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (3.3.0) unstable; urgency=low + + * update to 3.3.0 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 18 Jun 2011 10:20:00 +0100 + kamailio (3.3.0-rc0) unstable; urgency=low * update version to 3.3.0-rc0 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index f3858c9..a6d9fdc 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (3.3.0) unstable; urgency=low + + * update to 3.3.0 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 18 Jun 2011 10:20:00 +0100 + kamailio (3.3.0-rc0) unstable; urgency=low * update version to 3.3.0-rc0

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2012