sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:3.1: userblacklist(k): fix some doc errors, pointed out from Daniel Vukicevic, daniel at vukicevic dot com

by Henning Westerholt

Module: sip-router Branch: 3.1 Commit: 8876b77bd3a577138818f0c5780ef1c873f188a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8876b77… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Mon Apr 23 18:21:46 2012 +0200 userblacklist(k): fix some doc errors, pointed out from Daniel Vukicevic, daniel at vukicevic dot com (cherry picked from commit 7fc5aa2c050379063212c4bb5f06697e8a97c665) --- modules_k/userblacklist/README | 6 +++--- .../userblacklist/doc/userblacklist_admin.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/userblacklist/README b/modules_k/userblacklist/README index 3627c5c..ea6897c 100644 --- a/modules_k/userblacklist/README +++ b/modules_k/userblacklist/README @@ -202,7 +202,7 @@ table) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) { sl_send_reply("403", "Forbidden"); exit; } @@ -223,7 +223,7 @@ table) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) { # process request exit; } @@ -238,7 +238,7 @@ if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) Example 1.4. check_blacklist usage ... -if (!check_blacklist("global_blacklist"))) +if (!check_blacklist("globalblacklist")) { sl_send_reply("403", "Forbidden"); exit; } diff --git a/modules_k/userblacklist/doc/userblacklist_admin.xml b/modules_k/userblacklist/doc/userblacklist_admin.xml index 28e5b84..d05ba7a 100644 --- a/modules_k/userblacklist/doc/userblacklist_admin.xml +++ b/modules_k/userblacklist/doc/userblacklist_admin.xml @@ -115,7 +115,7 @@ modparam("userblacklist", "use_domain", 0) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) { sl_send_reply("403", "Forbidden"); exit; } @@ -142,7 +142,7 @@ if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) { # process request exit; } @@ -164,7 +164,7 @@ if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) <title><function>check_blacklist</function> usage</title> <programlisting format="linespecific"> ... -if (!check_blacklist("global_blacklist"))) +if (!check_blacklist("globalblacklist")) { sl_send_reply("403", "Forbidden"); exit; }

12 years, 8 months

git:master: userblacklist(k): fix some doc errors, pointed out from Daniel Vukicevic, daniel at vukicevic dot com

by Henning Westerholt

Module: sip-router Branch: master Commit: 7fc5aa2c050379063212c4bb5f06697e8a97c665 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fc5aa2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Mon Apr 23 18:21:46 2012 +0200 userblacklist(k): fix some doc errors, pointed out from Daniel Vukicevic, daniel at vukicevic dot com --- modules_k/userblacklist/README | 6 +++--- .../userblacklist/doc/userblacklist_admin.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/userblacklist/README b/modules_k/userblacklist/README index 2227526..6089c60 100644 --- a/modules_k/userblacklist/README +++ b/modules_k/userblacklist/README @@ -220,7 +220,7 @@ table) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) { sl_send_reply("403", "Forbidden"); exit; } @@ -241,7 +241,7 @@ table) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) { # process request exit; } @@ -256,7 +256,7 @@ if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) Example 1.5. check_blacklist usage ... -if (!check_blacklist("global_blacklist"))) +if (!check_blacklist("globalblacklist")) { sl_send_reply("403", "Forbidden"); exit; } diff --git a/modules_k/userblacklist/doc/userblacklist_admin.xml b/modules_k/userblacklist/doc/userblacklist_admin.xml index 910b930..2900a02 100644 --- a/modules_k/userblacklist/doc/userblacklist_admin.xml +++ b/modules_k/userblacklist/doc/userblacklist_admin.xml @@ -140,7 +140,7 @@ modparam("userblacklist", "match_mode", 128) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) { sl_send_reply("403", "Forbidden"); exit; } @@ -167,7 +167,7 @@ if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) ... $avp(i:80) = $rU; # rewrite the R-URI -if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) +if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) { # process request exit; } @@ -189,7 +189,7 @@ if (!check_user_whitelist("$avp(i:80)", "$avp(i:82)")) <title><function>check_blacklist</function> usage</title> <programlisting format="linespecific"> ... -if (!check_blacklist("global_blacklist"))) +if (!check_blacklist("globalblacklist")) { sl_send_reply("403", "Forbidden"); exit; }

12 years, 8 months

git:master: modules_k/rls: Added MI command to "clean" the rlsubs and rlpres entries

by Peter Dunkley

Module: sip-router Branch: master Commit: 1fbb9573ba15a9164e9742380bdd597df68df1d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1fbb957… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 17:15:34 2012 +0100 modules_k/rls: Added MI command to "clean" the rlsubs and rlpres entries - This is similar to the clean MI command in presence - Useful on multi-server systems where you don't want to run the timers and have each Kamailio instance try and clean. The MI command allows you to kick of a clean on a specific server as required. --- modules_k/rls/Makefile | 1 + modules_k/rls/rls.c | 112 +++++++++++++++++++++++++++++++++++++++++++----- modules_k/rls/rls.h | 1 - 3 files changed, 102 insertions(+), 12 deletions(-) diff --git a/modules_k/rls/Makefile b/modules_k/rls/Makefile index 1c71af7..590418d 100644 --- a/modules_k/rls/Makefile +++ b/modules_k/rls/Makefile @@ -17,6 +17,7 @@ LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kmi/kmi SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 SER_LIBS+=$(SERLIBPATH)/kcore/kcore include ../../Makefile.modules diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 845297b..026b9b3 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -43,6 +43,7 @@ #include "../../ut.h" #include "../../timer_proc.h" #include "../../hashes.h" +#include "../../lib/kmi/mi.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" #include "../../modules/tm/tm_load.h" @@ -90,7 +91,6 @@ str xcap_db_url = str_init(""); str rlpres_db_url = str_init(""); int hash_size = 512; shtable_t rls_table; -int pid; contains_event_t pres_contains_event; search_event_t pres_search_event; get_event_list_t pres_get_ev_list; @@ -201,12 +201,14 @@ int rls_max_backend_subs = 0; static int mod_init(void); static int child_init(int); +static int mi_child_init(void); static void destroy(void); int rlsubs_table_restore(); void rlsubs_table_update(unsigned int ticks,void *param); int add_rls_event(modparam_t type, void* val); int rls_update_subs(struct sip_msg *msg, char *puri, char *pevent); int fixup_update_subs(void** param, int param_no); +static struct mi_root* mi_cleanup(struct mi_root* cmd, void* param); static cmd_export_t cmds[]= { @@ -253,20 +255,25 @@ static param_export_t params[]={ {0, 0, 0 } }; +static mi_export_t mi_cmds[] = { + { "cleanup", mi_cleanup, 0, 0, mi_child_init}, + { 0, 0, 0, 0, 0} +}; + /** module exports */ struct module_exports exports= { "rls", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ + DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* exported functions */ params, /* exported parameters */ - 0, /* exported statistics */ - 0, /* exported MI functions */ - 0, /* exported pseudo-variables */ - 0, /* extra processes */ + 0, /* exported statistics */ + mi_cmds, /* exported MI functions */ + 0, /* exported pseudo-variables */ + 0, /* extra processes */ mod_init, /* module initialization function */ - 0, /* response handling function */ - (destroy_function) destroy, /* destroy function */ - child_init /* per-child init function */ + 0, /* response handling function */ + (destroy_function) destroy, /* destroy function */ + child_init /* per-child init function */ }; /** @@ -676,7 +683,7 @@ static int mod_init(void) static int child_init(int rank) { if (rank==PROC_INIT || rank==PROC_TCP_MAIN) - return 0; /* don't call child_init for main process more than once */ + return 0; if (rank==PROC_MAIN && dbmode == RLS_DB_ONLY) { @@ -697,6 +704,8 @@ static int child_init(int rank) return -1; } } + + return 0; } LM_DBG("child [%d] pid [%d]\n", rank, getpid()); @@ -769,10 +778,81 @@ static int child_init(int rank) LM_DBG("child %d: Database connection opened successfully\n", rank); } - pid= my_pid(); return 0; } +static int mi_child_init(void) +{ + if (rls_dbf.init==0) + { + LM_CRIT("database not bound\n"); + return -1; + } + rls_db = rls_dbf.init(&db_url); + if (!rls_db) + { + LM_ERR("Error while connecting database\n"); + return -1; + } + else + { + if (rls_dbf.use_table(rls_db, &rlsubs_table) < 0) + { + LM_ERR("Error in use_table rlsubs_table\n"); + return -1; + } + + LM_DBG("Database connection opened successfully\n"); + } + + if (rlpres_dbf.init==0) + { + LM_CRIT("database not bound\n"); + return -1; + } + rlpres_db = rlpres_dbf.init(&rlpres_db_url); + if (!rlpres_db) + { + LM_ERR("Error while connecting database\n"); + return -1; + } + else + { + if (rlpres_dbf.use_table(rlpres_db, &rlpres_table) < 0) + { + LM_ERR("Error in use_table rlpres_table\n"); + return -1; + } + + LM_DBG("Database connection opened successfully\n"); + } + + if (rls_xcap_dbf.init==0) + { + LM_CRIT("database not bound\n"); + return -1; + } + rls_xcap_db = rls_xcap_dbf.init(&xcap_db_url); + if (!rls_xcap_db) + { + LM_ERR("Error while connecting database\n"); + return -1; + } + else + { + if (rls_xcap_dbf.use_table(rls_xcap_db, &rls_xcap_table) < 0) + { + LM_ERR("Error in use_table rls_xcap_table\n"); + return -1; + } + + LM_DBG("Database connection opened successfully\n"); + } + + return 0; + +} + /* * destroy function */ @@ -1063,3 +1143,13 @@ int bind_rls(struct rls_binds *pxb) pxb->rls_handle_notify = rls_handle_notify; return 0; } + +static struct mi_root* mi_cleanup(struct mi_root* cmd, void *param) +{ + LM_DBG("mi_cleanup:start\n"); + + (void)rlsubs_table_update(0,0); + (void)rls_presentity_clean(0,0); + + return init_mi_tree(200, MI_OK_S, MI_OK_LEN); +} diff --git a/modules_k/rls/rls.h b/modules_k/rls/rls.h index a2e9439..a3b3c39 100644 --- a/modules_k/rls/rls.h +++ b/modules_k/rls/rls.h @@ -96,7 +96,6 @@ extern str rls_xcap_table; extern str db_url; extern int hash_size; extern shtable_t rls_table; -extern int pid; extern int rls_max_expires; extern int rls_integrated_xcap_server; extern int rls_events;

