sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
300 discussions

git:master: geoip: for safety checks for the case when geoip_match() is not executed
by Daniel-Constantin Mierla 04 Mar '14

04 Mar '14

Module: sip-router Branch: master Commit: 56ed48bf48c3d78ff5d214833e09a5759f0b5928 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56ed48b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 4 09:43:39 2014 +0100 geoip: for safety checks for the case when geoip_match() is not executed - but the geoip pv is accessed - reported by Juha Heinanen --- modules/geoip/geoip_pv.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules/geoip/geoip_pv.c b/modules/geoip/geoip_pv.c index 8aa5222..6a18461 100644 --- a/modules/geoip/geoip_pv.c +++ b/modules/geoip/geoip_pv.c @@ -257,6 +257,8 @@ int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, { if(gpv->item->r.flags&1) return pv_get_null(msg, param, res); + if(gpv->item->r.record==NULL) + return pv_get_null(msg, param, res); gpv->item->r.time_zone = (char*)GeoIP_time_zone_by_country_and_region( gpv->item->r.record->country_code, @@ -266,11 +268,15 @@ int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, return pv_geoip_get_strzval(msg, param, res, gpv->item->r.time_zone); case 2: /* zip */ + if(gpv->item->r.record==NULL) + return pv_get_null(msg, param, res); return pv_geoip_get_strzval(msg, param, res, gpv->item->r.record->postal_code); case 3: /* lat */ if((gpv->item->r.flags&2)==0) { + if(gpv->item->r.record==NULL) + return pv_get_null(msg, param, res); snprintf(gpv->item->r.latitude, 15, "%f", gpv->item->r.record->latitude); gpv->item->r.flags |= 2; @@ -280,6 +286,8 @@ int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, case 4: /* lon */ if((gpv->item->r.flags&4)==0) { + if(gpv->item->r.record==NULL) + return pv_get_null(msg, param, res); snprintf(gpv->item->r.longitude, 15, "%f", gpv->item->r.record->longitude); gpv->item->r.flags |= 4; @@ -287,6 +295,8 @@ int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, return pv_geoip_get_strzval(msg, param, res, gpv->item->r.longitude); case 5: /* dma */ + if(gpv->item->r.record==NULL) + return pv_get_null(msg, param, res); return pv_get_sintval(msg, param, res, gpv->item->r.record->dma_code); case 6: /* ips */ @@ -308,14 +318,20 @@ int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, return pv_geoip_get_strzval(msg, param, res, gpv->item->r.record->city); case 9: /* area */ + if(gpv->item->r.record==NULL) + return pv_get_null(msg, param, res); return pv_get_sintval(msg, param, res, gpv->item->r.record->area_code); case 10: /* regc */ + if(gpv->item->r.record==NULL) + return pv_get_null(msg, param, res); return pv_geoip_get_strzval(msg, param, res, gpv->item->r.record->region); case 11: /* regn */ if((gpv->item->r.flags&16)==0) { + if(gpv->item->r.record==NULL) + return pv_get_null(msg, param, res); gpv->item->r.region_name = (char*)GeoIP_region_name_by_code( gpv->item->r.record->country_code, @@ -325,9 +341,13 @@ int pv_get_geoip(struct sip_msg *msg, pv_param_t *param, return pv_geoip_get_strzval(msg, param, res, gpv->item->r.region_name); case 12: /* metro */ + if(gpv->item->r.record==NULL) + return pv_get_null(msg, param, res); return pv_get_sintval(msg, param, res, gpv->item->r.record->metro_code); default: /* cc */ + if(gpv->item->r.record==NULL) + return pv_get_null(msg, param, res); return pv_geoip_get_strzval(msg, param, res, gpv->item->r.record->country_code); }

1 0

[tracker] Comment added: Kamailio doesn't to handle any SIP message at all after several dialogs... (CPU high usage)
by sip-router 04 Mar '14

04 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#397 - Kamailio doesn't to handle any SIP message at all after several dialogs... (CPU high usage) User who did this - Jack Wang (GoGoJack) ---------- OMG...I DO NOW understand why my config.mak may have some problems - For taking a customized settings, the right way should be done such like "make cfg ARCH=arm" before (and the -DUSE_PTHREAD_MUTEX was set right there), but I modify it after "make cfg" which may cause abnormal processing afterwards. Oh My poor concept about the Makefile system :P ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=397#comment1334 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] Comment added: Kamailio doesn't to handle any SIP message at all after several dialogs... (CPU high usage)
by sip-router 04 Mar '14

04 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#397 - Kamailio doesn't to handle any SIP message at all after several dialogs... (CPU high usage) User who did this - Jack Wang (GoGoJack) ---------- OMG...I DO NOW understand why my config.mak may have some problems - For taking a customized settings, the right way should be done such like "make cfg ARCH=arm" before (and the -DUSE_PTHREAD_MUTEX was set right there), but I modify it after "make cfg" which may cause abnormal processing afterwards. Oh My poor concept about the Makefile system :P ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=397#comment1333 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] Comment added: Kamailio doesn't to handle any SIP message at all after several dialogs... (CPU high usage)
by sip-router 04 Mar '14

04 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#397 - Kamailio doesn't to handle any SIP message at all after several dialogs... (CPU high usage) User who did this - Jack Wang (GoGoJack) ---------- Do you mean take the -DUSE_PTHREAD_MUTEX option instead? I'll compiled with it and check the result. Thanks. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=397#comment1332 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: Improvement for db_cluster
by sip-router 03 Mar '14

03 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#405 - Improvement for db_cluster User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=405 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] Comment added: Improvement for db_cluster
by sip-router 03 Mar '14

03 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#405 - Improvement for db_cluster User who did this - Daniel-Constantin Mierla (miconda) ---------- Pushed to master branch. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=405#comment1331 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: db_cluster: proper title for example in docs
by Daniel-Constantin Mierla 03 Mar '14

03 Mar '14

Module: sip-router Branch: master Commit: c318fb9bd1f3674c0bf85f8b50db030039d4e5bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c318fb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 3 21:16:38 2014 +0100 db_cluster: proper title for example in docs --- modules/db_cluster/README | 4 ++-- modules/db_cluster/doc/db_cluster_admin.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/db_cluster/README b/modules/db_cluster/README index 0364bf6..8750efc 100644 --- a/modules/db_cluster/README +++ b/modules/db_cluster/README @@ -38,7 +38,7 @@ Daniel-Constantin Mierla 1.2. Set cluster parameter 1.3. Set inactive_interval parameter 1.4. Set max_query_length parameter - 1.5. Set cluster parameter + 1.5. Sample of usage Chapter 1. Admin Guide @@ -188,7 +188,7 @@ modparam("db_cluster", "max_query_length", 5) to be used for parallel writing from acc and round-robin reading by sqlops. - Example 1.5. Set cluster parameter + Example 1.5. Sample of usage ... modparam("db_cluster", "connection", "c1=>mysql://kamailio:kamailiorw@localhost/kamailio1") diff --git a/modules/db_cluster/doc/db_cluster_admin.xml b/modules/db_cluster/doc/db_cluster_admin.xml index 17543fd..ba07023 100644 --- a/modules/db_cluster/doc/db_cluster_admin.xml +++ b/modules/db_cluster/doc/db_cluster_admin.xml @@ -195,7 +195,7 @@ modparam("db_cluster", "max_query_length", 5) sqlops. </para> <example> - <title>Set <varname>cluster</varname> parameter</title> + <title>Sample of usage</title> <programlisting format="linespecific"> ... modparam("db_cluster", "connection",

1 0

git:master: db_cluster: new parameter max_query_length
by Daniel-Constantin Mierla 03 Mar '14

03 Mar '14

Module: sip-router Branch: master Commit: 0411d363ab8eb9cf146852a1c6cd8cf146acfc6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0411d36… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 3 19:53:42 2014 +0100 db_cluster: new parameter max_query_length - set threshold in second after which a connection is marked inactive if the query fails - allow to let connectioncs being active if the error is due to some sql mistake - default is 0 (set connection innactive immediately, same behavior as so far) --- modules/db_cluster/README | 23 ++++++++++++++++- modules/db_cluster/db_cluster_mod.c | 2 + modules/db_cluster/dbcl_api.c | 34 +++++++++++++++++++++++---- modules/db_cluster/doc/db_cluster_admin.xml | 23 ++++++++++++++++++ 4 files changed, 75 insertions(+), 7 deletions(-) diff --git a/modules/db_cluster/README b/modules/db_cluster/README index aecbcee..0364bf6 100644 --- a/modules/db_cluster/README +++ b/modules/db_cluster/README @@ -28,6 +28,7 @@ Daniel-Constantin Mierla 3.1. connection (str) 3.2. cluster (str) 3.3. inactive_interval (int) + 3.4. max_query_length (int) 4. Usage @@ -36,7 +37,8 @@ Daniel-Constantin Mierla 1.1. Set connection parameter 1.2. Set cluster parameter 1.3. Set inactive_interval parameter - 1.4. Set cluster parameter + 1.4. Set max_query_length parameter + 1.5. Set cluster parameter Chapter 1. Admin Guide @@ -53,6 +55,7 @@ Chapter 1. Admin Guide 3.1. connection (str) 3.2. cluster (str) 3.3. inactive_interval (int) + 3.4. max_query_length (int) 4. Usage @@ -90,6 +93,7 @@ Chapter 1. Admin Guide 3.1. connection (str) 3.2. cluster (str) 3.3. inactive_interval (int) + 3.4. max_query_length (int) 3.1. connection (str) @@ -148,6 +152,21 @@ modparam("db_cluster", "cluster", "cls1=>con1=9s8p;con2=9s8p") modparam("db_cluster", "inactive_interval", 180) ... +3.4. max_query_length (int) + + How long (seconds) a failed db operation needs to last before + deactivating the connection for inactive_interval seconds. This + prevents disabling of connections that reply fast with error codes, + thus being active (e.g., due to primary key insert errors). In such + cases, the database server is active. + + Default value is 0. + + Example 1.4. Set max_query_length parameter +... +modparam("db_cluster", "max_query_length", 5) +... + 4. Usage Practically, all the modules that want to use a cluster, have to set @@ -169,7 +188,7 @@ modparam("db_cluster", "inactive_interval", 180) to be used for parallel writing from acc and round-robin reading by sqlops. - Example 1.4. Set cluster parameter + Example 1.5. Set cluster parameter ... modparam("db_cluster", "connection", "c1=>mysql://kamailio:kamailiorw@localhost/kamailio1") diff --git a/modules/db_cluster/db_cluster_mod.c b/modules/db_cluster/db_cluster_mod.c index c0b78cb..1d15531 100644 --- a/modules/db_cluster/db_cluster_mod.c +++ b/modules/db_cluster/db_cluster_mod.c @@ -37,6 +37,7 @@ int dbcl_con_param(modparam_t type, void *val); int dbcl_cls_param(modparam_t type, void *val); int dbcl_inactive_interval = 300; +int dbcl_max_query_length = 0; /*! \brief * DB Cluster module interface @@ -53,6 +54,7 @@ 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}, + {"max_query_length", INT_PARAM, &dbcl_max_query_length}, {0, 0, 0} }; diff --git a/modules/db_cluster/dbcl_api.c b/modules/db_cluster/dbcl_api.c index 0269343..2629a84 100644 --- a/modules/db_cluster/dbcl_api.c +++ b/modules/db_cluster/dbcl_api.c @@ -33,10 +33,12 @@ #include "../../trim.h" #include "../../globals.h" #include "../../lib/srdb1/db.h" +#include "../../timer.h" #include "dbcl_data.h" #include "dbcl_api.h" +extern int dbcl_max_query_length; #define DBCL_READ(command) \ do {\ @@ -44,6 +46,7 @@ int i;\ int j;\ int k;\ + unsigned int sec = 0;\ db1_con_t *dbh=NULL;\ dbcl_cls_t *cls=NULL;\ cls = (dbcl_cls_t*)_h->tail;\ @@ -60,6 +63,7 @@ {\ LM_DBG("serial operation - cluster [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ + sec = get_ticks();\ dbh = cls->rlist[i].clist[j]->dbh;\ ret = cls->rlist[i].clist[j]->dbf.command;\ if (ret==0) {\ @@ -69,7 +73,10 @@ 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]);\ + sec = get_ticks() - sec;\ + if(sec >= dbcl_max_query_length){\ + dbcl_inactive_con(cls->rlist[i].clist[j]);\ + }\ }\ }\ }\ @@ -83,6 +90,7 @@ {\ LM_DBG("round robin operation - cluster [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ + sec = get_ticks();\ dbh = cls->rlist[i].clist[j]->dbh;\ ret = cls->rlist[i].clist[j]->dbf.command;\ if (ret==0)\ @@ -94,7 +102,10 @@ 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]);\ + sec = get_ticks() - sec;\ + if(sec >= dbcl_max_query_length){\ + dbcl_inactive_con(cls->rlist[i].clist[j]);\ + }\ }\ }\ }\ @@ -118,6 +129,7 @@ int i;\ int j;\ int k;\ + unsigned int sec = 0;\ db1_con_t *dbh=NULL;\ dbcl_cls_t *cls=NULL;\ cls = (dbcl_cls_t*)_h->tail;\ @@ -136,6 +148,7 @@ {\ LM_DBG("serial operation - cluster [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ + sec = get_ticks();\ dbh = cls->wlist[i].clist[j]->dbh;\ ret = cls->wlist[i].clist[j]->dbf.command;\ if (ret==0) {\ @@ -145,7 +158,10 @@ 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]);\ + sec = get_ticks() - sec;\ + if(sec >= dbcl_max_query_length){\ + dbcl_inactive_con(cls->wlist[i].clist[j]);\ + }\ }\ }\ }\ @@ -159,6 +175,7 @@ {\ LM_DBG("round robin operation - cluster [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ + sec = get_ticks();\ dbh = cls->wlist[i].clist[j]->dbh;\ ret = cls->wlist[i].clist[j]->dbf.command;\ if (ret==0)\ @@ -170,7 +187,10 @@ 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]);\ + sec = get_ticks() - sec;\ + if(sec >= dbcl_max_query_length){\ + dbcl_inactive_con(cls->wlist[i].clist[j]);\ + }\ }\ }\ }\ @@ -183,6 +203,7 @@ {\ LM_DBG("parallel operation - cluster [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ + sec = get_ticks();\ dbh = cls->wlist[i].clist[j]->dbh;\ rc = cls->wlist[i].clist[j]->dbf.command;\ if(rc==0) {\ @@ -192,7 +213,10 @@ 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]);\ + sec = get_ticks() - sec;\ + if(sec >= dbcl_max_query_length){\ + dbcl_inactive_con(cls->wlist[i].clist[j]);\ + }\ }\ ret |= rc;\ }\ diff --git a/modules/db_cluster/doc/db_cluster_admin.xml b/modules/db_cluster/doc/db_cluster_admin.xml index d849f20..17543fd 100644 --- a/modules/db_cluster/doc/db_cluster_admin.xml +++ b/modules/db_cluster/doc/db_cluster_admin.xml @@ -146,6 +146,29 @@ modparam("db_cluster", "inactive_interval", 180) </programlisting> </example> </section> + <section id="db_cluster.p.max_query_length"> + <title><varname>max_query_length</varname> (int)</title> + <para> + How long (seconds) a failed db operation needs to last before + deactivating the connection for inactive_interval seconds. This + prevents disabling of connections that reply fast with error + codes, thus being active (e.g., due to primary key insert errors). + In such cases, the database server is active. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>max_query_length</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_cluster", "max_query_length", 5) +... +</programlisting> + </example> + </section> </section> <section> <title>Usage</title>

1 0

[tracker] Task closed: uac_redirect not honoring q-value for max_total = 1
by sip-router 03 Mar '14

03 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#349 - uac_redirect not honoring q-value for max_total = 1 User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=349 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] Comment added: uac_redirect not honoring q-value for max_total = 1
by sip-router 03 Mar '14

03 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#349 - uac_redirect not honoring q-value for max_total = 1 User who did this - Daniel-Constantin Mierla (miconda) ---------- Finally got some time to come back to it. I pushed a patch in master for now: - http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9b3286… If you can test and report when all is ok, then I will backport. If any issues, then reopen this item. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=349#comment1330 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2014