sr-dev

sr-dev@lists.kamailio.org

17 participants
44133 discussions

git:janakj/mysql: Export db_bind_api through the module interface.

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: d4a0c89c75e8729d8185c93bb994f85cf0999646 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4a0c89… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 10:49:06 2009 +0100 Export db_bind_api through the module interface. --- modules/db_mysql/km_db_mysql.c | 3 --- modules/db_mysql/km_db_mysql.h | 4 ++++ modules/db_mysql/mysql_mod.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index efa5d88..eb17726 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -42,7 +42,6 @@ */ #include "../../sr_module.h" -#include "../../lib/srdb1/db.h" #include "km_dbase.h" #include "km_db_mysql.h" @@ -56,8 +55,6 @@ static int mysql_mod_init(void); /* MODULE_VERSION */ -int db_mysql_bind_api(db_func_t *dbb); - /*! \brief * MySQL database module interface */ diff --git a/modules/db_mysql/km_db_mysql.h b/modules/db_mysql/km_db_mysql.h index 8512fc2..fa6b698 100644 --- a/modules/db_mysql/km_db_mysql.h +++ b/modules/db_mysql/km_db_mysql.h @@ -38,8 +38,12 @@ #ifndef KM_DB_MOD_H #define KM_DB_MOD_H +#include "../../lib/srdb1/db.h" + extern unsigned int db_mysql_ping_interval; extern unsigned int db_mysql_timeout_interval; extern unsigned int db_mysql_auto_reconnect; +int db_mysql_bind_api(db_func_t *dbb); + #endif /* KM_DB_MOD_H */ diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index 469bfb6..bc9f3bb 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -32,12 +32,12 @@ * 2003-03-11 updated to the new module exports interface (andrei) * 2003-03-16 flags export parameter added (janakj) */ - /** @addtogroup mysql * @{ */ #include "mysql_mod.h" +#include "km_db_mysql.h" #include "my_uri.h" #include "my_con.h" @@ -83,6 +83,7 @@ static cmd_export_t cmds[] = { {"db_next", (cmd_function)my_cmd_next, 0, 0, 0}, {"db_setopt", (cmd_function)my_setopt, 0, 0, 0}, {"db_getopt", (cmd_function)my_getopt, 0, 0, 0}, + {"db_bind_api", (cmd_function)db_mysql_bind_api, 0, 0, 0}, {0, 0, 0, 0, 0} };

15 years, 10 months

git:janakj/mysql: Export kamailio/ db_mysql parameters through the module api.

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 1a058e14e1ae0b316c05999d088db2d0fdec03b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a058e1… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 11:04:29 2009 +0100 Export kamailio/db_mysql parameters through the module api. All parameters original exported by kamailio/db_mysql are now exported thought the api of the merged module in sip-router/modules/db_mysql. The parameter ping_interval is already present in the sources coming from ser, so we removed the original parameter from kamailio and used the one coming from ser. --- modules/db_mysql/km_db_mysql.c | 3 +-- modules/db_mysql/km_db_mysql.h | 1 - modules/db_mysql/km_dbase.c | 5 +++-- modules/db_mysql/mysql_mod.c | 3 +++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index eb17726..5c564b1 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -47,7 +47,6 @@ #include <mysql/mysql.h> -unsigned int db_mysql_ping_interval = 5 * 60; /* Default is 5 minutes */ unsigned int db_mysql_timeout_interval = 2; /* Default is 6 seconds */ unsigned int db_mysql_auto_reconnect = 1; /* Default is enabled */ @@ -67,7 +66,7 @@ static kam_cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"ping_interval", INT_PARAM, &db_mysql_ping_interval}, +/* {"ping_interval", INT_PARAM, &db_mysql_ping_interval}, */ {"timeout_interval", INT_PARAM, &db_mysql_timeout_interval}, {"auto_reconnect", INT_PARAM, &db_mysql_auto_reconnect}, {0, 0, 0} diff --git a/modules/db_mysql/km_db_mysql.h b/modules/db_mysql/km_db_mysql.h index fa6b698..b0b475e 100644 --- a/modules/db_mysql/km_db_mysql.h +++ b/modules/db_mysql/km_db_mysql.h @@ -40,7 +40,6 @@ #include "../../lib/srdb1/db.h" -extern unsigned int db_mysql_ping_interval; extern unsigned int db_mysql_timeout_interval; extern unsigned int db_mysql_auto_reconnect; diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 6294a02..49ab55a 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -42,6 +42,7 @@ #include "../../dprint.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" +#include "mysql_mod.h" #include "km_val.h" #include "km_my_con.h" #include "km_res.h" @@ -75,9 +76,9 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) return -1; } - if (db_mysql_ping_interval) { + if (my_ping_interval) { t = time(0); - if ((t - CON_TIMESTAMP(_h)) > db_mysql_ping_interval) { + if ((t - CON_TIMESTAMP(_h)) > my_ping_interval) { if (mysql_ping(CON_CONNECTION(_h))) { LM_WARN("driver error on ping: %s\n", mysql_error(CON_CONNECTION(_h))); } diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index bc9f3bb..61c2683 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -97,6 +97,9 @@ static param_export_t params[] = { {"send_timeout", PARAM_INT, &my_send_to}, {"receive_timeout", PARAM_INT, &my_recv_to}, {"retries", PARAM_INT, &my_retries}, + + {"timeout_interval", INT_PARAM, &db_mysql_timeout_interval}, + {"auto_reconnect", INT_PARAM, &db_mysql_auto_reconnect}, {0, 0, 0} };

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_* 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: 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: 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: 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: - remove not reached return statement at the end of val2str functions

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 2c9855261a73e26b008c805035772ccc30d0e495 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c98552… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 19 11:56:49 2008 +0000 - remove not reached return statement at the end of val2str functions git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4965 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_val.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_val.c b/modules/db_mysql/km_val.c index 991b05d..8cb485f 100644 --- a/modules/db_mysql/km_val.c +++ b/modules/db_mysql/km_val.c @@ -262,5 +262,4 @@ int db_mysql_val2str(const db_con_t* _c, const db_val_t* _v, char* _s, int* _len LM_DBG("unknown data type\n"); return -10; } - /*return -8; --not reached*/ }