12 years, 8 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Peter Dunkley

Module: sip-router Branch: master Commit: d73e5ea1d816059c39f0d951019337b1161067bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d73e5ea… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 17:17:20 2012 +0100 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: modules/lcr: Add support for R-URI matching. ---

12 years, 8 months

git:master: modules/lcr: Add support for R-URI matching.

by Andreas Granig

Module: sip-router Branch: master Commit: c47d39153c52316d02edebc13669d5f55f5a418e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c47d391… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Mon Apr 23 18:08:39 2012 +0200 modules/lcr: Add support for R-URI matching. - An additional request_uri column has been introduced. If other than NULL, it also needs to match beside prefix and from_uri in order for the rule to be selected. --- lib/srdb1/schema/lcr_rule.xml | 9 + lib/srdb2/schema/lcr.xml | 7 + modules/lcr/README | 309 +++++++++++++++------------- modules/lcr/doc/lcr_admin.xml | 36 +++- modules/lcr/hash.c | 17 ++- modules/lcr/hash.h | 4 +- modules/lcr/lcr_mod.c | 138 +++++++++---- modules/lcr/lcr_mod.h | 3 + modules/lcr/lcr_rpc.c | 7 +- utils/kamctl/db_berkeley/kamailio/lcr_rule | 4 +- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/lcr-create.sql | 5 +- utils/kamctl/dbtext/kamailio/lcr_rule | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/lcr-create.sql | 5 +- utils/kamctl/oracle/lcr-create.sql | 5 +- utils/kamctl/postgres/lcr-create.sql | 5 +- 17 files changed, 345 insertions(+), 215 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c47…

