sr-dev July 2010

sr-dev@lists.kamailio.org

29 participants
223 discussions

git:master: drouting: check if db connection is initialized
by Daniel-Constantin Mierla 01 Jul '10

01 Jul '10

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;

1 0

git:master: pdt(k): safety check for db handler initialization
by Daniel-Constantin Mierla 01 Jul '10

01 Jul '10

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) {

1 0

git:master: permissions(k): safety check for db_handle
by Daniel-Constantin Mierla 01 Jul '10

01 Jul '10

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; }

1 0

git:master: mi_rpc: initialize mi cmds for sip workers
by Daniel-Constantin Mierla 01 Jul '10

01 Jul '10

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;

1 0

git:master: htable: close db connection in case of mi cmd errors
by Daniel-Constantin Mierla 01 Jul '10

01 Jul '10

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++)

1 0

git:master: Do not consider in-early-dialog BYE requests to be bogus.
by Timo Reimann 01 Jul '10

01 Jul '10

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:

2 3

git:kamailio_3.0: Do not consider in-early-dialog BYE requests to be bogus.
by Timo Reimann 01 Jul '10

01 Jul '10

Module: sip-router Branch: kamailio_3.0 Commit: 44aa85c78952288c4350b9e2277354e7fbf4d2b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44aa85c… 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. (cherry picked from commit 8bf53ec54beab825794b8345cce7fdb41c783809) --- 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:

1 0

Delayed branches?
by Jasmin Schnatterbeck 01 Jul '10

01 Jul '10

Hello list, for a few weeks now I am thinking about the idea of something like "delayed branches". For example if one INVITE lookup results in 2 contacts/branches, then the first branch should be executed directly but the second should experience a delay of some seconds, until the INVITE is being sent out to the 2nd contact. Such a feature would be really useful for users, if they would like to configure their delayed redirects server-side and not client-side (devices). I have some doubts, whether it's reasonable in general, if a sip proxy behaves like this (delays requests...) - what do you think? Best Regards Jasmin

8 16

git:master: mi_rpc: call MI init child functions
by Daniel-Constantin Mierla 01 Jul '10

01 Jul '10

Module: sip-router Branch: master Commit: af18dae034cf8836f1627929f189983ca6010428 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af18dae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 12:08:42 2010 +0200 mi_rpc: call MI init child functions - MI init child functions called for RPC processes - fix for several MI commands that can be executed now via RPC and they needed to do specific initialization for each process - reported by Juha Heinanen --- modules/mi_rpc/mi_rpc_mod.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/modules/mi_rpc/mi_rpc_mod.c b/modules/mi_rpc/mi_rpc_mod.c index b678f25..14b58e3 100644 --- a/modules/mi_rpc/mi_rpc_mod.c +++ b/modules/mi_rpc/mi_rpc_mod.c @@ -30,6 +30,8 @@ MODULE_VERSION +static int child_init(int rank); + static str mi_rpc_indent = { "\t", 1 }; static const char* rpc_mi_exec_doc[2] = { @@ -63,17 +65,28 @@ rpc_export_t mr_rpc[] = { struct module_exports exports = { "mi_rpc", - 0, /* Exported functions */ - mr_rpc, /* RPC methods */ - 0, /* Export parameters */ - 0, /* Module initialization function */ - 0, /* Response function */ - 0, /* Destroy function */ - 0, /* OnCancel function */ - 0 /* Child initialization function */ + 0, /* Exported functions */ + mr_rpc, /* RPC methods */ + 0, /* Export parameters */ + 0, /* Module initialization function */ + 0, /* Response function */ + 0, /* Destroy function */ + 0, /* OnCancel function */ + child_init /* Child initialization function */ }; +static int child_init(int rank) +{ + if(rank==PROC_RPC) { + if( init_mi_child()!=0) { + LM_CRIT("Failed to init the mi commands\n"); + return -1; + } + } + + return 0; +} struct mi_root *mi_rpc_read_params(rpc_t *rpc, void *ctx) {

1 0

git:master: kmi: allow multiple initializations of mi child
by Daniel-Constantin Mierla 01 Jul '10

01 Jul '10

Module: sip-router Branch: master Commit: 4047fc33053898d17498104b849dae9e45bee1e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4047fc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 1 12:04:52 2010 +0200 kmi: allow multiple initializations of mi child - safety check to detect if mi child was initialized - protect against multiple initializations that can occure due to usage from MI or RPC processes --- lib/kmi/mi.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/kmi/mi.c b/lib/kmi/mi.c index dfa458e..8d2c01d 100644 --- a/lib/kmi/mi.c +++ b/lib/kmi/mi.c @@ -97,10 +97,14 @@ int register_mi_mod( char *mod_name, mi_export_t *mis) } +static int mi_commands_initialized = 0; + int init_mi_child(void) { int i; + if(mi_commands_initialized) + return 0; for ( i=0 ; i<mi_cmds_no ; i++ ) { if ( mi_cmds[i].init_f && mi_cmds[i].init_f()!=0 ) { LM_ERR("failed to init <%.*s>\n", @@ -108,6 +112,7 @@ int init_mi_child(void) return -1; } } + mi_commands_initialized = 1; return 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 July 2010