sr-dev November 2011

sr-dev@lists.kamailio.org

31 participants
340 discussions

git:master: db_sqlite: init DB API lib in mod_register()
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: 4040fead1833abddee710d18e7c655ca53cfb0ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4040fea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:26:37 2011 +0100 db_sqlite: init DB API lib in mod_register() --- modules_k/db_sqlite/db_sqlite.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules_k/db_sqlite/db_sqlite.c b/modules_k/db_sqlite/db_sqlite.c index 520cc38..54b2fe8 100644 --- a/modules_k/db_sqlite/db_sqlite.c +++ b/modules_k/db_sqlite/db_sqlite.c @@ -57,6 +57,13 @@ static cmd_export_t cmds[] = { {0, 0, 0, 0, 0, 0} }; +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + if(db_api_init()<0) + return -1; + return 0; +} + static int sqlite_mod_init(void) { sqlite3_initialize(); @@ -64,7 +71,7 @@ static int sqlite_mod_init(void) LM_INFO("SQlite library version %s (compiled using %s)\n", sqlite3_libversion(), SQLITE_VERSION); - return db_query_init(); + return 0; }

1 0

git:master: db_oracle(k): init DB API lib in mod_register()
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: d0ede402a4e5a9163405fa3da66b2cb38ab24552 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0ede40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:30:15 2011 +0100 db_oracle(k): init DB API lib in mod_register() --- modules_k/db_oracle/db_oracle.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules_k/db_oracle/db_oracle.c b/modules_k/db_oracle/db_oracle.c index f72d043..9a6df8e 100644 --- a/modules_k/db_oracle/db_oracle.c +++ b/modules_k/db_oracle/db_oracle.c @@ -76,6 +76,13 @@ struct module_exports exports = { }; +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + if(db_api_init()<0) + return -1; + return 0; +} + static int oracle_mod_init(void) { sword major, minor, update, patch, port; @@ -83,7 +90,7 @@ static int oracle_mod_init(void) OCIClientVersion(&major, &minor, &update, &patch, &port); LM_DBG("Oracle client version is %d.%d.%d.%d.%d\n", major, minor, update, patch, port); - return db_query_init(); + return 0; }

1 0

git:master: db_postgres: use db_api_init() to initialize srdb1 lib
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: 4578f6eba8b3539202dffa756cf0813dfa7eb328 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4578f6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:26:07 2011 +0100 db_postgres: use db_api_init() to initialize srdb1 lib --- modules/db_postgres/pg_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index db78993..c560c9d 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -532,7 +532,7 @@ int pg_test(void) int mod_register(char *path, int *dlflags, void *p1, void *p2) { - if(db_query_init()<0) + if(db_api_init()<0) return -1; return 0; }

1 0