15 years, 10 months

git:janakj/mysql: - docs extension: explain fetch_result functionality better to prevent errors

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 205f28ce7929d6a43e4c649b9db25bcd70b9d19b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=205f28c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 17 08:01:23 2008 +0000 - docs extension: explain fetch_result functionality better to prevent errors because of wrong usage, found from Juha Heinanen git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5088 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_dbase.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 726a881..ecc3106 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -251,7 +251,15 @@ int db_mysql_query(const db_con_t* _h, const db_key_t* _k, const db_op_t* _op, } /** - * Gets a partial result set. + * \brief Gets a partial result set, fetch rows from a result + * + * Gets a partial result set, fetch a number of rows from a database result. + * This function initialize the given result structure on the first run, and + * fetches the nrows number of rows. On subsequenting runs, it uses the + * existing result and fetches more rows, until it reaches the end of the + * result set. Because of this the result needs to be null in the first + * invocation of the function. If the number of wanted rows is zero, the + * function returns anything with a result of zero. * \param _h structure representing the database connection * \param _r pointer to a structure representing the result * \param nrows number of fetched rows

15 years, 10 months

git:janakj/mysql: - add a comment about the NULL value behaviour of libmysql

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: c56b4491a617caa82be13a8ed95949f04b7980f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c56b449… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 13 16:14:34 2008 +0000 - add a comment about the NULL value behaviour of libmysql - add some doxygen documentation git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5197 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_val.c | 26 ++++++++++++++++++++------ modules/db_mysql/km_val.h | 26 ++++++++++++++++++++------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/modules/db_mysql/km_val.c b/modules/db_mysql/km_val.c index 8cb485f..3af1e65 100644 --- a/modules/db_mysql/km_val.c +++ b/modules/db_mysql/km_val.c @@ -22,7 +22,7 @@ */ /*! \file - * \brief DB_MYSQL :: Data conversion + * \brief DB_MYSQL :: Data conversions * \ingroup db_mysql * Module: \ref db_mysql */ @@ -36,8 +36,15 @@ #include <stdio.h> -/*! \brief - * Convert str to db value, does not copy strings +/*! + * \brief Convert a str to a db value, does not copy strings + * + * Convert a str to a db value, does not copy strings. + * \param _t destination value type + * \param _v destination value + * \param _s source string + * \param _l string length + * \return 0 on success, negative on error */ int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l) { @@ -47,7 +54,7 @@ int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int LM_ERR("invalid parameter value\n"); return -1; } - + /* A NULL string is a NULL value in mysql, otherwise its an empty value */ if (!_s) { memset(_v, 0, sizeof(db_val_t)); /* Initialize the string pointers to a dummy empty @@ -143,8 +150,15 @@ int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int } -/*! \brief - * Used when converting result from a query +/*! + * \brief Converting a value to a string + * + * Converting a value to a string, used when converting result from a query + * \param _c database connection + * \param _v source value + * \param _s target string + * \param _len target string length + * \return 0 on success, negative on error */ int db_mysql_val2str(const db_con_t* _c, const db_val_t* _v, char* _s, int* _len) { diff --git a/modules/db_mysql/km_val.h b/modules/db_mysql/km_val.h index 4f034cc..f9cb609 100644 --- a/modules/db_mysql/km_val.h +++ b/modules/db_mysql/km_val.h @@ -22,7 +22,7 @@ */ /*! \file - * \brief DB_MYSQL :: Conversions + * \brief DB_MYSQL :: Data conversions * \ref val.c * \ingroup db_mysql * Module: \ref db_mysql @@ -37,15 +37,29 @@ #include "../../db/db.h" -/** - * Does not copy strings +/*! + * \brief Convert a str to a db value, does not copy strings + * + * Convert a str to a db value, does not copy strings. + * \param _t destination value type + * \param _v destination value + * \param _s source string + * \param _l string length + * \return 0 on success, negative on error */ int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l); -/** - * Used when converting result from a query +/*! + * \brief Converting a value to a string + * + * Converting a value to a string, used when converting result from a query + * \param _c database connection + * \param _v source value + * \param _s target string + * \param _len target string length + * \return 0 on success, negative on error */ int db_mysql_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* _len); -#endif /* VAL_H */ +#endif

15 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev