sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

git:master: Merged the extension of the dialog- and rr-modules from my carstenbock/ ims branch into master
by Carsten Bock 04 Apr '11

04 Apr '11

Module: sip-router Branch: master Commit: 60d9c5574f4bf3cd0deb560b9a3f12bc019f95fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60d9c55… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Mon Apr 4 17:01:22 2011 +0200 Merged the extension of the dialog- and rr-modules from my carstenbock/ims branch into master --- modules_k/dialog/dialog.c | 29 ++- modules_k/dialog/dlg_db_handler.c | 371 +++++++++++++++++++++----------- modules_k/dialog/dlg_db_handler.h | 25 ++- modules_k/dialog/dlg_handlers.c | 22 ++- modules_k/dialog/dlg_handlers.h | 3 +- modules_k/dialog/dlg_hash.c | 33 ++- modules_k/dialog/dlg_hash.h | 7 +- modules_k/dialog/dlg_var.c | 275 ++++++++++++++++++++++++- modules_k/dialog/dlg_var.h | 22 ++ modules_k/dialog/doc/dialog.xml | 19 ++ modules_k/dialog/doc/dialog_admin.xml | 124 +++++++++++- modules_k/rr/doc/rr.xml | 12 + modules_k/rr/doc/rr_admin.xml | 19 ++- modules_k/rr/loose.c | 10 +- modules_k/rr/rr_mod.c | 61 ++++++- 15 files changed, 859 insertions(+), 173 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=60d…

1 0

preparing kamailio v3.1.3
by Daniel-Constantin Mierla 04 Apr '11

04 Apr '11

Hello, it is almost 2 months since we packaged 3.1.2, there are commits accumulated in branch 3.1, therefore I plan to package 3.1.3 Monday or Tuesday next week. If anyone has something to add in this regards, please reply. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

1 1

Re: [sr-dev] [SR-Users] [PATCH] modules_k/db_sqlite: new sql backend
by Daniel-Constantin Mierla 04 Apr '11

04 Apr '11

Hi Timo, thanks, that is very useful! I was playing with the idea of developing it for using in small deployments and embedded devices, but couldn't find any time for it ... To get the code in the repository, there are some things that need to be sorted out: - code reviewing - from my point of view it looks ok, only readme (and associated docbook files) is missing, but since the module is not exporting parameters/functions to config, that should be straightforward to do, basically a short description about the purpose of the module - the new module must have a maintainer for one year. This is to ensure the others can ask questions to somebody in case of troubles and get to know the module properly to be maintained commonly afterwards if the initial maintainer is no longer active. Are you willing to become the maintainer? If yes, we will grant you developer access so you can handle the module directly in the git repository - I will send you another email in this case. If you don't, then maybe another developer volunteers for it Depending on whether you want to maintain the module or not, we should get your new module first in a private branch or project's tracker so other developers can look at it if they want. Cheers, Daniel On 4/4/11 11:49 AM, Timo Teräs wrote: > Implements the kamailio database API for SQLite. ... -- Daniel-Constantin Mierla http://www.asipto.com

1 0

library dir for x86_64 - lib or lib64
by Daniel-Constantin Mierla 04 Apr '11

04 Apr '11

Hello, iirc this was at some point discussed, however, I want to go through it again. Many x86_64 distros expect libraries to be placed under a lib64 directory. For example the RPM spec file language returns /usr/lib64 for %{_libdir} variable. In the master branch I committed a patch that does this detection. As I saw some people saying that 'lib' should be the default also for x86_64, my question is then what do you think we should use? Using 'lib' will definitely make building rpms fail unless we do a patch specific for these distros. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

3 2

git:3.1: modules/carrierroute fixed permission checking in mod_init
by Marius Zbihlei 04 Apr '11

04 Apr '11

Module: sip-router Branch: 3.1 Commit: 26916560205d294ad09d35166c754516bf122e49 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2691656… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Apr 1 17:14:01 2011 +0300 modules/carrierroute fixed permission checking in mod_init Check the permission of the cfg file based on the user settings passed to the daemon, it it applies (cherry picked from commit 78f3ede8c89a0456460158157439da90290ee8ad) --- modules/carrierroute/carrierroute.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/carrierroute/carrierroute.c b/modules/carrierroute/carrierroute.c index 1a7abe7..3200cb2 100644 --- a/modules/carrierroute/carrierroute.c +++ b/modules/carrierroute/carrierroute.c @@ -40,6 +40,7 @@ #include "../../sr_module.h" #include "../../str.h" #include "../../mem/mem.h" +#include "../../ut.h" /* for user2uid() */ #include "carrierroute.h" #include "cr_fixup.h" #include "cr_map.h" @@ -154,6 +155,8 @@ struct module_exports exports = { */ static int mod_init(void) { struct stat fs; + extern char* user; /*from main.c*/ + int uid, gid; if(register_mi_mod(exports.name, mi_cmds)!=0) { @@ -197,9 +200,20 @@ static int mod_init(void) { if(fs.st_mode & S_IWOTH){ LM_WARN("insecure file permissions, routing data is world writeable\n"); } + + if (user){ + if (user2uid(&uid, &gid, user)<0){ + LM_ERR("bad user name/uid number: -u %s\n", user); + return -1; + } + } else { + uid = geteuid(); + gid = getegid(); + } + if( !( fs.st_mode & S_IWOTH) && - !((fs.st_mode & S_IWGRP) && (fs.st_gid == getegid())) && - !((fs.st_mode & S_IWUSR) && (fs.st_uid == geteuid())) ) { + !((fs.st_mode & S_IWGRP) && (fs.st_gid == uid)) && + !((fs.st_mode & S_IWUSR) && (fs.st_uid == gid))) { LM_ERR("config file %s not writable\n", config_file); return -1; }

1 0

git:master: modules/carrierroute fixed permission checking in mod_init
by Marius Zbihlei 01 Apr '11

01 Apr '11

Module: sip-router Branch: master Commit: 78f3ede8c89a0456460158157439da90290ee8ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78f3ede… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Apr 1 17:14:01 2011 +0300 modules/carrierroute fixed permission checking in mod_init Check the permission of the cfg file based on the user settings passed to the daemon, it it applies --- modules/carrierroute/carrierroute.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/carrierroute/carrierroute.c b/modules/carrierroute/carrierroute.c index 1a7abe7..3200cb2 100644 --- a/modules/carrierroute/carrierroute.c +++ b/modules/carrierroute/carrierroute.c @@ -40,6 +40,7 @@ #include "../../sr_module.h" #include "../../str.h" #include "../../mem/mem.h" +#include "../../ut.h" /* for user2uid() */ #include "carrierroute.h" #include "cr_fixup.h" #include "cr_map.h" @@ -154,6 +155,8 @@ struct module_exports exports = { */ static int mod_init(void) { struct stat fs; + extern char* user; /*from main.c*/ + int uid, gid; if(register_mi_mod(exports.name, mi_cmds)!=0) { @@ -197,9 +200,20 @@ static int mod_init(void) { if(fs.st_mode & S_IWOTH){ LM_WARN("insecure file permissions, routing data is world writeable\n"); } + + if (user){ + if (user2uid(&uid, &gid, user)<0){ + LM_ERR("bad user name/uid number: -u %s\n", user); + return -1; + } + } else { + uid = geteuid(); + gid = getegid(); + } + if( !( fs.st_mode & S_IWOTH) && - !((fs.st_mode & S_IWGRP) && (fs.st_gid == getegid())) && - !((fs.st_mode & S_IWUSR) && (fs.st_uid == geteuid())) ) { + !((fs.st_mode & S_IWGRP) && (fs.st_gid == uid)) && + !((fs.st_mode & S_IWUSR) && (fs.st_uid == gid))) { LM_ERR("config file %s not writable\n", config_file); return -1; }

1 0

git:master: modules_k/textops : fix pointer return in substr transformation
by Marius Zbihlei 01 Apr '11

01 Apr '11