git:master: db_text(k): init DB API lib in mod_register()
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: fa9e7de6bbef15110cb4940769b27d90b2c000c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa9e7de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:32:42 2011 +0100 db_text(k): init DB API lib in mod_register() --- modules_k/db_text/dbtext.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules_k/db_text/dbtext.c b/modules_k/db_text/dbtext.c index 2739b92..633dbb3 100644 --- a/modules_k/db_text/dbtext.c +++ b/modules_k/db_text/dbtext.c @@ -83,6 +83,12 @@ struct module_exports exports = { 0 /* per-child init function */ }; +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + if(db_api_init()<0) + return -1; + return 0; +} static int mod_init(void) {

1 0

git:master: db_mysql: initialize DB API in mod_register() function
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: 9a7e99d01e1c60dae8bec62037e8321c7d671c1d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a7e99d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:18:36 2011 +0100 db_mysql: initialize DB API in mod_register() function - internal buffer sql_buf initialized in this function - renamed sql_buf to mysql_sql_buf to avoid potential conflict with global variable in srdb1 library --- modules/db_mysql/km_db_mysql.c | 2 +- modules/db_mysql/km_db_mysql.h | 7 +++++++ modules/db_mysql/km_dbase.c | 26 +++++++++++++------------- modules/db_mysql/km_dbase.h | 7 ------- modules/db_mysql/mysql_mod.c | 7 +++++++ 5 files changed, 28 insertions(+), 21 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 1f758ba..462dc60 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -90,7 +90,7 @@ struct kam_module_exports kam_exports = { int kam_mysql_mod_init(void) { LM_DBG("MySQL client version is %s\n", mysql_get_client_info()); - return db_mysql_alloc_buffer(); + return 0; } int db_mysql_bind_api(db_func_t *dbb) diff --git a/modules/db_mysql/km_db_mysql.h b/modules/db_mysql/km_db_mysql.h index 4705ca0..9fd9747 100644 --- a/modules/db_mysql/km_db_mysql.h +++ b/modules/db_mysql/km_db_mysql.h @@ -47,4 +47,11 @@ int db_mysql_bind_api(db_func_t *dbb); int kam_mysql_mod_init(void); +/** + * Allocate a buffer for database module + * No function should be called before this + * \return zero on success, negative value on failure + */ +int db_mysql_alloc_buffer(void); + #endif /* KM_DB_MOD_H */ diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index d85fe5f..da429d6 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -50,7 +50,7 @@ #include "km_db_mysql.h" #include "km_dbase.h" -static char *sql_buf; +static char *mysql_sql_buf; /** @@ -513,32 +513,32 @@ int db_mysql_affected_rows(const db1_con_t* _h) return -1; } - ret = snprintf(sql_buf, sql_buffer_size, "insert into %.*s (", CON_TABLE(_h)->len, CON_TABLE(_h)->s); + ret = snprintf(mysql_sql_buf, sql_buffer_size, "insert into %.*s (", CON_TABLE(_h)->len, CON_TABLE(_h)->s); if (ret < 0 || ret >= sql_buffer_size) goto error; off = ret; - ret = db_print_columns(sql_buf + off, sql_buffer_size - off, _k, _n); + ret = db_print_columns(mysql_sql_buf + off, sql_buffer_size - off, _k, _n); if (ret < 0) return -1; off += ret; - ret = snprintf(sql_buf + off, sql_buffer_size - off, ") values ("); + ret = snprintf(mysql_sql_buf + off, sql_buffer_size - off, ") values ("); if (ret < 0 || ret >= (sql_buffer_size - off)) goto error; off += ret; - ret = db_print_values(_h, sql_buf + off, sql_buffer_size - off, _v, _n, db_mysql_val2str); + ret = db_print_values(_h, mysql_sql_buf + off, sql_buffer_size - off, _v, _n, db_mysql_val2str); if (ret < 0) return -1; off += ret; - *(sql_buf + off++) = ')'; + *(mysql_sql_buf + off++) = ')'; - ret = snprintf(sql_buf + off, sql_buffer_size - off, " on duplicate key update "); + ret = snprintf(mysql_sql_buf + off, sql_buffer_size - off, " on duplicate key update "); if (ret < 0 || ret >= (sql_buffer_size - off)) goto error; off += ret; - ret = db_print_set(_h, sql_buf + off, sql_buffer_size - off, _k, _v, _n, db_mysql_val2str); + ret = db_print_set(_h, mysql_sql_buf + off, sql_buffer_size - off, _k, _v, _n, db_mysql_val2str); if (ret < 0) return -1; off += ret; - sql_str.s = sql_buf; + sql_str.s = mysql_sql_buf; sql_str.len = off; if (db_mysql_submit_query(_h, &sql_str) < 0) { @@ -587,14 +587,14 @@ int db_mysql_use_table(db1_con_t* _h, const str* _t) */ int db_mysql_alloc_buffer(void) { - if (db_query_init()) + if (db_api_init()) { - LM_ERR("Failed to initialise db_query\n"); + LM_ERR("Failed to initialise db api\n"); return -1; } - sql_buf = (char*)malloc(sql_buffer_size); - if (sql_buf == NULL) + mysql_sql_buf = (char*)malloc(sql_buffer_size); + if (mysql_sql_buf == NULL) return -1; else return 0; diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index 68e4e8e..a2b5f92 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -139,11 +139,4 @@ int db_mysql_insert_delayed(const db1_con_t* _h, const db_key_t* _k, int db_mysql_use_table(db1_con_t* _h, const str* _t); -/** - * Allocate a buffer for database module - * No function should be called before this - * \return zero on success, negative value on failure - */ -int db_mysql_alloc_buffer(void); - #endif /* KM_DBASE_H */ diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index 127ad52..74c61af 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -124,6 +124,13 @@ struct module_exports exports = { }; +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + if(db_mysql_alloc_buffer()<0) + return -1; + return 0; +} + static int mysql_mod_init(void) { #if MYSQL_VERSION_ID >= 40101

1 0

git:master: db_postgres: init DB API lib in mod_register()
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: b3b34accb2f65ccef6045b083879166cb1a1e060 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b3b34ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:21:19 2011 +0100 db_postgres: init DB API lib in mod_register() - this will initialize the sql buffer at module load time, avoiding crash at startup if a module using the DB driver is loaded before the db driver itself - reported by Timo Teras --- modules/db_postgres/km_db_postgres.c | 2 +- modules/db_postgres/pg_mod.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index 73da2ae..9b0bd8b 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -73,7 +73,7 @@ struct kam_module_exports kam_exports = { int km_postgres_mod_init(void) { - return db_query_init(); + return 0; } int db_postgres_bind_api(db_func_t *dbb) diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index 3c1e2d9..db78993 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -530,6 +530,13 @@ int pg_test(void) } #endif /* PG_TEST */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + if(db_query_init()<0) + return -1; + return 0; +} + static int pg_mod_init(void) { #ifdef PG_TEST

1 0

git:master: db_berkeley: init DB API lib in mod_register()
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: 41225392808b1e5462be40e37ba85700e8eab632 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4122539… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:22:30 2011 +0100 db_berkeley: init DB API lib in mod_register() --- modules/db_berkeley/bdb_mod.c | 7 +++++++ modules/db_berkeley/km_db_berkeley.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/bdb_mod.c b/modules/db_berkeley/bdb_mod.c index 1adf86d..81bac08 100644 --- a/modules/db_berkeley/bdb_mod.c +++ b/modules/db_berkeley/bdb_mod.c @@ -108,6 +108,13 @@ struct module_exports exports = { }; +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + if(db_api_init()<0) + return -1; + return 0; +} + static int bdb_mod_init(void) { bdb_params_t p; diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index d350d8e..61af129 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -129,7 +129,7 @@ int km_mod_init(void) if(km_bdblib_init(&p)) return -1; - return db_query_init(); + return 0; } void km_destroy(void)

1 0

git:master: db_flatstore: init DB API lib in mod_register()
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: cc88761be68212c7c08dcdef182fe2e16b42a3e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc88761… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:20:38 2011 +0100 db_flatstore: init DB API lib in mod_register() --- modules/db_flatstore/flatstore_mod.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index efbe6e1..043a8fd 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -139,6 +139,13 @@ struct module_exports exports = { }; +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + if(db_api_init()<0) + return -1; + return 0; +} + static int mod_init(void) { if (flat_delimiter.len != 1) {

1 0

git:master: srdb1: added db_api_init() function
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: 86e28b07474e75582423f50f560cf6156022da86 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86e28b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 20:15:50 2011 +0100 srdb1: added db_api_init() function - to be executed to initialize internas of DB API library - calls internal function db_query_init() that initialize the buffer to print db queries --- lib/srdb1/db.c | 15 +++++++++++++++ lib/srdb1/db.h | 10 ++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db.c b/lib/srdb1/db.c index b8abefa..892a849 100644 --- a/lib/srdb1/db.c +++ b/lib/srdb1/db.c @@ -64,6 +64,7 @@ #include "db_cap.h" #include "db_id.h" #include "db_pool.h" +#include "db_query.h" #include "db.h" static unsigned int MAX_URL_LENGTH = 255; /*!< maximum length of a SQL URL */ @@ -490,3 +491,17 @@ int db_load_bulk_data(db_func_t* binding, db1_con_t* handle, str* name, db_key_t return 0; } + +/** + * \brief DB API init function. + * + * This function must be executed by DB connector modules at load time to + * initialize the internals of DB API library. + * \return returns 0 on successful initialization, -1 on error. + */ +int db_api_init(void) +{ + if(db_query_init()<0) + return -1; + return 0; +} diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index 294488c..64969a8 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -443,4 +443,14 @@ typedef int (*db_bind_api_f)(db_func_t *dbb); int db_load_bulk_data(db_func_t* binding, db1_con_t* handle, str* name, db_key_t* cols, unsigned int count, unsigned int strict, db1_res_t* res); +/** + * \brief DB API init function. + * + * This function must be executed by DB connector modules at load time to + * initialize the internals of DB API library. + * \return returns 0 on successful initialization, -1 on error. + */ +int db_api_init(void); + + #endif /* DB1_H */

1 0

git:master: sdpops: fixed usage of delim param in sdp_codec_in_str()
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: 83253d3a5cc08ce581fad88378de5eb3bd7fc784 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83253d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 11:38:51 2011 +0100 sdpops: fixed usage of delim param in sdp_codec_in_str() - matching codecs in a comma separated list should work now - reported by Juha Heinanen as part of testing keep_codecs_by_name() --- modules/sdpops/sdpops_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 7923bf0..cfd4ae0 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -200,7 +200,7 @@ int sdp_codec_in_str(str *allcodecs, str* codec, char delim) } } } - if(allcodecs->s[i]==' ') + if(allcodecs->s[i]==delim) cmp = 1; else cmp = 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 November 2011