sr-dev May 2012

sr-dev@lists.kamailio.org

29 participants
173 discussions

[tracker] Task closed: domain_attrs_table parameter not defined
by sip-router 15 May '12

15 May '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#232 - domain_attrs_table parameter not defined User who did this - Juha Heinanen (jh) Reason for closing: Fixed Additional comments about closing: Exported domain_attrs_table variable. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=232 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: modules_k/domain: exported domain_attrs_table module var
by admin＠sip-router.org 15 May '12

15 May '12

Module: sip-router Branch: master Commit: a2fd243f1ada873e722acca1a9aaba1348b85f9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2fd243… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue May 15 11:56:22 2012 +0300 modules_k/domain: exported domain_attrs_table module var - Thanks to Charles Chance for reporting. --- modules_k/domain/domain_mod.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules_k/domain/domain_mod.c b/modules_k/domain/domain_mod.c index 006d7ce..507f873 100644 --- a/modules_k/domain/domain_mod.c +++ b/modules_k/domain/domain_mod.c @@ -139,6 +139,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"db_url", STR_PARAM, &db_url.s }, {"domain_table", STR_PARAM, &domain_table.s}, + {"domain_attrs_table", STR_PARAM, &domain_attrs_table.s}, {"did_col", STR_PARAM, &did_col.s }, {"domain_col", STR_PARAM, &domain_col.s }, {"name_col", STR_PARAM, &name_col.s }, @@ -200,6 +201,7 @@ static int mod_init(void) db_url.len = strlen(db_url.s); domain_table.len = strlen(domain_table.s); + domain_attrs_table.len = strlen(domain_attrs_table.s); did_col.len = strlen(did_col.s); domain_col.len = strlen(domain_col.s); name_col.len = strlen(name_col.s); @@ -222,8 +224,7 @@ static int mod_init(void) domain_db_close(); goto error; } - if (domain_db_ver(&domain_attrs_table, - DOMAIN_ATTRS_TABLE_VERSION) < 0) { + if (domain_db_ver(&domain_attrs_table, DOMAIN_ATTRS_TABLE_VERSION) < 0) { LM_ERR("error during check of domain_attrs table version\n"); domain_db_close(); goto error;

1 0

RPC and XMLRPC
by Jason Penton 15 May '12

15 May '12

Hi All, I have just been testing xmlrpc on some of the IMS module RPC functions and got some errors using nested structures. viz "{". Having a quick look through the xmlrpc code show that it doesn't support nested structures in the reply. I am quite happy to fix this but am surprised that nobody has mentioned this before as I see there are a few modules that use nested replies. Does this maybe mean that XMLRPC is going to be deprecated (not a usual module)? Cheers Jason

2 2

compiler warnings
by Juha Heinanen 14 May '12

14 May '12

gcc version 4.6.3 (Debian 4.6.3-1) gives the warning below that i don't remember seeing with earlier gcc versions. -- juha CC (cc) [sip-proxy] msg_translator.o msg_translator.c: In function ‘check_via_address’: msg_translator.c:198:6: warning: variable ‘len’ set but not used [-Wunused-but-set-variable] CC (cc) [M tls.so] tls_ct_wrq.o In file included from tls_ct_q.h:35:0, from tls_ct_wrq.h:35, from tls_ct_wrq.c:32: sbufq.h: In function ‘sbufq_add’: sbufq.h:84:10: warning: variable ‘t’ set but not used [-Wunused-but-set-variable] CC (cc) [M tls.so] tls_domain.o In file included from tls_ct_q.h:35:0, from tls_ct_wrq.h:35, from tls_server.h:36, from tls_domain.c:36: sbufq.h: In function ‘sbufq_add’: sbufq.h:84:10: warning: variable ‘t’ set but not used [-Wunused-but-set-variable] tls_domain.c: In function ‘load_cert’: tls_domain.c:418:4: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_domain.c: In function ‘load_ca_list’: tls_domain.c:448:4: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_domain.c:455:4: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_domain.c: In function ‘load_crl’: tls_domain.c:487:4: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_domain.c: In function ‘load_private_key’: tls_domain.c:896:5: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_domain.c:904:4: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_domain.c:911:4: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_domain.c:911:4: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] CC (cc) [M tls.so] tls_dump_vf.o CC (cc) [M tls.so] tls_init.o In file included from tls_ct_q.h:35:0, from tls_ct_wrq.h:35, from tls_init.c:74: sbufq.h: In function ‘sbufq_add’: sbufq.h:84:10: warning: variable ‘t’ set but not used [-Wunused-but-set-variable] CC (cc) [M tls.so] tls_mod.o In file included from tls_ct_q.h:35:0, from tls_ct_wrq.h:35, from tls_server.h:36, from tls_mod.c:64: sbufq.h: In function ‘sbufq_add’: sbufq.h:84:10: warning: variable ‘t’ set but not used [-Wunused-but-set-variable] CC (cc) [M tls.so] tls_rpc.o In file included from tls_ct_q.h:35:0, from tls_ct_wrq.h:35, from tls_server.h:36, from tls_rpc.c:40: sbufq.h: In function ‘sbufq_add’: sbufq.h:84:10: warning: variable ‘t’ set but not used [-Wunused-but-set-variable] sbufq.h:84:10: warning: variable ‘t’ set but not used [-Wunused-but-set-variable] CC (cc) [M tls.so] tls_server.o In file included from tls_ct_q.h:35:0, from tls_ct_wrq.h:35, from tls_server.h:36, from tls_server.c:56: sbufq.h: In function ‘sbufq_add’: sbufq.h:84:10: warning: variable ‘t’ set but not used [-Wunused-but-set-variable] tls_server.c: In function ‘tls_complete_init’: tls_server.c:196:3: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_server.c: In function ‘tls_shutdown’: tls_server.c:525:4: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_server.c: In function ‘tls_encode_f’: tls_server.c:802:5: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_server.c:836:5: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_server.c: In function ‘tls_read_f’: tls_server.c:1190:4: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] tls_server.c:1224:4: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] CC (cc) [M xmlrpc.so] xmlrpc.o xmlrpc.c: In function ‘rpc_scan’: xmlrpc.c:1457:6: warning: variable ‘fmt_len’ set but not used [-Wunused-but-set-variable] CC (cc) [L libser_cds.so.0.1] rr_serialize.o rr_serialize.c: In function ‘rr_dup’: rr_serialize.c:10:6: warning: variable ‘res’ set but not used [-Wunused-but-set-variable] CC (cc) [L libser_cds.so.0.1] serialize.o serialize.c: In function ‘sstream_get_str_ex’: serialize.c:91:6: warning: variable ‘res’ set but not used [-Wunused-but-set-variable] CC (cc) [M pdt.so] domains.o domains.c: In function ‘pdt_check_pd’: domains.c:406:15: warning: variable ‘dhash’ set but not used [-Wunused-but-set-variable] CC (cc) [M registrar.so] lookup.o lookup.c: In function ‘lookup2’: lookup.c:250:12: warning: variable ‘fp’ set but not used [-Wunused-but-set-variable] CC (cc) [M usrloc.so] urecord.o urecord.c: In function ‘nodb_timer’: urecord.c:211:6: warning: variable ‘not’ set but not used [-Wunused-but-set-variable] urecord.c: In function ‘wt_timer’: urecord.c:254:6: warning: variable ‘not’ set but not used [-Wunused-but-set-variable] urecord.c: In function ‘wb_timer’: urecord.c:307:6: warning: variable ‘not’ set but not used [-Wunused-but-set-variable]

2 1

[tracker] Comment added: bug in s.replace?
by sip-router 14 May '12

14 May '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#227 - bug in s.replace? User who did this - Jasmin Schnatterbeck (jasmin) ---------- Hi, I have just noticed, that the following line sometimes also produces strange results (e.g. missing characters): $var(ff_display)=$(var(ff_display){s.strip,1}{s.striptail,1}); Compared with the issue mentioned first: $var pvs, more than one transformation, same pv changed so it could be a bug in the code for $var pvs... Jasmin ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=227#comment637 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: dialog(k): changed log level for a debug message from L_ERR to L_DBG
by Daniel-Constantin Mierla 14 May '12

14 May '12

Module: sip-router Branch: master Commit: d9f7383cf79047f1a497f3b66fe276fdabe9901a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9f7383… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 14 09:48:25 2012 +0200 dialog(k): changed log level for a debug message from L_ERR to L_DBG --- modules_k/dialog/dlg_handlers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 0b528a0..a6c1e3f 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -934,7 +934,7 @@ int dlg_set_tm_waitack(tm_cell_t *t, dlg_cell_t *dlg) if(t==NULL) return -1; - LM_ERR("registering TMCB to wait for negative ACK\n"); + LM_DBG("registering TMCB to wait for negative ACK\n"); iuid = dlg_get_iuid_shm_clone(dlg); if(iuid==NULL) {

1 0

git:master: modules_k/presence: Use non-pooled connections (where supported ) when using notifier processes
by Peter Dunkley 13 May '12

13 May '12

Module: sip-router Branch: master Commit: b882818b0e82b8b286cbc6cd0e5c986db5b9fb51 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b882818… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 13 01:23:09 2012 +0100 modules_k/presence: Use non-pooled connections (where supported) when using notifier processes - This helps with databases (such as PostgreSQL which is the only one that currently supports specifying non-pooled connections) that create a server process per client connection. --- modules_k/presence/presence.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index a3e52c4..b960d5e 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -498,9 +498,12 @@ static int child_init(int rank) LM_CRIT("child_init: database not bound\n"); return -1; } - if (pa_db) - return 0; - pa_db = pa_dbf.init(&db_url); + /* Do not pool the connections where possible when running notifier + processes. */ + if (pres_notifier_processes > 0 && pa_dbf.init2) + pa_db = pa_dbf.init2(&db_url, DB_POOLING_NONE); + else + pa_db = pa_dbf.init(&db_url); if (!pa_db) { LM_ERR("child %d: unsuccessful connecting to database\n", rank); @@ -564,9 +567,12 @@ static int mi_child_init(void) LM_CRIT("database not bound\n"); return -1; } - if (pa_db) - return 0; - pa_db = pa_dbf.init(&db_url); + /* Do not pool the connections where possible when running notifier + processes. */ + if (pres_notifier_processes > 0 && pa_dbf.init2) + pa_db = pa_dbf.init2(&db_url, DB_POOLING_NONE); + else + pa_db = pa_dbf.init(&db_url); if (!pa_db) { LM_ERR("connecting database\n");

1 0

git:master: modules_k/presence: Fixed various issues with the notifier process found during soak testing
by Peter Dunkley 13 May '12

13 May '12

Module: sip-router Branch: master Commit: 0d6e14b1d66b34752634e083d2f9cdf39a3cd459 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d6e14b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 13 01:28:37 2012 +0100 modules_k/presence: Fixed various issues with the notifier process found during soak testing --- modules_k/presence/notify.c | 288 +++++++++++++++++++++------------------ modules_k/presence/presentity.c | 57 ++++++-- modules_k/presence/publish.c | 8 +- modules_k/presence/subscribe.c | 25 +++- 4 files changed, 224 insertions(+), 154 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0d6…

1 0

git:master: modules_k/pua: Tidied up the error handling in the SUBSCRIBE callback function
by Peter Dunkley 13 May '12

13 May '12

Module: sip-router Branch: master Commit: 08489826d65f372d0128b5e6c833c0ad8516f842 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0848982… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 13 01:20:19 2012 +0100 modules_k/pua: Tidied up the error handling in the SUBSCRIBE callback function - Also sorted out a mistake in the use of (start|end)_transaction --- modules_k/pua/send_subscribe.c | 45 +++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index bc10b28..cd089e6 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -291,6 +291,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) int rt; str contact; int initial_request = 0; + int end_transaction = 1; if( ps->param== NULL || *ps->param== NULL ) { @@ -369,7 +370,7 @@ faked_error: if ( parse_headers(msg,HDR_EOH_F, 0)==-1 ) { LM_ERR("when parsing headers\n"); - goto done; + goto error; } if(ps->rpl->expires && msg->expires->body.len > 0) @@ -377,7 +378,7 @@ faked_error: if (!msg->expires->parsed && (parse_expires(msg->expires) < 0)) { LM_ERR("cannot parse Expires header\n"); - goto done; + goto error; } lexpire = ((exp_body_t*)msg->expires->parsed)->val; LM_DBG("lexpire= %d\n", lexpire); @@ -391,20 +392,20 @@ faked_error: if( msg->callid==NULL || msg->callid->body.s==NULL) { LM_ERR("cannot parse callid header\n"); - goto done; + goto error; } if (!msg->from || !msg->from->body.s) { LM_ERR("cannot find 'from' header!\n"); - goto done; + goto error; } if (msg->from->parsed == NULL) { if ( parse_from_header( msg )<0 ) { LM_ERR("cannot parse From header\n"); - goto done; + goto error; } } pfrom = (struct to_body*)msg->from->parsed; @@ -412,7 +413,7 @@ faked_error: if( pfrom->tag_value.s ==NULL || pfrom->tag_value.len == 0) { LM_ERR("no from tag value present\n"); - goto done; + goto error; } hentity->call_id= msg->callid->body; @@ -429,7 +430,7 @@ faked_error: if( msg->to==NULL || msg->to->body.s==NULL) { LM_ERR("cannot parse TO header\n"); - goto done; + goto error; } if(msg->to->parsed != NULL) { @@ -443,14 +444,14 @@ faked_error: if(TO.uri.len <= 0) { LM_ERR("'To' header NOT parsed\n"); - goto done; + goto error; } pto = &TO; } if( pto->tag_value.s ==NULL || pto->tag_value.len == 0) { LM_ERR("no to tag value present\n"); - goto done; + goto error; } hentity->to_tag= pto->tag_value; } @@ -465,6 +466,17 @@ faked_error: hentity->to_tag.len = 0; find_and_delete_dialog(hentity, hash_code); + if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction) + { + if (pua_dbf.end_transaction(pua_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } + + end_transaction = 0; + /* Redirect if the response 3XX */ memset(&subs, 0, sizeof(subs_info_t)); subs.pres_uri= hentity->pres_uri; @@ -493,7 +505,7 @@ faked_error: if(send_subscribe(&subs)< 0) { LM_ERR("when trying to send SUBSCRIBE\n"); - goto done; + goto error; } goto done; } @@ -526,13 +538,13 @@ faked_error: if( msg->cseq==NULL || msg->cseq->body.s==NULL) { LM_ERR("cannot parse cseq header\n"); - goto done; + goto error; } if( str2int( &(get_cseq(msg)->number), &cseq)< 0) { LM_ERR("while converting str to int\n"); - goto done; + goto error; } if(initial_request == 0) @@ -566,9 +578,7 @@ faked_error: if(presentity== NULL) { LM_ERR("no more share memory\n"); - if(record_route.s) - pkg_free(record_route.s); - goto done; + goto error; } memset(presentity, 0, size); @@ -687,7 +697,7 @@ done: run_pua_callbacks( hentity, msg); } - if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction) + if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction && end_transaction) { if (pua_dbf.end_transaction(pua_db) < 0) { @@ -705,6 +715,9 @@ error: shm_free(presentity); } + if(record_route.s) + pkg_free(record_route.s); + if (dbmode == PUA_DB_ONLY && pua_dbf.abort_transaction) { if (pua_dbf.abort_transaction(pua_db) < 0)

1 0

git:master: modules_k/rls: Use non-pooled connections when in DB only mode (where supported)
by Peter Dunkley 13 May '12

13 May '12

Module: sip-router Branch: master Commit: aedf75c6a0a0d9253479530b3ad50783f12efd58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aedf75c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 13 01:13:36 2012 +0100 modules_k/rls: Use non-pooled connections when in DB only mode (where supported) - This helps with databases (such as PostgreSQL which is the only one that currently supports specifying non-pooled connections) that create a server process per client connection. - Fixed a couple of (end|abort)_transaction cases where dbmode was not checked. --- modules_k/rls/notify.c | 25 ++++++++++--------------- modules_k/rls/resource_notify.c | 6 +++--- modules_k/rls/rls.c | 24 ++++++++++++++++++++---- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index fd99b5a..82324a9 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -944,7 +944,7 @@ void rls_notify_callback( struct cell *t, int type, struct tmcb_params *ps) db_val_t db_vals[2]; unsigned int hash_code; subs_t subs; - + memset(&subs, 0, sizeof(subs_t)); subs.to_tag= ((dialog_id_t*)(*ps->param))->to_tag; @@ -953,9 +953,15 @@ void rls_notify_callback( struct cell *t, int type, struct tmcb_params *ps) if (dbmode != RLS_DB_ONLY) { - /* delete from database table */ - + /* delete from cache table */ + hash_code= core_hash(&subs.callid, &subs.to_tag , hash_size); + if(pres_delete_shtable(rls_table,hash_code, subs.to_tag)< 0) + { + LM_ERR("record not found in hash table\n"); + } + + /* delete from database table */ if (rls_dbf.use_table(rls_db, &rlsubs_table) < 0) { LM_ERR("in use_table\n"); @@ -976,24 +982,13 @@ void rls_notify_callback( struct cell *t, int type, struct tmcb_params *ps) if (rls_dbf.delete(rls_db, db_keys, 0, db_vals, 2) < 0) LM_ERR("cleaning expired messages\n"); } - - /* delete from cache table */ - if (dbmode == RLS_DB_ONLY) + else { if (delete_rlsdb(&subs.callid, &subs.to_tag, NULL) < 0 ) { LM_ERR( "unable to delete record from DB\n" ); } } - else - { - hash_code= core_hash(&subs.callid, &subs.to_tag , hash_size); - - if(pres_delete_shtable(rls_table,hash_code, subs.to_tag)< 0) - { - LM_ERR("record not found in hash table\n"); - } - } } done: diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index b1da62a..bf9aa0d 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -898,7 +898,7 @@ static void timer_send_full_state_notifies(int round) goto done; } - if (rls_dbf.start_transaction) + if (dbmode == RLS_DB_ONLY && rls_dbf.start_transaction) { if (rls_dbf.start_transaction(rls_db) < 0) { @@ -926,7 +926,7 @@ static void timer_send_full_state_notifies(int round) goto done; } - if (rls_dbf.end_transaction) + if (dbmode == RLS_DB_ONLY && rls_dbf.end_transaction) { if (rls_dbf.end_transaction(rls_db) < 0) { @@ -1011,7 +1011,7 @@ done: rls_dbf.free_result(rls_db, result); if (doc != NULL) xmlFreeDoc(doc); - if (rls_dbf.abort_transaction) + if (dbmode == RLS_DB_ONLY && rls_dbf.abort_transaction) { if (rls_dbf.abort_transaction(rls_db) < 0) LM_ERR("in abort_transaction\n"); diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 7e73a27..06de4cb 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -721,7 +721,11 @@ static int child_init(int rank) LM_CRIT("database not bound\n"); return -1; } - rls_db = rls_dbf.init(&db_url); + /* In DB only mode do not pool the connections where possible. */ + if (dbmode == RLS_DB_ONLY && rls_dbf.init2) + rls_db = rls_dbf.init2(&db_url, DB_POOLING_NONE); + else + rls_db = rls_dbf.init(&db_url); if (!rls_db) { LM_ERR("child %d: Error while connecting database\n", @@ -744,7 +748,11 @@ static int child_init(int rank) LM_CRIT("database not bound\n"); return -1; } - rlpres_db = rlpres_dbf.init(&rlpres_db_url); + /* In DB only mode do not pool the connections where possible. */ + if (dbmode == RLS_DB_ONLY && rlpres_dbf.init2) + rlpres_db = rlpres_dbf.init2(&db_url, DB_POOLING_NONE); + else + rlpres_db = rlpres_dbf.init(&db_url); if (!rlpres_db) { LM_ERR("child %d: Error while connecting database\n", @@ -794,7 +802,11 @@ static int mi_child_init(void) LM_CRIT("database not bound\n"); return -1; } - rls_db = rls_dbf.init(&db_url); + /* In DB only mode do not pool the connections where possible. */ + if (dbmode == RLS_DB_ONLY && rls_dbf.init2) + rls_db = rls_dbf.init2(&db_url, DB_POOLING_NONE); + else + rls_db = rls_dbf.init(&db_url); if (!rls_db) { LM_ERR("Error while connecting database\n"); @@ -816,7 +828,11 @@ static int mi_child_init(void) LM_CRIT("database not bound\n"); return -1; } - rlpres_db = rlpres_dbf.init(&rlpres_db_url); + /* In DB only mode do not pool the connections where possible. */ + if (dbmode == RLS_DB_ONLY && rlpres_dbf.init2) + rlpres_db = rlpres_dbf.init2(&db_url, DB_POOLING_NONE); + else + rlpres_db = rlpres_dbf.init(&db_url); if (!rlpres_db) { LM_ERR("Error while connecting database\n");

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2012