12 years, 8 months

git:master: lib/srdb1/schema, modules_k/presence, utils/kamctl: Added another field to active_watchers DB

by Peter Dunkley

Module: sip-router Branch: master Commit: 6583dd786969c8ae6b5d84d263530418b8f28cf0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6583dd7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 16:32:36 2012 +0100 lib/srdb1/schema, modules_k/presence, utils/kamctl: Added another field to active_watchers DB - Added the updated_winfo field (part of the presence notifier fix) now to get in before the freeze. - Also updated active_watchers table version. --- lib/srdb1/schema/pr_active_watchers.xml | 15 ++++++++- modules_k/presence/notify.c | 2 + modules_k/presence/notify.h | 2 + modules_k/presence/presence.c | 2 +- modules_k/presence/subscribe.c | 34 +++++++++++++++++--- utils/kamctl/db_berkeley/kamailio/active_watchers | 4 +- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/presence-create.sql | 4 ++- utils/kamctl/dbtext/kamailio/active_watchers | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/presence-create.sql | 4 ++- utils/kamctl/oracle/presence-create.sql | 4 ++- utils/kamctl/postgres/presence-create.sql | 4 ++- 13 files changed, 65 insertions(+), 16 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=658…

12 years, 8 months

Freezing development today for release 3.3.0