Module: sip-router Branch: master Commit: a3bb95fcaf85199e5707a25eeef98a712719de29 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3bb95f… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Apr 1 13:22:05 2011 +0300 modules_k/textops : fix pointer return in substr transformation Replace a local buffer with a static one, as a pointer to it was returned outside of the function Credits go to Timo Teräs for spotting the bug (cherry picked from commit 87f995b66b1f58f9f85b604ba1214412819c9417) --- modules_k/textops/txt_var.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/textops/txt_var.c b/modules_k/textops/txt_var.c index ae1fce6..a13e5e1 100644 --- a/modules_k/textops/txt_var.c +++ b/modules_k/textops/txt_var.c @@ -41,7 +41,7 @@ int tr_txt_eval_re(struct sip_msg *msg, tr_param_t *tp, int subtype, int nmatches; str* result; #define TR_TXT_BUF_SIZE 2048 - char tr_txt_buf[TR_TXT_BUF_SIZE]; + static char tr_txt_buf[TR_TXT_BUF_SIZE]; if(val==NULL || (!(val->flags&PV_VAL_STR)) || val->rs.len<=0) return -1;

1 0

git:3.1: modules_k/textops : fix pointer return in substr transformation
by Marius Zbihlei 01 Apr '11

01 Apr '11

Module: sip-router Branch: 3.1 Commit: 87f995b66b1f58f9f85b604ba1214412819c9417 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87f995b… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Apr 1 13:22:05 2011 +0300 modules_k/textops : fix pointer return in substr transformation Replace a local buffer with a static one, as a pointer to it was returned outside of the function Credits go to Timo Teräs for spotting the bug --- modules_k/textops/txt_var.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/textops/txt_var.c b/modules_k/textops/txt_var.c index ae1fce6..a13e5e1 100644 --- a/modules_k/textops/txt_var.c +++ b/modules_k/textops/txt_var.c @@ -41,7 +41,7 @@ int tr_txt_eval_re(struct sip_msg *msg, tr_param_t *tp, int subtype, int nmatches; str* result; #define TR_TXT_BUF_SIZE 2048 - char tr_txt_buf[TR_TXT_BUF_SIZE]; + static char tr_txt_buf[TR_TXT_BUF_SIZE]; if(val==NULL || (!(val->flags&PV_VAL_STR)) || val->rs.len<=0) return -1;

1 0

git:3.1: rls(k): update_rlsubs() broken in two funtions
by Daniel-Constantin Mierla 01 Apr '11

01 Apr '11

Module: sip-router Branch: 3.1 Commit: 44d1984ebf7a6ef23a2ae6a2a6e7577bb75a0f37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44d1984… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 1 12:13:39 2011 +0200 rls(k): update_rlsubs() broken in two funtions - deletion from hash table of expired subscriptions is done separately now in remove_expired_rlsubs() - should allow proper notification in case of un-SUBSCRIBE events, first doing updated of rlsubs, then sending NOTIFY requests and then deleting from hash table - reported by Peter Dunkley - added several safety checks about size of built attributes, used variables, trimmed whitespaces from attributes added in bodies to save some bytes on the network (cherry picked from commit b571356226b35a4f971ef77e4a83cc503de97fd8) --- modules_k/rls/notify.c | 8 +++- modules_k/rls/resource_notify.c | 30 ++++++++----- modules_k/rls/rls.c | 10 +++- modules_k/rls/rls.h | 21 ++++++--- modules_k/rls/subscribe.c | 92 +++++++++++++++++++++++++------------- 5 files changed, 108 insertions(+), 53 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=44d…

1 0

git:master: rls(k): update_rlsubs() broken in two funtions
by Daniel-Constantin Mierla 01 Apr '11

01 Apr '11

Module: sip-router Branch: master Commit: b571356226b35a4f971ef77e4a83cc503de97fd8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b571356… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 1 12:13:39 2011 +0200 rls(k): update_rlsubs() broken in two funtions - deletion from hash table of expired subscriptions is done separately now in remove_expired_rlsubs() - should allow proper notification in case of un-SUBSCRIBE events, first doing updated of rlsubs, then sending NOTIFY requests and then deleting from hash table - reported by Peter Dunkley - added several safety checks about size of built attributes, used variables, trimmed whitespaces from attributes added in bodies to save some bytes on the network --- modules_k/rls/notify.c | 8 +++- modules_k/rls/resource_notify.c | 30 ++++++++----- modules_k/rls/rls.c | 10 +++- modules_k/rls/rls.h | 21 ++++++--- modules_k/rls/subscribe.c | 92 +++++++++++++++++++++++++------------- 5 files changed, 108 insertions(+), 53 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b57…

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