sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: mtree: avoid re-init of db handler

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6c1e441f8c137503e3edd0a92d9bec5a7bd11379 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c1e441… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 19:13:46 2010 +0200 mtree: avoid re-init of db handler - applies for mi cmd usage with xmlrpc module --- modules/mtree/mtree_mod.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 23e06a1..2ab5ae5 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -313,16 +313,16 @@ error1: mt_destroy_trees(); if(db_con!=NULL) - { mt_dbf.close(db_con); - db_con = 0; - } + db_con = 0; return -1; } static int child_init(void) { + if(db_con!=NULL) + return 0; db_con = mt_dbf.init(&db_url); if(db_con==NULL) {

14 years, 7 months

git:master: htable: close db connection in case of mi cmd errors

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e723b2b24a87599d538b652ee60c862f769f8036 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e723b2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:22:15 2010 +0200 htable: close db connection in case of mi cmd errors - in some error cases while processing mi reload command, db connection was left open --- modules_k/htable/htable.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index d2d1b5f..85d238b 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -337,27 +337,38 @@ static struct mi_root* ht_mi_reload(struct mi_root* cmd_tree, void* param) node = cmd_tree->node.kids; if(node == NULL) + { + ht_db_close_con(); return init_mi_tree( 400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); + } htname = node->value; if(htname.len<=0 || htname.s==NULL) { LM_ERR("bad hash table name\n"); + ht_db_close_con(); return init_mi_tree( 500, "bad hash table name", 19); } ht = ht_get_table(&htname); if(ht==NULL || ht->dbtable.len<=0) { LM_ERR("bad hash table name\n"); + ht_db_close_con(); return init_mi_tree( 500, "no such hash table", 18); } memcpy(&nht, ht, sizeof(ht_t)); nht.entries = (ht_entry_t*)shm_malloc(nht.htsize*sizeof(ht_entry_t)); if(nht.entries == NULL) + { + ht_db_close_con(); return init_mi_tree(500, MI_ERR_RELOAD, MI_ERR_RELOAD_LEN); + } memset(nht.entries, 0, nht.htsize*sizeof(ht_entry_t)); if(ht_db_load_table(&nht, &ht->dbtable, 0)<0) + { + ht_db_close_con(); return init_mi_tree(500, MI_ERR_RELOAD, MI_ERR_RELOAD_LEN); + } /* replace old entries */ for(i=0; i<nht.htsize; i++)

14 years, 7 months

git:master: mi_rpc: initialize mi cmds for sip workers

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b2b2a82d497ee37428abab933f4862255bc5c4a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2b2a82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:13:54 2010 +0200 mi_rpc: initialize mi cmds for sip workers - xmlrpc module re-uses sip workers to process xmlrpc request which can execute mi commands, therefore is need to initialize mi cmds as for a mi process - initialization is done only when xmlrpc module is loaded --- modules/mi_rpc/mi_rpc_mod.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/mi_rpc/mi_rpc_mod.c b/modules/mi_rpc/mi_rpc_mod.c index 14b58e3..6e6e2c6 100644 --- a/modules/mi_rpc/mi_rpc_mod.c +++ b/modules/mi_rpc/mi_rpc_mod.c @@ -79,10 +79,18 @@ struct module_exports exports = { static int child_init(int rank) { if(rank==PROC_RPC) { - if( init_mi_child()!=0) { + if(init_mi_child()!=0) { LM_CRIT("Failed to init the mi commands\n"); return -1; } + } else if(rank>0) { + if(find_module_by_name("xmlrpc")!=0) + { + if(init_mi_child()!=0) { + LM_CRIT("Failed to init the mi commands for xmlrpc usage\n"); + return -1; + } + } } return 0;

14 years, 7 months

git:master: permissions(k): safety check for db_handle

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: df2d92a1f0698e0d108ec080de5fc3673d332209 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df2d92a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 17:40:20 2010 +0200 permissions(k): safety check for db_handle - avoid double initialization of trusted ops db handler --- modules_k/permissions/trusted.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index d3c4860..77545ad 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -231,10 +231,10 @@ error: */ int init_child_trusted(int rank) { - if ((rank <= 0) && (rank != PROC_RPC) && (rank != PROC_UNIXSOCK)) + if ((rank <= 0) && (rank != PROC_RPC) && (rank != PROC_UNIXSOCK)) return 0; - if (!db_url.s) { + if (!db_url.s || db_handle) { return 0; }

14 years, 7 months

git:master: pdt(k): safety check for db handler initialization

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2e8d469de4253444d61cb186395d40c0fd492fe6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e8d469… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:15:33 2010 +0200 pdt(k): safety check for db handler initialization - there can be two attepts to initialize if xmlrpc module is loaded --- modules_k/pdt/pdt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/pdt/pdt.c b/modules_k/pdt/pdt.c index 7f2dfda..fedd0d6 100644 --- a/modules_k/pdt/pdt.c +++ b/modules_k/pdt/pdt.c @@ -269,6 +269,10 @@ error1: static int child_init(void) { + /* check if db handler is initialized */ + if(db_con!=NULL) + return 0; + db_con = pdt_dbf.init(&db_url); if(db_con==NULL) {

14 years, 7 months

git:master: drouting: check if db connection is initialized

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 76266ca085d05be949ddc34df513de6810c5d65f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76266ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:31:14 2010 +0200 drouting: check if db connection is initialized - applied for the case of mi reload command --- modules_k/drouting/drouting.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index 6d24a16..45f36c2 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -475,6 +475,15 @@ static struct mi_root* dr_reload_cmd(struct mi_root *cmd_tree, void *param) LM_INFO("\"%s\" MI command received!\n",RELOAD_MI_CMD); + /* init DB connection if needed */ + if (db_hdl==NULL) { + db_hdl=dr_dbf.init(&db_url); + if(db_hdl==0 ) { + LM_CRIT("cannot initialize database connection\n"); + goto error; + } + } + if ( (n=dr_reload_data())!=0 ) { LM_CRIT("failed to load routing data\n"); goto error;

14 years, 7 months

git:master: usrloc(k): avoid re-initialization of db handler

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8948fe654b83217979b2d2154934a973aefa9ae3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8948fe6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:43:54 2010 +0200 usrloc(k): avoid re-initialization of db handler - can happen if mi commands are used over rpc interface via xmlrpc module --- modules_k/usrloc/ul_mod.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules_k/usrloc/ul_mod.c b/modules_k/usrloc/ul_mod.c index 3c74008..7a1cdbd 100644 --- a/modules_k/usrloc/ul_mod.c +++ b/modules_k/usrloc/ul_mod.c @@ -340,7 +340,8 @@ static int child_init(int _rank) break; } - ul_dbh = ul_dbf.init(&db_url); /* Get a new database connection */ + if (!ul_dbh) + ul_dbh = ul_dbf.init(&db_url); /* Get a new database connection */ if (!ul_dbh) { LM_ERR("child(%d): failed to connect to database\n", _rank); return -1; @@ -370,6 +371,10 @@ static int mi_child_init(void) return 0; if (db_mode != NO_DB) { + if (ul_dbh) { + done = 1; + return 0; + } ul_dbh = ul_dbf.init(&db_url); if (!ul_dbh) { LM_ERR("failed to connect to database\n");

14 years, 7 months

git:master: domain(k): safety check for db handler initialization

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c65fc04ff83c6304d5889f3426b3b96b5ac7ee69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c65fc04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:35:27 2010 +0200 domain(k): safety check for db handler initialization - avoid double initialization of db handler when using xmlrpc module for mi commands --- modules_k/domain/domain.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/domain/domain.c b/modules_k/domain/domain.c index 942a6ce..3e71c35 100644 --- a/modules_k/domain/domain.c +++ b/modules_k/domain/domain.c @@ -63,6 +63,9 @@ int domain_db_init(const str* db_url) LM_ERR("Unbound database module\n"); goto error; } + if (db_handle!=0) + return 0; + db_handle=domain_dbf.init(db_url); if (db_handle==0){ LM_ERR("Cannot initialize database connection\n");

14 years, 7 months

git:master: userblacklist: avoid double child initialization

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3f2ca85f4254746240177830e85a87b81d8cfd85 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f2ca85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 18:57:09 2010 +0200 userblacklist: avoid double child initialization - safety check for cases when xmlrpc module is used to run mi commands --- modules_k/userblacklist/userblacklist.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/modules_k/userblacklist/userblacklist.c b/modules_k/userblacklist/userblacklist.c index 51cb4db..531aed2 100644 --- a/modules_k/userblacklist/userblacklist.c +++ b/modules_k/userblacklist/userblacklist.c @@ -662,21 +662,16 @@ static int child_init(int rank) if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; /* do nothing for the main process */ - if (userblacklist_db_open() != 0) return -1; - dtrie_root=dtrie_init(10); - if (dtrie_root == NULL) { - LM_ERR("could not initialize data"); - return -1; - } - /* because we've added new sources during the fixup */ - if (reload_sources() != 0) return -1; - - return 0; + return mi_child_init(); } +static int userblacklist_child_initialized = 0; + static int mi_child_init(void) { + if(userblacklist_child_initialized) + return 0; if (userblacklist_db_open() != 0) return -1; dtrie_root=dtrie_init(10); if (dtrie_root == NULL) { @@ -686,6 +681,8 @@ static int mi_child_init(void) /* because we've added new sources during the fixup */ if (reload_sources() != 0) return -1; + userblacklist_child_initialized = 1; + return 0; }

14 years, 7 months

git:master: Do not consider in-early-dialog BYE requests to be bogus.

by Timo Reimann

Module: sip-router Branch: master Commit: 8bf53ec54beab825794b8345cce7fdb41c783809 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bf53ec… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Jun 30 18:25:55 2010 +0200 Do not consider in-early-dialog BYE requests to be bogus. --- modules_k/dialog/dlg_hash.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index d7a16f1..72b7fec 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -704,6 +704,7 @@ void next_state_dlg(struct dlg_cell *dlg, int event, dlg->state = DLG_STATE_DELETED; *unref = 1; break; + case DLG_STATE_EARLY: case DLG_STATE_DELETED: break; default:

14 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev