sr-dev June 2011

sr-dev@lists.kamailio.org

32 participants
167 discussions

git:master: kamailio.cfg: removed append_branch() from failure_route
by Daniel-Constantin Mierla 01 Jun '11

01 Jun '11

Module: sip-router Branch: master Commit: 9f542264b8d022959a2006af6fe73dd6b7cfbf13 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f54226… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 25 22:54:53 2011 +0200 kamailio.cfg: removed append_branch() from failure_route - it is no longer necessary --- etc/kamailio.cfg | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 5e6d9f7..decfd0f 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -837,7 +837,7 @@ failure_route[FAIL_ONE] { # uncomment the following lines if you want to block client # redirect based on 3xx replies. ##if (t_check_status("3[0-9][0-9]")) { - ##t_reply("404","Not found"); + ## t_reply("404","Not found"); ## exit; ##} @@ -845,8 +845,6 @@ failure_route[FAIL_ONE] { # calls to a different new destination ##if (t_check_status("486|408")) { ## sethostport("192.168.2.100:5060"); - ## append_branch(); - ## # do not set the missed call flag again ## t_relay(); ##} }

2 2

git:mariusbucur/dmq: added a small serialization function for further use in htable dmq
by Marius Ovidiu Bucur 01 Jun '11

01 Jun '11

Module: sip-router Branch: mariusbucur/dmq Commit: 1a512407932698d123d0105d0bae16321e345505 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a51240… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Wed Jun 1 17:18:37 2011 +0300 added a small serialization function for further use in htable dmq --- modules_k/htable/ht_serialize.c | 45 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/ht_serialize.c b/modules_k/htable/ht_serialize.c new file mode 100644 index 0000000..e3aeab5 --- /dev/null +++ b/modules_k/htable/ht_serialize.c @@ -0,0 +1,45 @@ +#include "ht_var.h" +#include "../../str.h" +#include "ht_serialize.h" +#include "../../basex.h" + +int serialize_ht_pair(pv_value_t* val, str* htname, str* s, int len) { + str encoded_val = {0, 0}; + str encoded_htname = {0, 0}; + if (!s) { + LM_ERR("no destination string given\n"); + goto error; + } + if(!htname || !htname->s || !htname->len) { + LM_ERR("no hashtable name given\n"); + goto error; + } + if(val->rs.len) { + encoded_val.len = base64_enc_len(val->rs.len); + encoded_val.s = pkg_malloc(encoded_val.len); + if(base64_enc((unsigned char*)val->rs.s, val->rs.len, (unsigned char*)encoded_val.s, encoded_val.len) < 0) { + LM_ERR("cannot base64 value\n"); + goto error; + } + } + encoded_htname.len = base64_enc_len(htname->len); + encoded_htname.s = pkg_malloc(encoded_htname.len); + if(base64_enc((unsigned char*)htname->s, htname->len, (unsigned char*)encoded_htname.s, encoded_htname.len) < 0) { + LM_ERR("cannot base64 value\n"); + goto error; + } + s->len = snprintf(s->s, len, "%d %d %.*s %.*s", val->flags, val->ri, STR_FMT(&encoded_htname), STR_FMT(&encoded_val)); + if(s->len < 0) { + LM_ERR("cannot serialize data - probably an small buffer\n"); + goto error; + } + return 0; +error: + if(encoded_val.s) { + pkg_free(encoded_val.s); + } + if(encoded_htname.s) { + pkg_free(encoded_htname.s); + } + return -1; +} \ No newline at end of file diff --git a/modules_k/htable/ht_serialize.h b/modules_k/htable/ht_serialize.h new file mode 100644 index 0000000..e69de29

1 0

Re: [sr-dev] Kamailio Dispatcher Module with Xcap
by laura testi 01 Jun '11

01 Jun '11

Thanks Iñaki, I'm sorry, I'll do it next time. kind regards, laura > 2011/5/30 laura testi <lau.testi(a)gmail.com>: >> Could you please tell me if I can use the Dispatcher for processing XCAP >> requests? > > Sure not. I recommend you using Nginx HTTP proxy, really efficient and > a very good choice for HTTP load-balancing and failover. Anyhow, please use the sr-users mailist for this kind of questions ;) -- I?aki Baz Castillo <ibc(a)aliax.net> ------------------------------ _______________________________________________ sr-dev mailing list sr-dev(a)lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev End of sr-dev Digest, Vol 32, Issue 1 *************************************

1 0

git:3.1: deb pkg: add start suggestions for mysql, postgresql and radius, suggested from Rick Aldred
by Henning Westerholt 01 Jun '11

01 Jun '11

