sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
347 discussions

git:master: lib/kcore: parse Supported header recognize gruu
by Daniel-Constantin Mierla 13 Apr '12

13 Apr '12

Module: sip-router Branch: master Commit: 74f727eb90ad7d1a7e639da17887bc665e4b64b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74f727e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 13 14:40:47 2012 +0200 lib/kcore: parse Supported header recognize gruu --- lib/kcore/parse_supported.c | 9 ++++++++- lib/kcore/parse_supported.h | 5 +++++ 2 files changed, 13 … [View More]

1 0

Dialplan extension with redis backend
by Javier Gallart 12 Apr '12

12 Apr '12

Hello all we've been thinking of extending the dialplan module for using redis as its backend. These are our thoughts of how we to use it. For a regular sql backend, each table has 4 main fields: dpid,match_exp,subst_exp,repl_exp dpid is given as argument to the only function exported by the module (dp_translate). There are two additional arguments to the function, the source variable upon which the lookup and translation are to be performed and the variable where the transformation will be … [View More]

2 4

a bit about dialog module
by Daniel-Constantin Mierla 11 Apr '12

11 Apr '12

Hello, the internal dialog id - the pair h_entry,h_id - seems exposed to some issues. They: - h_entry is the slot index (in the internal hash table) where the dialog structure will be stored - h_id is an incremented counter for each slot h_entry is computed as a hash function over Call-Id value, then made modulo nr. of slots. The problems can appear upon restart when changing the hash_size module parameter: http://kamailio.org/docs/modules/stable/modules_k/dialog.html#id2534423 If it … [View More]

2 2

git:master: db_cluster: if a db query fails, mark connection inactive
by Daniel-Constantin Mierla 11 Apr '12

11 Apr '12

