sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:janakj/mysql: DB_* renamed to DB1_* in files originating from kamailio/ db_mysql.

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: b81f22eed0cb8297c81810ad46b9a6b82109464e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b81f22e… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 23:17:48 2009 +0100 DB_* renamed to DB1_* in files originating from kamailio/db_mysql. --- modules/db_mysql/km_res.c | 32 ++++++++++++++++---------------- modules/db_mysql/km_val.c | 6 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index fe71cec..10d3ce2 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -97,34 +97,34 @@ int db_mysql_get_columns(const db1_con_t* _h, db1_res_t* _r) case MYSQL_TYPE_LONG: case MYSQL_TYPE_INT24: case MYSQL_TYPE_TIMESTAMP: - LM_DBG("use DB_INT result type\n"); - RES_TYPES(_r)[col] = DB_INT; + LM_DBG("use DB1_INT result type\n"); + RES_TYPES(_r)[col] = DB1_INT; break; case MYSQL_TYPE_LONGLONG: - LM_DBG("use DB_BIGINT result type\n"); - RES_TYPES(_r)[col] = DB_BIGINT; + LM_DBG("use DB1_BIGINT result type\n"); + RES_TYPES(_r)[col] = DB1_BIGINT; break; case MYSQL_TYPE_FLOAT: case MYSQL_TYPE_DOUBLE: - LM_DBG("use DB_DOUBLE result type\n"); - RES_TYPES(_r)[col] = DB_DOUBLE; + LM_DBG("use DB1_DOUBLE result type\n"); + RES_TYPES(_r)[col] = DB1_DOUBLE; break; case MYSQL_TYPE_DATETIME: - LM_DBG("use DB_DATETIME result type\n"); - RES_TYPES(_r)[col] = DB_DATETIME; + LM_DBG("use DB1_DATETIME result type\n"); + RES_TYPES(_r)[col] = DB1_DATETIME; break; case MYSQL_TYPE_BLOB: - LM_DBG("use DB_BLOB result type\n"); - RES_TYPES(_r)[col] = DB_BLOB; + LM_DBG("use DB1_BLOB result type\n"); + RES_TYPES(_r)[col] = DB1_BLOB; break; case FIELD_TYPE_SET: - LM_DBG("use DB_BITMAP result type\n"); - RES_TYPES(_r)[col] = DB_BITMAP; + LM_DBG("use DB1_BITMAP result type\n"); + RES_TYPES(_r)[col] = DB1_BITMAP; break; case MYSQL_TYPE_DECIMAL: @@ -133,15 +133,15 @@ int db_mysql_get_columns(const db1_con_t* _h, db1_res_t* _r) #endif case MYSQL_TYPE_STRING: case MYSQL_TYPE_VAR_STRING: - LM_DBG("use DB_STRING result type\n"); - RES_TYPES(_r)[col] = DB_STRING; + LM_DBG("use DB1_STRING result type\n"); + RES_TYPES(_r)[col] = DB1_STRING; break; default: LM_WARN("unhandled data type column (%.*s) type id (%d), " - "use DB_STRING as default\n", RES_NAMES(_r)[col]->len, + "use DB1_STRING as default\n", RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s, fields[col].type); - RES_TYPES(_r)[col] = DB_STRING; + RES_TYPES(_r)[col] = DB1_STRING; break; } } diff --git a/modules/db_mysql/km_val.c b/modules/db_mysql/km_val.c index f05747d..5896650 100644 --- a/modules/db_mysql/km_val.c +++ b/modules/db_mysql/km_val.c @@ -53,7 +53,7 @@ int db_mysql_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _le return tmp; switch(VAL_TYPE(_v)) { - case DB_STRING: + case DB1_STRING: l = strlen(VAL_STRING(_v)); if (*_len < (l * 2 + 3)) { LM_ERR("destination buffer too short\n"); @@ -69,7 +69,7 @@ int db_mysql_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _le } break; - case DB_STR: + case DB1_STR: if (*_len < (VAL_STR(_v).len * 2 + 3)) { LM_ERR("destination buffer too short\n"); return -7; @@ -84,7 +84,7 @@ int db_mysql_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _le } break; - case DB_BLOB: + case DB1_BLOB: l = VAL_BLOB(_v).len; if (*_len < (l * 2 + 3)) { LM_ERR("destination buffer too short\n");

15 years, 10 months

git:janakj/mysql: Eliminate conflicts with files imported from ser/ mysql modules.

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 10617927e31bf83f764defd1db42b6a70372e34a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1061792… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 00:05:25 2009 +0100 Eliminate conflicts with files imported from ser/mysql modules. * Comment out MODULE_VERSION, this is already used in mysql_mod.c * Prefix the type name of kamailio module data structures with kam_, this is how they were renamed in the sip-router repository. * Rename the exports structure to kam_exports to avoid conflict with the exports structure defined in mysql_mod.c --- modules/db_mysql/km_db_mysql.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index dd2907e..efa5d88 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -54,19 +54,18 @@ unsigned int db_mysql_auto_reconnect = 1; /* Default is enabled */ static int mysql_mod_init(void); -MODULE_VERSION +/* MODULE_VERSION */ int db_mysql_bind_api(db_func_t *dbb); /*! \brief * MySQL database module interface */ -static cmd_export_t cmds[] = { +static kam_cmd_export_t cmds[] = { {"db_bind_api", (cmd_function)db_mysql_bind_api, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; - /*! \brief * Exported parameters */ @@ -77,8 +76,7 @@ static param_export_t params[] = { {0, 0, 0} }; - -struct module_exports exports = { +struct kam_module_exports kam_exports = { "db_mysql", DEFAULT_DLFLAGS, /* dlopen flags */ cmds,

15 years, 10 months

git:janakj/mysql: db_con renamed to db1_con in files originating from kamailio/db_mysql.

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 956802dcd657e128f94c064d24f45dc918e9d2a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=956802d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 23:09:32 2009 +0100 db_con renamed to db1_con in files originating from kamailio/db_mysql. The structure db_con has been renamed in lib/srdb1 to db1_con, thus we need to change the name of the structure in all files originating from kamailio/modules/db_mysql (and using lib/srdb1). --- modules/db_mysql/km_dbase.c | 30 +++++++++++++++--------------- modules/db_mysql/km_dbase.h | 26 +++++++++++++------------- modules/db_mysql/km_res.c | 6 +++--- modules/db_mysql/km_res.h | 4 ++-- modules/db_mysql/km_row.c | 2 +- modules/db_mysql/km_row.h | 2 +- modules/db_mysql/km_val.c | 2 +- modules/db_mysql/km_val.h | 2 +- 8 files changed, 37 insertions(+), 37 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=956…

15 years, 10 months

git:janakj/mysql: db_res renamed to db1_res in files originating from kamailio/db_mysql.

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: f1fc20c7cbe36ae60b011dbb6b612632c7635ebb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1fc20c… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 23:13:16 2009 +0100 db_res renamed to db1_res in files originating from kamailio/db_mysql. The structure db_res has been renamed in lib/srdb1 to db1_res, thus we need to change the name of the structure in all files originating from kamailio/modules/db_mysql (and using lib/srdb1). --- modules/db_mysql/km_dbase.c | 10 +++++----- modules/db_mysql/km_dbase.h | 8 ++++---- modules/db_mysql/km_res.c | 6 +++--- modules/db_mysql/km_res.h | 4 ++-- modules/db_mysql/km_row.c | 2 +- modules/db_mysql/km_row.h | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 2a2f9b8..6294a02 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -149,7 +149,7 @@ void db_mysql_close(db1_con_t* _h) * \param _r result set that should be retrieved * \return zero on success, negative value on failure */ -static int db_mysql_store_result(const db1_con_t* _h, db_res_t** _r) +static int db_mysql_store_result(const db1_con_t* _h, db1_res_t** _r) { if ((!_h) || (!_r)) { LM_ERR("invalid parameter value\n"); @@ -213,7 +213,7 @@ done: * \param _r result set that should be freed * \return zero on success, negative value on failure */ -int db_mysql_free_result(db1_con_t* _h, db_res_t* _r) +int db_mysql_free_result(db1_con_t* _h, db1_res_t* _r) { if ((!_h) || (!_r)) { LM_ERR("invalid parameter value\n"); @@ -245,7 +245,7 @@ int db_mysql_free_result(db1_con_t* _h, db_res_t* _r) */ int db_mysql_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc, - const db_key_t _o, db_res_t** _r) + const db_key_t _o, db1_res_t** _r) { return db_do_query(_h, _k, _op, _v, _c, _n, _nc, _o, _r, db_mysql_val2str, db_mysql_submit_query, db_mysql_store_result); @@ -266,7 +266,7 @@ int db_mysql_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, * \param nrows number of fetched rows * \return zero on success, negative value on failure */ -int db_mysql_fetch_result(const db1_con_t* _h, db_res_t** _r, const int nrows) +int db_mysql_fetch_result(const db1_con_t* _h, db1_res_t** _r, const int nrows) { int rows, i; @@ -374,7 +374,7 @@ int db_mysql_fetch_result(const db1_con_t* _h, db_res_t** _r, const int nrows) * \param _r result set for storage * \return zero on success, negative value on failure */ -int db_mysql_raw_query(const db1_con_t* _h, const str* _s, db_res_t** _r) +int db_mysql_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) { return db_do_raw_query(_h, _s, _r, db_mysql_submit_query, db_mysql_store_result); diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index 2a833e8..c1dec34 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -57,7 +57,7 @@ void db_mysql_close(db1_con_t* _h); /*! \brief * Free all memory allocated by get_result */ -int db_mysql_free_result(db1_con_t* _h, db_res_t* _r); +int db_mysql_free_result(db1_con_t* _h, db1_res_t* _r); /*! \brief @@ -65,19 +65,19 @@ int db_mysql_free_result(db1_con_t* _h, db_res_t* _r); */ int db_mysql_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, const db_val_t* _v, const db_key_t* _c, const int _n, const int _nc, - const db_key_t _o, db_res_t** _r); + const db_key_t _o, db1_res_t** _r); /*! \brief * fetch rows from a result */ -int db_mysql_fetch_result(const db1_con_t* _h, db_res_t** _r, const int nrows); +int db_mysql_fetch_result(const db1_con_t* _h, db1_res_t** _r, const int nrows); /*! \brief * Raw SQL query */ -int db_mysql_raw_query(const db1_con_t* _h, const str* _s, db_res_t** _r); +int db_mysql_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r); /*! \brief diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 7367aa5..fe71cec 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -50,7 +50,7 @@ * \param _r database result set * \return 0 on success, negative on failure */ -int db_mysql_get_columns(const db1_con_t* _h, db_res_t* _r) +int db_mysql_get_columns(const db1_con_t* _h, db1_res_t* _r) { int col; MYSQL_FIELD* fields; @@ -155,7 +155,7 @@ int db_mysql_get_columns(const db1_con_t* _h, db_res_t* _r) * \param _r database result set * \return 0 on success, negative on failure */ -static inline int db_mysql_convert_rows(const db1_con_t* _h, db_res_t* _r) +static inline int db_mysql_convert_rows(const db1_con_t* _h, db1_res_t* _r) { int row; @@ -201,7 +201,7 @@ static inline int db_mysql_convert_rows(const db1_con_t* _h, db_res_t* _r) * \param _r database result * \return 0 on success, negative on failure */ -int db_mysql_convert_result(const db1_con_t* _h, db_res_t* _r) +int db_mysql_convert_result(const db1_con_t* _h, db1_res_t* _r) { if ((!_h) || (!_r)) { LM_ERR("invalid parameter\n"); diff --git a/modules/db_mysql/km_res.h b/modules/db_mysql/km_res.h index 6d2a18e..39b6d3d 100644 --- a/modules/db_mysql/km_res.h +++ b/modules/db_mysql/km_res.h @@ -44,7 +44,7 @@ * \param _r database result * \return 0 on success, negative on failure */ -int db_mysql_convert_result(const db1_con_t* _h, db_res_t* _r); +int db_mysql_convert_result(const db1_con_t* _h, db1_res_t* _r); /*! @@ -53,6 +53,6 @@ int db_mysql_convert_result(const db1_con_t* _h, db_res_t* _r); * \param _r database result set * \return 0 on success, negative on failure */ -int db_mysql_get_columns(const db1_con_t* _h, db_res_t* _r); +int db_mysql_get_columns(const db1_con_t* _h, db1_res_t* _r); #endif diff --git a/modules/db_mysql/km_row.c b/modules/db_mysql/km_row.c index b38854f..42f2841 100644 --- a/modules/db_mysql/km_row.c +++ b/modules/db_mysql/km_row.c @@ -44,7 +44,7 @@ * \param _r database result row * \return 0 on success, -1 on failure */ -int db_mysql_convert_row(const db1_con_t* _h, db_res_t* _res, db_row_t* _r) +int db_mysql_convert_row(const db1_con_t* _h, db1_res_t* _res, db_row_t* _r) { unsigned long* lengths; int i; diff --git a/modules/db_mysql/km_row.h b/modules/db_mysql/km_row.h index 35516f7..eb8b582 100644 --- a/modules/db_mysql/km_row.h +++ b/modules/db_mysql/km_row.h @@ -46,6 +46,6 @@ * \param _r database result row * \return 0 on success, -1 on failure */ -int db_mysql_convert_row(const db1_con_t* _h, db_res_t* _res, db_row_t* _r); +int db_mysql_convert_row(const db1_con_t* _h, db1_res_t* _res, db_row_t* _r); #endif

15 years, 10 months

git:janakj/mysql: Integration of both modules, first step.

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 961212734a44bb41755c72916b205403d66b4458 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9612127… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 22:58:33 2009 +0100 Integration of both modules, first step. * Defines protecting header files from double inclusion fixed to match filenames. * Linked the module also with srdb1 * Fixed path to header files in lib/srdb1. * Filenames of local included header files prefixed with km_ to match their real filenames --- modules/db_mysql/Makefile | 2 +- modules/db_mysql/km_Makefile | 41 ---------------------------------------- modules/db_mysql/km_db_mysql.c | 6 ++-- modules/db_mysql/km_db_mysql.h | 6 ++-- modules/db_mysql/km_dbase.c | 16 +++++++------- modules/db_mysql/km_dbase.h | 16 +++++++------- modules/db_mysql/km_my_con.c | 4 +- modules/db_mysql/km_my_con.h | 10 ++++---- modules/db_mysql/km_res.c | 8 +++--- modules/db_mysql/km_res.h | 8 +++--- modules/db_mysql/km_row.c | 10 ++++---- modules/db_mysql/km_row.h | 10 ++++---- modules/db_mysql/km_val.c | 6 ++-- modules/db_mysql/km_val.h | 8 +++--- 14 files changed, 55 insertions(+), 96 deletions(-) diff --git a/modules/db_mysql/Makefile b/modules/db_mysql/Makefile index 13ac208..c3e3e43 100644 --- a/modules/db_mysql/Makefile +++ b/modules/db_mysql/Makefile @@ -20,6 +20,6 @@ LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \ -lmysqlclient -lz SERLIBPATH=../../lib -SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 +SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules diff --git a/modules/db_mysql/km_Makefile b/modules/db_mysql/km_Makefile deleted file mode 100644 index 3fd0adf..0000000 --- a/modules/db_mysql/km_Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# $Id$ -# -# WARNING: do not run this directly, it should be run by the master Makefile - -include ../../Makefile.defs -auto_gen= -NAME=db_mysql.so - -# set CROSS_COMPILE to true if you want to skip -# the autodetection -# CROSS_COMPILE=true - -ifeq ($(CROSS_COMPILE),) -MYSQLCFG=$(shell which mysql_config) -endif - -ifneq ($(MYSQLCFG),) - - # use autodetection - DEFS += $(shell $(MYSQLCFG) --include | sed 's/$-I.*$\/mysql/\1/g' ) - LIBS = $(shell $(MYSQLCFG) --libs) - -else - - # use standard know paths - # mysql.h locations (freebsd,openbsd solaris) - DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/mysql \ - -I$(LOCALBASE)/mysql/include/mysql -I$(LOCALBASE)/mysql/include \ - -I$(SYSBASE)/include/mysql - - # libmysqlclient locations on RH/Suse, Solaris /OpenBSD, FreeBSD - # (Debian does the right thing and puts it in /usr/lib) - LIBS=-L$(SYSBASE)/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \ - -L$(LOCALBASE)/mysql/lib/mysql/ \ - -L$(LOCALBASE)/mysql/lib \ - -L$(SYSBASE)/lib64/mysql \ - -lm -lmysqlclient -lz - -endif - -include ../../Makefile.modules diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index d1e9e09..dd2907e 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -42,9 +42,9 @@ */ #include "../../sr_module.h" -#include "../../db/db.h" -#include "dbase.h" -#include "db_mysql.h" +#include "../../lib/srdb1/db.h" +#include "km_dbase.h" +#include "km_db_mysql.h" #include <mysql/mysql.h> diff --git a/modules/db_mysql/km_db_mysql.h b/modules/db_mysql/km_db_mysql.h index 7b476f8..8512fc2 100644 --- a/modules/db_mysql/km_db_mysql.h +++ b/modules/db_mysql/km_db_mysql.h @@ -35,11 +35,11 @@ */ -#ifndef DB_MOD_H -#define DB_MOD_H +#ifndef KM_DB_MOD_H +#define KM_DB_MOD_H extern unsigned int db_mysql_ping_interval; extern unsigned int db_mysql_timeout_interval; extern unsigned int db_mysql_auto_reconnect; -#endif /* DB_MOD_H */ +#endif /* KM_DB_MOD_H */ diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index ed79a17..e34c240 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -40,14 +40,14 @@ #include <mysql/mysql_version.h> #include "../../mem/mem.h" #include "../../dprint.h" -#include "../../db/db_query.h" -#include "../../db/db_ut.h" -#include "val.h" -#include "my_con.h" -#include "res.h" -#include "row.h" -#include "db_mysql.h" -#include "dbase.h" +#include "../../lib/srdb1/db_query.h" +#include "../../lib/srdb1/db_ut.h" +#include "km_val.h" +#include "km_my_con.h" +#include "km_res.h" +#include "km_row.h" +#include "km_db_mysql.h" +#include "km_dbase.h" /** diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index 68d47b3..e6bc4ec 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -31,15 +31,15 @@ -#ifndef DBASE_H -#define DBASE_H +#ifndef KM_DBASE_H +#define KM_DBASE_H -#include "../../db/db_con.h" -#include "../../db/db_res.h" -#include "../../db/db_key.h" -#include "../../db/db_op.h" -#include "../../db/db_val.h" +#include "../../lib/srdb1/db_con.h" +#include "../../lib/srdb1/db_res.h" +#include "../../lib/srdb1/db_key.h" +#include "../../lib/srdb1/db_op.h" +#include "../../lib/srdb1/db_val.h" #include "../../str.h" /*! \brief @@ -125,4 +125,4 @@ int db_insert_update(const db_con_t* _h, const db_key_t* _k, const db_val_t* _v, int db_mysql_use_table(db_con_t* _h, const str* _t); -#endif /* DBASE_H */ +#endif /* KM_DBASE_H */ diff --git a/modules/db_mysql/km_my_con.c b/modules/db_mysql/km_my_con.c index b5ec56a..b938117 100644 --- a/modules/db_mysql/km_my_con.c +++ b/modules/db_mysql/km_my_con.c @@ -28,8 +28,8 @@ */ -#include "my_con.h" -#include "db_mysql.h" +#include "km_my_con.h" +#include "km_db_mysql.h" #include <mysql/mysql_version.h> #include "../../mem/mem.h" #include "../../dprint.h" diff --git a/modules/db_mysql/km_my_con.h b/modules/db_mysql/km_my_con.h index 75a8e35..2624f34 100644 --- a/modules/db_mysql/km_my_con.h +++ b/modules/db_mysql/km_my_con.h @@ -29,11 +29,11 @@ */ -#ifndef MY_CON_H -#define MY_CON_H +#ifndef KM_MY_CON_H +#define KM_MY_CON_H -#include "../../db/db_pool.h" -#include "../../db/db_id.h" +#include "../../lib/srdb1/db_pool.h" +#include "../../lib/srdb1/db_id.h" #include <time.h> #include <mysql/mysql.h> @@ -72,4 +72,4 @@ struct my_con* db_mysql_new_connection(const struct db_id* id); */ void db_mysql_free_connection(struct pool_con* con); -#endif /* MY_CON_H */ +#endif /* KM_MY_CON_H */ diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 5a743f9..3e51c7b 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -33,12 +33,12 @@ #include <string.h> #include <mysql/mysql.h> -#include "../../db/db_res.h" +#include "../../lib/srdb1/db_res.h" #include "../../mem/mem.h" #include "../../dprint.h" -#include "row.h" -#include "my_con.h" -#include "res.h" +#include "km_row.h" +#include "km_my_con.h" +#include "km_res.h" /*! diff --git a/modules/db_mysql/km_res.h b/modules/db_mysql/km_res.h index 4bded19..24f981b 100644 --- a/modules/db_mysql/km_res.h +++ b/modules/db_mysql/km_res.h @@ -31,11 +31,11 @@ */ -#ifndef RES_H -#define RES_H +#ifndef KM_RES_H +#define KM_RES_H -#include "../../db/db_res.h" -#include "../../db/db_con.h" +#include "../../lib/srdb1/db_res.h" +#include "../../lib/srdb1/db_con.h" /*! diff --git a/modules/db_mysql/km_row.c b/modules/db_mysql/km_row.c index b44068a..608cb8c 100644 --- a/modules/db_mysql/km_row.c +++ b/modules/db_mysql/km_row.c @@ -31,11 +31,11 @@ #include "../../dprint.h" #include "../../mem/mem.h" -#include "../../db/db_row.h" -#include "../../db/db_val.h" -#include "my_con.h" -#include "val.h" -#include "row.h" +#include "../../lib/srdb1/db_row.h" +#include "../../lib/srdb1/db_val.h" +#include "km_my_con.h" +#include "km_val.h" +#include "km_row.h" /*! * \brief Convert a row from result into DB API representation diff --git a/modules/db_mysql/km_row.h b/modules/db_mysql/km_row.h index 068f05e..9bdc7e9 100644 --- a/modules/db_mysql/km_row.h +++ b/modules/db_mysql/km_row.h @@ -31,12 +31,12 @@ */ -#ifndef ROW_H -#define ROW_H +#ifndef KM_ROW_H +#define KM_ROW_H -#include "../../db/db_con.h" -#include "../../db/db_res.h" -#include "../../db/db_row.h" +#include "../../lib/srdb1/db_con.h" +#include "../../lib/srdb1/db_res.h" +#include "../../lib/srdb1/db_row.h" /*! diff --git a/modules/db_mysql/km_val.c b/modules/db_mysql/km_val.c index 338e48f..d6167f0 100644 --- a/modules/db_mysql/km_val.c +++ b/modules/db_mysql/km_val.c @@ -28,9 +28,9 @@ */ #include "../../dprint.h" -#include "../../db/db_ut.h" -#include "val.h" -#include "my_con.h" +#include "../../lib/srdb1/db_ut.h" +#include "km_val.h" +#include "km_my_con.h" /*! diff --git a/modules/db_mysql/km_val.h b/modules/db_mysql/km_val.h index 1040ea4..449334b 100644 --- a/modules/db_mysql/km_val.h +++ b/modules/db_mysql/km_val.h @@ -29,12 +29,12 @@ */ -#ifndef VAL_H -#define VAL_H +#ifndef KM_VAL_H +#define KM_VAL_H #include <mysql/mysql.h> -#include "../../db/db_val.h" -#include "../../db/db.h" +#include "../../lib/srdb1/db_val.h" +#include "../../lib/srdb1/db.h" /*!

15 years, 10 months

git:janakj/mysql: Merge of kamaililo db_mysql module history into the sip-router tree.

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 0ba587f8e2d3d718f92ed111202657cdfa9a58ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ba587f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 21:54:06 2009 +0100 Merge of kamaililo db_mysql module history into the sip-router tree. This is a merge of the full history of the kamailio db_mysql module into the git tree of the sip-router project. The purpose of the merge is to preserve full history from kamailio svn also in the git repository. The module db_mysql already exists in the sip-router tree, it contains the sources merged from SER cvs (so called version 2 of the module). To avoid file conflicts we renamed all files that have been imported from kamailio svn and they are prefixed with km_. Further integration with existing db_mysql module will be commited on top of this merge. * my_filtered: (45 commits) - fixed auto_reconnect c&p error - add one DBG log to each drivers error condition, that the mem is freed - fix one DBG msg (still using module prefix), two small indention fixes - partial revert of commit rev5359 for db_mysql module - add group functionality to read content from specified sections - unify common rows and row allocation functionality in the DB API core - change behaviour of db_str2val, this now copy strings - move db_mysql and db_unixodbc str2val implementation to the DB core, - fix a few errors in doxygen documentation - add a comment about the NULL value behaviour of libmysql - docs extension: explain fetch_result functionality better to prevent errors - remove not reached return statement at the end of val2str functions - initial support for BIGINT database in DB core and SQL based database - evaluate DECIMAL (and NEW_DECIMAL) type a DB_STRING, and not DB_INT - fixed compile error - MYSQL_TYPE_NEWDECIMAL date type is supported - fix link entity names, patch from Carsten Gross - port from opensips r4526, credits goes to bogdan - regenerated all READMEs (make modules-readme exclude_modules="") - renaming: changed entities in documentation - renaming: openser -> kamailio ... ---

15 years, 10 months

git:janakj/mysql: - fixed auto_reconnect c&p error

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 74f98d3161ed96afff958d48009fb4d7c74b2760 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74f98d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Feb 10 20:59:58 2009 +0000 - fixed auto_reconnect c&p error git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5583 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_README | 5 +---- modules/db_mysql/km_doc/db_mysql.xml | 6 ------ modules/db_mysql/km_doc/db_mysql_admin.xml | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/db_mysql/km_README b/modules/db_mysql/km_README index eb7693c..4ea1b32 100644 --- a/modules/db_mysql/km_README +++ b/modules/db_mysql/km_README @@ -11,9 +11,6 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> Copyright � 2006 voice-system.ro - Revision History - Revision $Revision$ $Date: 2008-08-06 12:08:33 +0200 - (Mi, 06 Aug 2008) $ __________________________________________________________ Table of Contents @@ -107,7 +104,7 @@ modparam("db_mysql", "timeout_interval", 2) Example 1.3. Set auto_reconnect parameter ... -modparam("auto_reconnect", "auto_reconnect", 0) +modparam("db_mysql", "auto_reconnect", 0) ... 1.4. Exported Functions diff --git a/modules/db_mysql/km_doc/db_mysql.xml b/modules/db_mysql/km_doc/db_mysql.xml index 92c1623..0659c95 100644 --- a/modules/db_mysql/km_doc/db_mysql.xml +++ b/modules/db_mysql/km_doc/db_mysql.xml @@ -32,12 +32,6 @@ <year>2006</year> <holder>&voicesystem;</holder> </copyright> - <revhistory> - <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> - </revision> - </revhistory> </bookinfo> <toc></toc> diff --git a/modules/db_mysql/km_doc/db_mysql_admin.xml b/modules/db_mysql/km_doc/db_mysql_admin.xml index a484d02..649a638 100644 --- a/modules/db_mysql/km_doc/db_mysql_admin.xml +++ b/modules/db_mysql/km_doc/db_mysql_admin.xml @@ -106,7 +106,7 @@ modparam("db_mysql", "timeout_interval", 2) <title>Set <varname>auto_reconnect</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("auto_reconnect", "auto_reconnect", 0) +modparam("db_mysql", "auto_reconnect", 0) ... </programlisting> </example>

15 years, 10 months

git:janakj/mysql: - add one DBG log to each drivers error condition, that the mem is freed

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: d26ebfbb0c1a2c000fd57e2c9eec93e89a4a12cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d26ebfb… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 7 14:46:10 2009 +0000 - add one DBG log to each drivers error condition, that the mem is freed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5431 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_dbase.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index ecc3106..ed79a17 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -178,6 +178,7 @@ static int db_mysql_store_result(const db_con_t* _h, db_res_t** _r) if (db_mysql_convert_result(_h, *_r) < 0) { LM_ERR("error while converting result\n"); + LM_DBG("freeing result set at %p\n", _r); pkg_free(*_r); *_r = 0; /* all mem on openser API side is already freed by

15 years, 10 months

git:janakj/mysql: - fix one DBG msg (still using module prefix), two small indention fixes

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 50e2150dc42b128451889025f70fa81709388892 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50e2150… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 7 08:43:22 2009 +0000 - fix one DBG msg (still using module prefix), two small indention fixes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5425 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_db_mysql.c | 4 ++-- modules/db_mysql/km_dbase.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 1b1e778..d1e9e09 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -96,7 +96,7 @@ struct module_exports exports = { static int mysql_mod_init(void) { - LM_DBG("mysql: MySQL client version is %s\n", mysql_get_client_info()); + LM_DBG("MySQL client version is %s\n", mysql_get_client_info()); return 0; } @@ -115,7 +115,7 @@ int db_mysql_bind_api(db_func_t *dbb) dbb->raw_query = db_mysql_raw_query; dbb->free_result = db_mysql_free_result; dbb->insert = db_mysql_insert; - dbb->delete = db_mysql_delete; + dbb->delete = db_mysql_delete; dbb->update = db_mysql_update; dbb->replace = db_mysql_replace; dbb->last_inserted_id = db_last_inserted_id; diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index 506bb0d..68d47b3 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -104,7 +104,7 @@ int db_mysql_update(const db_con_t* _h, const db_key_t* _k, const db_op_t* _o, /*! \brief * Just like insert, but replace the row if it exists */ -int db_mysql_replace(const db_con_t* handle, const db_key_t* keys, const db_val_t* vals, const int n); +int db_mysql_replace(const db_con_t* handle, const db_key_t* keys, const db_val_t* vals, const int n); /*! \brief * Returns the last inserted ID

15 years, 10 months

git:janakj/mysql: - add group functionality to read content from specified sections

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 89215f17a700df083e99f16e58becb3d2ab28f0b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89215f1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 12:27:49 2009 +0000 - add group functionality to read content from specified sections of the mysql config to the db_mysql module, db_url examples: * mysql://user:pass@[group]host:port/db or * mysql://user:pass@[group]/db or * mysql://[group]/db - existing functionality is not changed, this is backward compatible - check usernames for NULL before comparing in DB API, otherwise it would segfault when only a group name is specified - patch from Andreas Granig, agranig at sipwise dot com, closes #1815631 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5413 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_README | 51 ++++++++++++++++++++++++++ modules/db_mysql/km_doc/db_mysql_admin.xml | 54 ++++++++++++++++++++++++++++ modules/db_mysql/km_my_con.c | 28 ++++++++++++-- 3 files changed, 129 insertions(+), 4 deletions(-) diff --git a/modules/db_mysql/km_README b/modules/db_mysql/km_README index 54951d1..eb7693c 100644 --- a/modules/db_mysql/km_README +++ b/modules/db_mysql/km_README @@ -34,12 +34,16 @@ Daniel-Constantin Mierla 1.4. Exported Functions 1.5. Installation + 1.6. Reading configuration from my.cnf List of Examples 1.1. Set ping_interval parameter 1.2. Set timeout_interval parameter 1.3. Set auto_reconnect parameter + 1.4. Set a my.cnf group in db_url parameter + 1.5. Adding a kamailio group to my.cnf + 1.6. Using [client] and specific group Chapter 1. Admin Guide @@ -121,3 +125,50 @@ modparam("auto_reconnect", "auto_reconnect", 0) * - from command line use: 'make all include_modules="db_mysql"; make install include_modules="db_mysql"'. + +1.6. Reading configuration from my.cnf + + In order to take into account specific mysql client options, a + my.cnf config group can be passed using the db_url module + parameter. This is done by setting [group] in front of or + instead of the host part. The following examples are valid + db_url definitions, which include a my.cnf group: + * mysql://user:pass@[group]host:port/db + * mysql://user:pass@[group]:port/db + * mysql://user:pass@[group]/db + * mysql://[group]/db + + Example 1.4. Set a my.cnf group in db_url parameter +... +modparam("usrloc", "db_url", "mysql://[kamailio]/kamailio) +... + + Example 1.5. Adding a kamailio group to my.cnf +... +[kamailio] +socket = /path/to/mysql.sock +user = kamailiouser +password = kamailiopass +default-character-set = utf8 +... + + In addition to the given group, also the [client] section is + read, in the order given in my.cnf. So if you for example + specify a socket in both your specific group and the client + group, then the value is taken from the last one. + + Example 1.6. Using [client] and specific group +... +[client] +socket = /var/run/mysql/mysqld.sock + +[kamailio] +socket = /path/to/mysqld.sock +user = kamailiouser +password = kamailiopass +default-character-set = utf8 +... + + In the example given above, the socket /path/to/mysqld.sock is + used by Kamailio because both [kamailio] and [client] define + this option, and the latter overwrites the first. diff --git a/modules/db_mysql/km_doc/db_mysql_admin.xml b/modules/db_mysql/km_doc/db_mysql_admin.xml index 31079e0..a484d02 100644 --- a/modules/db_mysql/km_doc/db_mysql_admin.xml +++ b/modules/db_mysql/km_doc/db_mysql_admin.xml @@ -140,5 +140,59 @@ modparam("auto_reconnect", "auto_reconnect", 0) </listitem> </itemizedlist> </section> + <section> + <title>Reading configuration from my.cnf</title> + <para> + In order to take into account specific mysql client options, a my.cnf config group can be passed using the <emphasis>db_url</emphasis> module parameter. This is done by setting <emphasis>[group]</emphasis> in front of or instead of the host part. The following examples are valid <emphasis>db_url</emphasis> definitions, which include a my.cnf group: + </para> + + <itemizedlist> + <listitem>mysql://user:pass@[group]host:port/db</listitem> + <listitem>mysql://user:pass@[group]:port/db</listitem> + <listitem>mysql://user:pass@[group]/db</listitem> + <listitem>mysql://[group]/db</listitem> + </itemizedlist> + <example> + <title>Set a my.cnf group in <varname>db_url</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "db_url", "mysql://[kamailio]/kamailio) +... +</programlisting> + </example> + <example> + <title>Adding a kamailio group to my.cnf</title> + <programlisting format="linespecific"> +... +[kamailio] +socket = /path/to/mysql.sock +user = kamailiouser +password = kamailiopass +default-character-set = utf8 +... +</programlisting> + </example> + <para> + In addition to the given group, also the <emphasis>[client]</emphasis> section is read, in the order given in my.cnf. So if you for example specify a <emphasis>socket</emphasis> in both your specific group and the client group, then the value is taken from the last one. + </para> + <example> + <title>Using [client] and specific group</title> + <programlisting format="linespecific"> +... +[client] +socket = /var/run/mysql/mysqld.sock + +[kamailio] +socket = /path/to/mysqld.sock +user = kamailiouser +password = kamailiopass +default-character-set = utf8 +... +</programlisting> + </example> + <para> + In the example given above, the socket <emphasis>/path/to/mysqld.sock</emphasis> is used by &kamailio; because both <emphasis>[kamailio]</emphasis> and <emphasis>[client]</emphasis> define this option, and the latter overwrites the first. + </para> + </section> </chapter> diff --git a/modules/db_mysql/km_my_con.c b/modules/db_mysql/km_my_con.c index 1a907b9..b5ec56a 100644 --- a/modules/db_mysql/km_my_con.c +++ b/modules/db_mysql/km_my_con.c @@ -43,6 +43,7 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) { struct my_con* ptr; + char *host, *grp; if (!id) { LM_ERR("invalid parameter value\n"); @@ -66,11 +67,30 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_init(ptr->con); + if (id->host[0] == '[' && (host = strchr(id->host, ']')) != NULL) { + grp = id->host + 1; + *host = '\0'; + if (host != id->host + strlen(id->host)-1) { + host += 1; // host found after closing bracket + } + else { + // let mysql read host info from my.cnf + // (defaults to "localhost") + host = NULL; + } + // read [client] and [<grp>] sections in the order + // given in my.cnf + mysql_options(ptr->con, MYSQL_READ_DEFAULT_GROUP, grp); + } + else { + host = id->host; + } + if (id->port) { - LM_DBG("opening connection: mysql://xxxx:xxxx@%s:%d/%s\n", ZSW(id->host), + LM_DBG("opening connection: mysql://xxxx:xxxx@%s:%d/%s\n", ZSW(host), id->port, ZSW(id->database)); } else { - LM_DBG("opening connection: mysql://xxxx:xxxx@%s/%s\n", ZSW(id->host), + LM_DBG("opening connection: mysql://xxxx:xxxx@%s/%s\n", ZSW(host), ZSW(id->database)); } @@ -80,10 +100,10 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const char *)&db_mysql_timeout_interval); #if (MYSQL_VERSION_ID >= 40100) - if (!mysql_real_connect(ptr->con, id->host, id->username, id->password, + if (!mysql_real_connect(ptr->con, host, id->username, id->password, id->database, id->port, 0, CLIENT_MULTI_STATEMENTS)) { #else - if (!mysql_real_connect(ptr->con, id->host, id->username, id->password, + if (!mysql_real_connect(ptr->con, host, id->username, id->password, id->database, id->port, 0, 0)) { #endif LM_ERR("driver error: %s\n", mysql_error(ptr->con));

15 years, 10 months

← Newer
1
...
20
21
22
23
24
25
26
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009