sr-dev

sr-dev@lists.kamailio.org

17 participants
44134 discussions

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: - some synchronisations with db_postgres driver

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: bcdd7e786876b4cce49fb0fdea56ec696caa77cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcdd7e7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 8 16:12:31 2008 +0000 - some synchronisations with db_postgres driver - move LAST_ROW incrementation to the end of the function, to only update after a successfull fetch - add two debug messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4138 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_dbase.c | 7 ++++++- modules/db_mysql/km_res.c | 1 + 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 1da7953..e4f78ba 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -323,9 +323,11 @@ int db_mysql_fetch_result(const db_con_t* _h, db_res_t** _r, const int nrows) if(nrows < rows) rows = nrows; - RES_LAST_ROW(*_r) += rows; RES_ROW_N(*_r) = rows; + LM_DBG("converting row %d of %d count %d\n", RES_LAST_ROW(*_r), + RES_NUM_ROWS(*_r), RES_ROW_N(*_r)); + RES_ROWS(*_r) = (struct db_row*)pkg_malloc(sizeof(db_row_t) * rows); if (!RES_ROWS(*_r)) { LM_ERR("no memory left\n"); @@ -347,6 +349,9 @@ int db_mysql_fetch_result(const db_con_t* _h, db_res_t** _r, const int nrows) return -7; } } + + /* update the total number of rows processed */ + RES_LAST_ROW(*_r) += rows; return 0; } diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 91a8211..740b254 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -144,6 +144,7 @@ static inline int db_mysql_convert_rows(const db_con_t* _h, db_res_t* _r) RES_ROW_N(_r) = mysql_num_rows(CON_RESULT(_h)); if (!RES_ROW_N(_r)) { + LM_DBG("no rows returned from the query\n"); RES_ROWS(_r) = 0; return 0; }

15 years, 10 months

git:janakj/mysql: - add a few missing '\n' to log messages

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 03018e87b81f8bc668f5205f8779fd01f837d004 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03018e8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri May 9 15:50:17 2008 +0000 - add a few missing '\n' to log messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4149 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_res.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 740b254..7c9812b 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -56,7 +56,7 @@ int db_mysql_get_columns(const db_con_t* _h, db_res_t* _r) } if (db_allocate_columns(_r, RES_COL_N(_r)) != 0) { - LM_ERR("could not allocate columns"); + LM_ERR("could not allocate columns\n"); return -3; } @@ -87,34 +87,34 @@ int db_mysql_get_columns(const db_con_t* _h, db_res_t* _r) case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_NEWDECIMAL: case MYSQL_TYPE_TIMESTAMP: - LM_DBG("use DB_INT result type"); + LM_DBG("use DB_INT result type\n"); RES_TYPES(_r)[col] = DB_INT; break; case MYSQL_TYPE_FLOAT: case MYSQL_TYPE_DOUBLE: - LM_DBG("use DB_DOUBLE result type"); + LM_DBG("use DB_DOUBLE result type\n"); RES_TYPES(_r)[col] = DB_DOUBLE; break; case MYSQL_TYPE_DATETIME: - LM_DBG("use DB_DATETIME result type"); + LM_DBG("use DB_DATETIME result type\n"); RES_TYPES(_r)[col] = DB_DATETIME; break; case MYSQL_TYPE_BLOB: - LM_DBG("use DB_BLOB result type"); + LM_DBG("use DB_BLOB result type\n"); RES_TYPES(_r)[col] = DB_BLOB; break; case FIELD_TYPE_SET: - LM_DBG("use DB_BITMAP result type"); + LM_DBG("use DB_BITMAP result type\n"); RES_TYPES(_r)[col] = DB_BITMAP; break; case MYSQL_TYPE_STRING: case MYSQL_TYPE_VAR_STRING: - LM_DBG("use DB_STRING result type"); + LM_DBG("use DB_STRING result type\n"); RES_TYPES(_r)[col] = DB_STRING; break;

15 years, 10 months