Module: sip-router Branch: master Commit: b46c6f66e1aa64bc038d7495915c0fd646fcf8fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b46c6f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 10 00:00:05 2012 +0200 db_cluster: if a db query fails, mark connection inactive - default inactive time is 300sec - value can be chanded via inactive_interval parameter --- modules_k/… [View More]db_cluster/db_cluster_mod.c | 3 ++ modules_k/db_cluster/dbcl_api.c | 44 ++++++++++++++++++++++++--------- modules_k/db_cluster/dbcl_data.c | 28 +++++++++++++++++++++ modules_k/db_cluster/dbcl_data.h | 7 ++++- 4 files changed, 69 insertions(+), 13 deletions(-) diff --git a/modules_k/db_cluster/db_cluster_mod.c b/modules_k/db_cluster/db_cluster_mod.c index 12f642c..c0b78cb 100644 --- a/modules_k/db_cluster/db_cluster_mod.c +++ b/modules_k/db_cluster/db_cluster_mod.c @@ -36,6 +36,8 @@ int db_cluster_bind_api(db_func_t *dbb); int dbcl_con_param(modparam_t type, void *val); int dbcl_cls_param(modparam_t type, void *val); +int dbcl_inactive_interval = 300; + /*! \brief * DB Cluster module interface */ @@ -50,6 +52,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"connection", STR_PARAM|USE_FUNC_PARAM, (void*)dbcl_con_param}, {"cluster", STR_PARAM|USE_FUNC_PARAM, (void*)dbcl_cls_param}, + {"inactive_interval", INT_PARAM, &dbcl_inactive_interval}, {0, 0, 0} }; diff --git a/modules_k/db_cluster/dbcl_api.c b/modules_k/db_cluster/dbcl_api.c index 430ea98..9f79f35 100644 --- a/modules_k/db_cluster/dbcl_api.c +++ b/modules_k/db_cluster/dbcl_api.c @@ -47,7 +47,7 @@ db1_con_t *dbh=NULL;\ dbcl_cls_t *cls=NULL;\ cls = (dbcl_cls_t*)_h->tail;\ - ret = 0;\ + ret = -1;\ for(i=DBCL_PRIO_SIZE-1; i>0; i--)\ {\ switch(cls->rlist[i].mode) {\ @@ -55,8 +55,7 @@ case 'S':\ for(j=0; j<cls->rlist[i].clen; j++)\ {\ - if(cls->rlist[i].clist[j] != NULL && cls->rlist[i].clist[j]->flags!=0\ - && cls->rlist[i].clist[j]->dbh != NULL)\ + if(dbcl_valid_con(cls->rlist[i].clist[j])==0)\ {\ LM_DBG("serial operation - cluster [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ @@ -65,6 +64,11 @@ if (ret==0) {\ cls->usedcon = cls->rlist[i].clist[j];\ return 0;\ + } else {\ + LM_DBG("serial operation - failre on cluster"\ + " [%.*s] (%d/%d)\n",\ + cls->name.len, cls->name.s, i, j);\ + dbcl_inactive_con(cls->rlist[i].clist[j]);\ }\ }\ }\ @@ -74,8 +78,7 @@ for(k=0; k<cls->rlist[i].clen; k++)\ {\ j = (process_no + k + cls->rlist[i].crt) % cls->rlist[i].clen;\ - if(cls->rlist[i].clist[j] != NULL && cls->rlist[i].clist[j]->flags!=0\ - && cls->rlist[i].clist[j]->dbh != NULL)\ + if(dbcl_valid_con(cls->rlist[i].clist[j])==0)\ {\ LM_DBG("round robin operation - cluster [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ @@ -86,6 +89,11 @@ cls->usedcon = cls->rlist[i].clist[j];\ cls->rlist[i].crt = (j+1) % cls->rlist[i].clen;\ return 0;\ + } else {\ + LM_DBG("round robin operation - failre on cluster"\ + " [%.*s] (%d/%d)\n",\ + cls->name.len, cls->name.s, i, j);\ + dbcl_inactive_con(cls->rlist[i].clist[j]);\ }\ }\ }\ @@ -110,7 +118,7 @@ db1_con_t *dbh=NULL;\ dbcl_cls_t *cls=NULL;\ cls = (dbcl_cls_t*)_h->tail;\ - ret = 0;\ + ret = -1;\ rok = 0;\ rc = 0;\ for(i=DBCL_PRIO_SIZE-1; i>0; i--)\ @@ -120,8 +128,7 @@ case 'S':\ for(j=0; j<cls->wlist[i].clen; j++)\ {\ - if(cls->wlist[i].clist[j] != NULL && cls->wlist[i].clist[j]->flags!=0\ - && cls->wlist[i].clist[j]->dbh != NULL)\ + if(dbcl_valid_con(cls->wlist[i].clist[j])==0)\ {\ LM_DBG("serial operation - cluster [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ @@ -130,6 +137,11 @@ if (ret==0) {\ cls->usedcon = cls->wlist[i].clist[j];\ return 0;\ + } else {\ + LM_DBG("serial operation - failure on cluster"\ + " [%.*s] (%d/%d)\n",\ + cls->name.len, cls->name.s, i, j);\ + dbcl_inactive_con(cls->wlist[i].clist[j]);\ }\ }\ }\ @@ -139,8 +151,7 @@ for(k=0; k<cls->wlist[i].clen; k++)\ {\ j = (process_no + k + cls->wlist[i].crt) % cls->wlist[i].clen;\ - if(cls->wlist[i].clist[j] != NULL && cls->wlist[i].clist[j]->flags!=0\ - && cls->wlist[i].clist[j]->dbh != NULL)\ + if(dbcl_valid_con(cls->wlist[i].clist[j])==0)\ {\ LM_DBG("round robin operation - cluster [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ @@ -151,6 +162,11 @@ cls->usedcon = cls->wlist[i].clist[j];\ cls->wlist[i].crt = (j+1) % cls->wlist[i].clen;\ return 0;\ + } else {\ + LM_DBG("round robin operation - failure on cluster"\ + " [%.*s] (%d/%d)\n",\ + cls->name.len, cls->name.s, i, j);\ + dbcl_inactive_con(cls->wlist[i].clist[j]);\ }\ }\ }\ @@ -159,8 +175,7 @@ case 'P':\ for(j=0; j<cls->wlist[i].clen; j++)\ {\ - if(cls->wlist[i].clist[j] != NULL && cls->wlist[i].clist[j]->flags!=0\ - && cls->wlist[i].clist[j]->dbh != NULL)\ + if(dbcl_valid_con(cls->wlist[i].clist[j])==0)\ {\ LM_DBG("parallel operation - cluster [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ @@ -169,6 +184,11 @@ if(rc==0) {\ cls->usedcon = cls->wlist[i].clist[j];\ rok = 1;\ + } else {\ + LM_DBG("parallel operation - failure on cluster"\ + " [%.*s] (%d/%d)\n",\ + cls->name.len, cls->name.s, i, j);\ + dbcl_inactive_con(cls->wlist[i].clist[j]);\ }\ ret |= rc;\ }\ diff --git a/modules_k/db_cluster/dbcl_data.c b/modules_k/db_cluster/dbcl_data.c index bb5d5fb..9533421 100644 --- a/modules_k/db_cluster/dbcl_data.c +++ b/modules_k/db_cluster/dbcl_data.c @@ -32,6 +32,7 @@ #include "../../dprint.h" #include "../../hashes.h" #include "../../trim.h" +#include "../../timer.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" @@ -123,6 +124,33 @@ int dbcl_init_con(str *name, str *url) return 0; } +int dbcl_valid_con(dbcl_con_t *sc) +{ + if(sc==NULL || sc->flags!=0 || sc->dbh!=NULL) + return -1; + if(sc->sinfo==NULL) + return 0; + if(sc->sinfo->state & DBCL_CON_INACTIVE) + { + if(sc->sinfo->aticks>0 && sc->sinfo->aticks<get_ticks()) + return -1; + sc->sinfo->aticks = 0; + sc->sinfo->state &= ~DBCL_CON_INACTIVE; + } + return 0; +} + +extern int dbcl_inactive_interval; + +int dbcl_inactive_con(dbcl_con_t *sc) +{ + if(sc==NULL || sc->sinfo==NULL) + return -1; + sc->sinfo->aticks = get_ticks() + dbcl_inactive_interval; + sc->sinfo->state |= DBCL_CON_INACTIVE; + return 0; +} + int dbcl_parse_con_param(char *val) { str name; diff --git a/modules_k/db_cluster/dbcl_data.h b/modules_k/db_cluster/dbcl_data.h index cc7a64b..ffb2c9f 100644 --- a/modules_k/db_cluster/dbcl_data.h +++ b/modules_k/db_cluster/dbcl_data.h @@ -40,10 +40,12 @@ #define DBCL_PRIO_SIZE 10 #define DBCL_CLIST_SIZE 5 +#define DBCL_CON_INACTIVE 1 + typedef struct dbcl_shared { int state; - int count; + unsigned int aticks; } dbcl_shared_t; typedef struct dbcl_con @@ -84,6 +86,9 @@ int dbcl_init_connections(dbcl_cls_t *cls); int dbcl_close_connections(dbcl_cls_t *cls); dbcl_cls_t *dbcl_get_cluster(str *name); +int dbcl_valid_con(dbcl_con_t *sc); +int dbcl_inactive_con(dbcl_con_t *sc); + int dbcl_parse_con_param(char *val); int dbcl_parse_cls_param(char *val); #endif /* KM_DBASE_H */ [View Less]

2 9

git:master: db_cluster: allow permanent inactive connection
by Daniel-Constantin Mierla 11 Apr '12

11 Apr '12

Module: sip-router Branch: master Commit: 7139fbd5d882595ff11af298918d268612ad8832 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7139fbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 11 13:33:59 2012 +0200 db_cluster: allow permanent inactive connection - activation time has to be set to 0 (to be possible via rpc commands) - fix check of activation time based on … [View More]

1 0

git:master: lib/srutils: reinit root part of sruid when counter overflows
by Daniel-Constantin Mierla 11 Apr '12

11 Apr '12

Module: sip-router Branch: master Commit: 5b8b34dc40d1e93507d82cedbc19d43a0c78c5a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b8b34d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 11 13:21:34 2012 +0200 lib/srutils: reinit root part of sruid when counter overflows - avoid in this way very unlikely UIDs overlapping (when a pid has to give more than 2^32 UIDs) --- … [View More]

1 0

git:master: dialog(k): if h_id overflows unsigned int, start from 1 again
by Daniel-Constantin Mierla 11 Apr '12

11 Apr '12

Module: sip-router Branch: master Commit: 6b296c86e0eed99ef62b94e2ce076558d5c77df5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b296c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 11 12:11:13 2012 +0200 dialog(k): if h_id overflows unsigned int, start from 1 again --- modules_k/dialog/dlg_hash.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --… [View More]

1 0

git:master: modules/sipcapture: Fixed hep offset calculation
by Marius Zbihlei 11 Apr '12

11 Apr '12

Module: sip-router Branch: master Commit: 5e61c68843c7be327f77f2f5adae6cd2efc40263 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e61c68… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 11 14:18:04 2012 +0300 modules/sipcapture: Fixed hep offset calculation Problem reported by dkovik. --- modules/sipcapture/sipcapture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 … [View More]

1 0

git:master: db_cluster: fixed the return of a valid connection
by Daniel-Constantin Mierla 11 Apr '12

11 Apr '12

Module: sip-router Branch: master Commit: 9ef3e0e6ae997b31cb66310c3aaf4e4970699760 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ef3e0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 11 11:03:50 2012 +0200 db_cluster: fixed the return of a valid connection - a condition was not properly inverted in a previous commit - reported by Juha Heinanen --- modules_k/… [View More]

1 0

git:master: modules/lcr: print debug message in case from uri regex matching fails
by admin＠sip-router.org 11 Apr '12

11 Apr '12

Module: sip-router Branch: master Commit: 51ac9c19d123a36c72f2f9a655be9caec2710f1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51ac9c1… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 11 11:02:15 2012 +0300 modules/lcr: print debug message in case from uri regex matching fails --- modules/lcr/lcr_mod.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/lcr/… [View More]

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
35
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 2012