by Daniel-Constantin Mierla

Hello, quick reminder for everyone that by end of today is planned the freezing for the development of the new features to be in version 3.3.0. I know there are going to be few hammerings to newly added features, when discovering issues, that's the testing phase for. But try to get at least the database structure settled by today, as most of the users need to adapt management interfaces to start using the new version. Cheers, Daniel

12 years, 8 months

git:master: modules/db_mysql, modules_k/db_oracle, modules_k/db_sqlite, modules_k/db_unixodbc: Reverted changes for non-pooled connections as no longer needed

by Peter Dunkley

Module: sip-router Branch: master Commit: b5cc82d5251b933e0e6675b7ab8d9088e45b79e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5cc82d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 12:38:50 2012 +0100 modules/db_mysql, modules_k/db_oracle, modules_k/db_sqlite, modules_k/db_unixodbc: Reverted changes for non-pooled connections as no longer needed - The original db_do_init() function is available so these modules don't need to be changed. --- modules/db_mysql/km_dbase.c | 2 +- modules_k/db_oracle/dbase.c | 2 +- modules_k/db_sqlite/dbase.c | 2 +- modules_k/db_unixodbc/dbase.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 14d4ce5..208f64e 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -133,7 +133,7 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) */ db1_con_t* db_mysql_init(const str* _url) { - return db_do_init(_url, (void *)db_mysql_new_connection, 0); + return db_do_init(_url, (void *)db_mysql_new_connection); } diff --git a/modules_k/db_oracle/dbase.c b/modules_k/db_oracle/dbase.c index dfa9cde..619cc4d 100644 --- a/modules_k/db_oracle/dbase.c +++ b/modules_k/db_oracle/dbase.c @@ -163,7 +163,7 @@ const char* db_oracle_error(ora_con_t* con, sword status) */ db1_con_t* db_oracle_init(const str* _url) { - return db_do_init(_url, (void *)db_oracle_new_connection, 0); + return db_do_init(_url, (void *)db_oracle_new_connection); } diff --git a/modules_k/db_sqlite/dbase.c b/modules_k/db_sqlite/dbase.c index c529a7c..67db13b 100644 --- a/modules_k/db_sqlite/dbase.c +++ b/modules_k/db_sqlite/dbase.c @@ -73,7 +73,7 @@ static struct sqlite_connection * db_sqlite_new_connection(const struct db_id* i db1_con_t* db_sqlite_init(const str* _url) { - return db_do_init(_url, (void *) db_sqlite_new_connection, 0); + return db_do_init(_url, (void *) db_sqlite_new_connection); } diff --git a/modules_k/db_unixodbc/dbase.c b/modules_k/db_unixodbc/dbase.c index 97b9194..72edf1e 100644 --- a/modules_k/db_unixodbc/dbase.c +++ b/modules_k/db_unixodbc/dbase.c @@ -172,7 +172,7 @@ static int db_unixodbc_submit_query(const db1_con_t* _h, const str* _s) */ db1_con_t* db_unixodbc_init(const str* _url) { - return db_do_init(_url, (void*)db_unixodbc_new_connection, 0); + return db_do_init(_url, (void*)db_unixodbc_new_connection); } /*

12 years, 8 months

git:master: modules/db_postgres: Replaced init_nopool() with init2()

by Peter Dunkley

Module: sip-router Branch: master Commit: 732892b20b5639d698c195d4e742226415fe17f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=732892b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 12:39:53 2012 +0100 modules/db_postgres: Replaced init_nopool() with init2() --- modules/db_postgres/km_db_postgres.c | 2 +- modules/db_postgres/km_dbase.c | 6 +++--- modules/db_postgres/km_dbase.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index 74b1a96..f56a2ff 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -85,7 +85,7 @@ int db_postgres_bind_api(db_func_t *dbb) dbb->use_table = db_postgres_use_table; dbb->init = db_postgres_init; - dbb->init_nopool = db_postgres_init_nopool; + dbb->init2 = db_postgres_init2; dbb->close = db_postgres_close; dbb->query = db_postgres_query; dbb->fetch_result = db_postgres_fetch_result; diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index e664a69..5e79d52 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -130,7 +130,7 @@ static void db_postgres_free_query(const db1_con_t* _con); */ db1_con_t *db_postgres_init(const str* _url) { - return db_do_init(_url, (void*) db_postgres_new_connection, 0); + return db_do_init(_url, (void*) db_postgres_new_connection); } /*! @@ -139,9 +139,9 @@ db1_con_t *db_postgres_init(const str* _url) * \return database connection on success, NULL on error * \note this function must be called prior to any database functions */ -db1_con_t *db_postgres_init_nopool(const str* _url) +db1_con_t *db_postgres_init2(const str* _url, db_pooling_t pooling) { - return db_do_init(_url, (void*) db_postgres_new_connection, 1); + return db_do_init2(_url, (void*) db_postgres_new_connection, pooling); } /*! diff --git a/modules/db_postgres/km_dbase.h b/modules/db_postgres/km_dbase.h index c219a32..60c824b 100644 --- a/modules/db_postgres/km_dbase.h +++ b/modules/db_postgres/km_dbase.h @@ -49,7 +49,7 @@ db1_con_t* db_postgres_init(const str* _url); /* * Initialize database connection - no pooling */ -db1_con_t* db_postgres_init_nopool(const str* _url); +db1_con_t* db_postgres_init2(const str* _url, db_pooling_t pooling); /* * Close a database connection

12 years, 8 months

git:master: lib/srdb1: Cleaner implementation of non-pooled connections

by Peter Dunkley

Module: sip-router Branch: master Commit: 6eb22c8da9d3b41668bdf74f4064992066f38022 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6eb22c8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 12:37:19 2012 +0100 lib/srdb1: Cleaner implementation of non-pooled connections - Uses a new db_do_init2() function that takes a parameter to indicate pooling. - This leaves the parameters for db_do_init() unchanged. --- lib/srdb1/db.c | 16 +++++++++++++--- lib/srdb1/db.h | 28 ++++++++++++++++++++++++---- lib/srdb1/db_id.c | 6 ++++-- lib/srdb1/db_id.h | 4 +++- 4 files changed, 44 insertions(+), 10 deletions(-) diff --git a/lib/srdb1/db.c b/lib/srdb1/db.c index ff7f837..17c018a 100644 --- a/lib/srdb1/db.c +++ b/lib/srdb1/db.c @@ -221,7 +221,7 @@ int db_bind_mod(const str* mod, db_func_t* mydbf) dbf.use_table = (db_use_table_f)find_mod_export(tmp, "db_use_table", 2, 0); dbf.init = (db_init_f)find_mod_export(tmp, "db_init", 1, 0); - dbf.init_nopool = (db_init_nopool_f)find_mod_export(tmp, "db_init_nopool", 1, 0); + dbf.init2 = (db_init2_f)find_mod_export(tmp, "db_init2", 1, 0); dbf.close = (db_close_f)find_mod_export(tmp, "db_close", 2, 0); dbf.query = (db_query_f)find_mod_export(tmp, "db_query", 2, 0); dbf.fetch_result = (db_fetch_result_f)find_mod_export(tmp, @@ -260,7 +260,17 @@ error: * Initialize database module * \note No function should be called before this */ -db1_con_t* db_do_init(const str* url, void* (*new_connection)(), int nopool) +db1_con_t* db_do_init(const str* url, void* (*new_connection)()) +{ + return db_do_init2(url, *new_connection, DB_POOLING_PERMITTED); +} + + +/*! \brief + * Initialize database module + * \note No function should be called before this + */ +db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t pooling) { struct db_id* id; void* con; @@ -288,7 +298,7 @@ db1_con_t* db_do_init(const str* url, void* (*new_connection)(), int nopool) } memset(res, 0, con_size); - id = new_db_id(url, nopool); + id = new_db_id(url, pooling); if (!id) { LM_ERR("cannot parse URL '%.*s'\n", url->len, url->s); goto err; diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index 06ff8f3..a0927e5 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -52,6 +52,11 @@ #include "db_row.h" +typedef enum { + DB_POOLING_PERMITTED, + DB_POOLING_NONE +} db_pooling_t; + /** * \brief Specify table name that will be used for subsequent operations. * @@ -89,7 +94,7 @@ typedef int (*db_use_table_f)(db1_con_t* _h, const str * _t); typedef db1_con_t* (*db_init_f) (const str* _sqlurl); /** - * \brief Initialize database connection and obtain a non-pooled connection handle. + * \brief Initialize database connection and obtain the connection handle. * * This function initialize the database API and open a new database * connection. This function must be called after bind_dbmod but before any @@ -107,10 +112,11 @@ typedef db1_con_t* (*db_init_f) (const str* _sqlurl); * name of the database (optional). * \see bind_dbmod * \param _sqlurl database connection URL + * \param _pooling whether or not to use a pooled connection * \return returns a pointer to the db1_con_t representing the connection if it was * successful, otherwise 0 is returned */ -typedef db1_con_t* (*db_init_nopool_f) (const str* _sqlurl); +typedef db1_con_t* (*db_init2_f) (const str* _sqlurl, db_pooling_t _pooling); /** * \brief Close a database connection and free all memory used. @@ -347,7 +353,7 @@ typedef struct db_func { unsigned int cap; /* Capability vector of the database transport */ db_use_table_f use_table; /* Specify table name */ db_init_f init; /* Initialize database connection */ - db_init_nopool_f init_nopool; /* Initialize database connection - no pooling */ + db_init2_f init2; /* Initialize database connection */ db_close_f close; /* Close database connection */ db_query_f query; /* query a table */ db_fetch_result_f fetch_result; /* fetch result */ @@ -396,7 +402,21 @@ int db_bind_mod(const str* mod, db_func_t* dbf); * \return returns a pointer to the db1_con_t representing the connection if it was successful, otherwise 0 is returned. */ -db1_con_t* db_do_init(const str* url, void* (*new_connection)(), int nopool); +db1_con_t* db_do_init(const str* url, void* (*new_connection)()); + + +/** + * \brief Helper for db_init2 function. + * + * This helper method do the actual work for the database specific db_init + * functions. + * \param url database connection URL + * \param (*new_connection)() Pointer to the db specific connection creation method + * \param pooling whether or not to use a pooled connection + * \return returns a pointer to the db1_con_t representing the connection if it was + successful, otherwise 0 is returned. + */ +db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t pooling); /** diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index b6227a2..29b0226 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -27,6 +27,7 @@ * \brief Functions for parsing a database URL and work with db identifier. */ +#include "db.h" #include "db_id.h" #include "../../dprint.h" #include "../../mem/mem.h" @@ -225,9 +226,10 @@ static int parse_db_url(struct db_id* id, const str* url) /** * Create a new connection identifier * \param url database URL + * \param pooling whether or not a pooled connection may be used * \return connection identifier, or zero on error */ -struct db_id* new_db_id(const str* url, int nopool) +struct db_id* new_db_id(const str* url, db_pooling_t pooling) { static int poolid=0; struct db_id* ptr; @@ -249,7 +251,7 @@ struct db_id* new_db_id(const str* url, int nopool) goto err; } - if (nopool) ptr->poolid = ++poolid; + if (pooling == DB_POOLING_NONE) ptr->poolid = ++poolid; else ptr->poolid = 0; ptr->pid = my_pid(); diff --git a/lib/srdb1/db_id.h b/lib/srdb1/db_id.h index df3f474..13ffc85 100644 --- a/lib/srdb1/db_id.h +++ b/lib/srdb1/db_id.h @@ -31,6 +31,7 @@ #define _DB1_ID_H #include "../../str.h" +#include "db.h" /** Structure representing a database ID */ struct db_id { @@ -48,9 +49,10 @@ struct db_id { /** * Create a new connection identifier * \param url database URL + * \param pooling whether or not a pooled connection may be used * \return new allocated db_id structure, NULL on failure */ -struct db_id* new_db_id(const str* url, int nopool); +struct db_id* new_db_id(const str* url, db_pooling_t pooling); /**

12 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012