git:janakj/mysql: - fix database related doxygen errors

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: a37c75afb9470772e0e44184004b73c42aa81ac6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a37c75a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 17 13:06:28 2008 +0000 - fix database related doxygen errors git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4398 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_dbase.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index e4f78ba..410648a 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -24,7 +24,7 @@ */ /** - * \class mysql/dbase.c + * \file * \brief Implementation of core functions for the MySQL driver. * * This file contains the implementation of core functions for the MySQL @@ -237,6 +237,7 @@ int db_mysql_free_result(db_con_t* _h, db_res_t* _r) * \param _n number of key=values pairs to compare * \param _nc number of columns to return * \param _o order by the specified column + * \param _r pointer to a structure representing the result * \return zero on success, negative value on failure */ int db_mysql_query(const db_con_t* _h, const db_key_t* _k, const db_op_t* _op,

15 years, 10 months

git:janakj/mysql: - add a few more missing '\n' to debug messages

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 24d1af2ac2835c3574ce733e7cdc1509bd3f7ae0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24d1af2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 13 12:00:36 2008 +0000 - add a few more missing '\n' to debug messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4163 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_res.c | 2 +- modules/db_mysql/km_row.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 7c9812b..b3e3b80 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -155,7 +155,7 @@ static inline int db_mysql_convert_rows(const db_con_t* _h, db_res_t* _r) LM_ERR("no private memory left\n"); return -2; } - LM_DBG("allocate %d bytes for rows at %p", len, RES_ROWS(_r)); + LM_DBG("allocate %d bytes for rows at %p\n", len, RES_ROWS(_r)); memset(RES_ROWS(_r), 0, len); for(row = 0; row < RES_ROW_N(_r); row++) { diff --git a/modules/db_mysql/km_row.c b/modules/db_mysql/km_row.c index c29d499..b79edb4 100644 --- a/modules/db_mysql/km_row.c +++ b/modules/db_mysql/km_row.c @@ -52,7 +52,7 @@ int db_mysql_convert_row(const db_con_t* _h, db_res_t* _res, db_row_t* _r) LM_ERR("no private memory left\n"); return -1; } - LM_DBG("allocate %d bytes for row values at %p", len, + LM_DBG("allocate %d bytes for row values at %p\n", len, ROW_VALUES(_r)); memset(ROW_VALUES(_r), 0, len); @@ -65,7 +65,7 @@ int db_mysql_convert_row(const db_con_t* _h, db_res_t* _res, db_row_t* _r) if (db_mysql_str2val(RES_TYPES(_res)[i], &(ROW_VALUES(_r)[i]), ((MYSQL_ROW)CON_ROW(_h))[i], lengths[i]) < 0) { LM_ERR("failed to convert value\n"); - LM_DBG("free row at %pn", _r); + LM_DBG("free row at %p\n", _r); db_free_row(_r); return -3; }

15 years, 10 months

git:janakj/mysql: - small doxygen updates (group, syntax), small docs update

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 083502f8c0d1e16c54f44b266c728fa8c84a9fa9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=083502f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jul 24 15:20:11 2008 +0000 - small doxygen updates (group, syntax), small docs update - patch provided from Olle E. Johansson, closes #2025079 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4505 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_README | 34 ++++++++++++++-------------- modules/db_mysql/km_db_mysql.c | 16 +++++++++++- modules/db_mysql/km_db_mysql.h | 7 +++++ modules/db_mysql/km_dbase.c | 4 ++- modules/db_mysql/km_dbase.h | 33 ++++++++++++++++---------- modules/db_mysql/km_doc/db_mysql_admin.xml | 14 +++++----- modules/db_mysql/km_my_con.c | 11 +++++++- modules/db_mysql/km_my_con.h | 26 ++++++++++++++------- modules/db_mysql/km_res.c | 13 ++++++++-- modules/db_mysql/km_res.h | 8 ++++++ modules/db_mysql/km_row.c | 8 +++++- modules/db_mysql/km_row.h | 8 ++++++ modules/db_mysql/km_val.c | 9 +++++- modules/db_mysql/km_val.h | 8 ++++++ 14 files changed, 141 insertions(+), 58 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=083…

15 years, 10 months

git:janakj/mysql: - change name in copyright headers

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 31f52f1d700db9eecdcac45f6ca4d89d7dbd4508 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31f52f1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jul 28 15:39:28 2008 +0000 - change name in copyright headers git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4518 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_db_mysql.c | 6 +++--- modules/db_mysql/km_db_mysql.h | 6 +++--- modules/db_mysql/km_dbase.c | 6 +++--- modules/db_mysql/km_dbase.h | 6 +++--- modules/db_mysql/km_my_con.c | 6 +++--- modules/db_mysql/km_my_con.h | 6 +++--- modules/db_mysql/km_res.c | 6 +++--- modules/db_mysql/km_res.h | 6 +++--- modules/db_mysql/km_row.c | 6 +++--- modules/db_mysql/km_row.h | 6 +++--- modules/db_mysql/km_val.c | 6 +++--- modules/db_mysql/km_val.h | 6 +++--- 12 files changed, 36 insertions(+), 36 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=31f…

15 years, 10 months

git:janakj/mysql: - fix some FAQ entries, change missing entity, regenerate READMEs

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: d85d5a2351fca762da65afb66c617ee6e7ed2f75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d85d5a2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 30 09:20:54 2008 +0000 - fix some FAQ entries, change missing entity, regenerate READMEs git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4524 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_README | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/db_mysql/km_README b/modules/db_mysql/km_README index 511aea6..5172a5c 100644 --- a/modules/db_mysql/km_README +++ b/modules/db_mysql/km_README @@ -23,7 +23,7 @@ Daniel-Constantin Mierla 1.1. Overview 1.2. Dependencies - 1.2.1. OpenSER Modules + 1.2.1. Kamailio Modules 1.2.2. External Libraries or Applications 1.3. Exported Parameters @@ -50,15 +50,15 @@ Chapter 1. Admin Guide 1.2. Dependencies -1.2.1. OpenSER Modules +1.2.1. Kamailio Modules The following modules must be loaded before this module: - * No dependencies on other OpenSER modules. + * No dependencies on other Kamailio modules. 1.2.2. External Libraries or Applications The following libraries or applications must be installed - before running OpenSER with this module loaded: + before running Kamailio with this module loaded: * mysql - the development libraries forthe Mysql database. In some Linux distributions named "libmysqlclient-dev". @@ -117,7 +117,7 @@ modparam("auto_reconnect", "auto_reconnect", 0) options. * - edit the "Makefile" and remove "db_mysql" from "excluded_modules" list. Then follow the standard procedure - to install OpenSER: "make all; make install". + to install Kamailio: "make all; make install". * - from command line use: 'make all include_modules="db_mysql"; make install include_modules="db_mysql"'.

15 years, 10 months

git:janakj/mysql: - renaming: openser -> kamailio

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 2b8cb3bf2cf0852b5bbe50cf868e0fb20026142e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b8cb3b… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Committer: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 08:20:30 2008 +0000 - renaming: openser -> kamailio git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4585 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_README | 4 ++-- modules/db_mysql/km_db_mysql.c | 4 ++-- modules/db_mysql/km_doc/db_mysql_admin.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/db_mysql/km_README b/modules/db_mysql/km_README index 5172a5c..a90e8f9 100644 --- a/modules/db_mysql/km_README +++ b/modules/db_mysql/km_README @@ -45,8 +45,8 @@ Chapter 1. Admin Guide 1.1. Overview - This is a module which provides MySQL connectivity for OpenSER. - It implements the DB API defined in OpenSER. + This is a module which provides MySQL connectivity for Kamailio. + It implements the DB API defined in Kamailio. 1.2. Dependencies diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 85ec24d..1b1e778 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -35,8 +35,8 @@ * Module: \ref db_mysql */ -/*! \defgroup db_mysql DB_MYSQL :: the MySQL driver for OpenSER - * \brief The OpenSER database interface to the MySQL database +/*! \defgroup db_mysql DB_MYSQL :: the MySQL driver for Kamailio + * \brief The Kamailio database interface to the MySQL database * - http://www.mysql.org * */ diff --git a/modules/db_mysql/km_doc/db_mysql_admin.xml b/modules/db_mysql/km_doc/db_mysql_admin.xml index 7478c78..b42bd59 100644 --- a/modules/db_mysql/km_doc/db_mysql_admin.xml +++ b/modules/db_mysql/km_doc/db_mysql_admin.xml @@ -7,8 +7,8 @@ <section> <title>Overview</title> <para> - This is a module which provides MySQL connectivity for OpenSER. - It implements the DB API defined in OpenSER. + This is a module which provides MySQL connectivity for Kamailio. + It implements the DB API defined in Kamailio. </para> </section>

15 years, 10 months

git:janakj/mysql: - renaming: changed entities in documentation

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: fce73b2680d7ff67b5f59636bface85845b82fc7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fce73b2… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Committer: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 10:08:33 2008 +0000 - renaming: changed entities in documentation git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4594 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_doc/db_mysql.xml | 2 +- modules/db_mysql/km_doc/db_mysql_admin.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/db_mysql/km_doc/db_mysql.xml b/modules/db_mysql/km_doc/db_mysql.xml index e6b3cd1..92c1623 100644 --- a/modules/db_mysql/km_doc/db_mysql.xml +++ b/modules/db_mysql/km_doc/db_mysql.xml @@ -15,7 +15,7 @@ <book> <bookinfo> <title>mysql Module</title> - <productname class="trade">&opensername;</productname> + <productname class="trade">&kamailioname;</productname> <authorgroup> <author> <firstname>Daniel-Constantin</firstname> diff --git a/modules/db_mysql/km_doc/db_mysql_admin.xml b/modules/db_mysql/km_doc/db_mysql_admin.xml index b42bd59..31079e0 100644 --- a/modules/db_mysql/km_doc/db_mysql_admin.xml +++ b/modules/db_mysql/km_doc/db_mysql_admin.xml @@ -15,13 +15,13 @@ <section> <title>Dependencies</title> <section> - <title>&openser; Modules</title> + <title>&kamailio; Modules</title> <para> The following modules must be loaded before this module: <itemizedlist> <listitem> <para> - <emphasis>No dependencies on other &openser; modules</emphasis>. + <emphasis>No dependencies on other &kamailio; modules</emphasis>. </para> </listitem> </itemizedlist> @@ -31,7 +31,7 @@ <title>External Libraries or Applications</title> <para> The following libraries or applications must be installed before running - &openser; with this module loaded: + &kamailio; with this module loaded: <itemizedlist> <listitem> <para> @@ -128,7 +128,7 @@ modparam("auto_reconnect", "auto_reconnect", 0) <listitem> <para> - edit the "Makefile" and remove "db_mysql" from "excluded_modules" - list. Then follow the standard procedure to install &openser;: + list. Then follow the standard procedure to install &kamailio;: "make all; make install". </para> </listitem>

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