Module: sip-router Branch: 3.1 Commit: d8c08a50fd1366ddd10ee079a4594cba6684236e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8c08a5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 30 14:17:32 2011 +0200 deb pkg: add start suggestions for mysql, postgresql and radius, suggested from Rick Aldred (cherry picked from commit 33f7e045768298e8e48231820fb0116398d80c2f) --- pkg/kamailio/deb/lenny/kamailio.init | 7 ++----- pkg/kamailio/deb/lucid/kamailio.init | 7 ++----- pkg/kamailio/deb/squeeze/kamailio.init | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pkg/kamailio/deb/lenny/kamailio.init b/pkg/kamailio/deb/lenny/kamailio.init index e5f50fc..ab54d0c 100644 --- a/pkg/kamailio/deb/lenny/kamailio.init +++ b/pkg/kamailio/deb/lenny/kamailio.init @@ -4,16 +4,13 @@ # Provides: kamailio # Required-Start: $syslog $network $local_fs $time # Required-Stop: $syslog $network $local_fs +# Should-Start: mysql postgresql freeradius +# Should-Stop: mysql postgresql freeradius # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start the Kamailio SIP proxy server # Description: Start the Kamailio SIP proxy server ### END INIT INFO -# -# TODO: -# The following fields should be added (and completed): -# Should-Start: postgresql mysql radius -# Should-Stop: postgresql mysql radius PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/kamailio diff --git a/pkg/kamailio/deb/lucid/kamailio.init b/pkg/kamailio/deb/lucid/kamailio.init index e5f50fc..ab54d0c 100644 --- a/pkg/kamailio/deb/lucid/kamailio.init +++ b/pkg/kamailio/deb/lucid/kamailio.init @@ -4,16 +4,13 @@ # Provides: kamailio # Required-Start: $syslog $network $local_fs $time # Required-Stop: $syslog $network $local_fs +# Should-Start: mysql postgresql freeradius +# Should-Stop: mysql postgresql freeradius # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start the Kamailio SIP proxy server # Description: Start the Kamailio SIP proxy server ### END INIT INFO -# -# TODO: -# The following fields should be added (and completed): -# Should-Start: postgresql mysql radius -# Should-Stop: postgresql mysql radius PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/kamailio diff --git a/pkg/kamailio/deb/squeeze/kamailio.init b/pkg/kamailio/deb/squeeze/kamailio.init index e5f50fc..ab54d0c 100644 --- a/pkg/kamailio/deb/squeeze/kamailio.init +++ b/pkg/kamailio/deb/squeeze/kamailio.init @@ -4,16 +4,13 @@ # Provides: kamailio # Required-Start: $syslog $network $local_fs $time # Required-Stop: $syslog $network $local_fs +# Should-Start: mysql postgresql freeradius +# Should-Stop: mysql postgresql freeradius # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start the Kamailio SIP proxy server # Description: Start the Kamailio SIP proxy server ### END INIT INFO -# -# TODO: -# The following fields should be added (and completed): -# Should-Start: postgresql mysql radius -# Should-Stop: postgresql mysql radius PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/kamailio

1 0

db_sqlite branch review request
by Timo Teräs 01 Jun '11

01 Jun '11

Hi all, The db_sqlite module is now getting ready for merge to master... It would be nice if it'd get some scrutiny from other developer before the merge, though. So far I've now addressed the earlier comments based on the original patch, added the docbook notes / README, Natanael Copa contributed the kamdbctl related work, and Henning Westerholt did the automation of the SQL script generation from the XML schema. Unless there's major things, I'm planning to merge with master late this week. Thanks, Timo

2 3

git:3.1: imc: keep db handle open for main process
by Daniel-Constantin Mierla 01 Jun '11

01 Jun '11

Module: sip-router Branch: 3.1 Commit: 8c763b4f2565dba4f640ab22a83e101946fdbc4e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c763b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 1 12:36:09 2011 +0200 imc: keep db handle open for main process - the module sync's back to database at shutdown - dicovered based on an email by Ozren Lapcevic (cherry picked from commit 3402cfd8461c6c94dfc601d9f40116bdbdf8e0a4) --- modules_k/imc/imc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/imc/imc.c b/modules_k/imc/imc.c index ccbea01..a948f15 100644 --- a/modules_k/imc/imc.c +++ b/modules_k/imc/imc.c @@ -437,7 +437,7 @@ static int mod_init(void) */ static int child_init(int rank) { - if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) + if (rank==PROC_INIT || rank==PROC_TCP_MAIN) return 0; /* do nothing for the main process */ if (imc_dbf.init==0)

1 0

git:master: imc: keep db handle open for main process
by Daniel-Constantin Mierla 01 Jun '11

01 Jun '11

Module: sip-router Branch: master Commit: 3402cfd8461c6c94dfc601d9f40116bdbdf8e0a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3402cfd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 1 12:36:09 2011 +0200 imc: keep db handle open for main process - the module sync's back to database at shutdown - dicovered based on an email by Ozren Lapcevic --- modules_k/imc/imc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/imc/imc.c b/modules_k/imc/imc.c index ccbea01..a948f15 100644 --- a/modules_k/imc/imc.c +++ b/modules_k/imc/imc.c @@ -437,7 +437,7 @@ static int mod_init(void) */ static int child_init(int rank) { - if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) + if (rank==PROC_INIT || rank==PROC_TCP_MAIN) return 0; /* do nothing for the main process */ if (imc_dbf.init==0)

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