sr-dev

sr-dev@lists.kamailio.org

13 participants
43416 discussions

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, 7 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, 7 months

git:janakj/mysql: - port from opensips r4526, credits goes to bogdan

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 5ec58d244b742871503b4a9618b41e99d991cec4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ec58d2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 6 15:32:44 2008 +0000 - port from opensips r4526, credits goes to bogdan - 64bits compile warnings fixed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4618 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_res.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 7540a09..e572621 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -75,8 +75,8 @@ int db_mysql_get_columns(const db_con_t* _h, db_res_t* _r) db_free_columns(_r); return -4; } - LM_DBG("allocate %d bytes for RES_NAMES[%d] at %p\n", sizeof(str), col, - RES_NAMES(_r)[col]); + LM_DBG("allocate %lu bytes for RES_NAMES[%d] at %p\n", + (unsigned long)sizeof(str), col, RES_NAMES(_r)[col]); /* The pointer that is here returned is part of the result structure. */ RES_NAMES(_r)[col]->s = fields[col].name;

15 years, 7 months

git:janakj/mysql: - fix link entity names, patch from Carsten Gross

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 4b96eb712fb0de53ec0b04b97910b8ddfe61400a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b96eb7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Aug 7 09:15:08 2008 +0000 - fix link entity names, patch from Carsten Gross - regenerate READMEs git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4630 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_README | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/modules/db_mysql/km_README b/modules/db_mysql/km_README index 299309b..54951d1 100644 --- a/modules/db_mysql/km_README +++ b/modules/db_mysql/km_README @@ -1,4 +1,3 @@ - mysql Module Daniel-Constantin Mierla @@ -14,8 +13,8 @@ Daniel-Constantin Mierla Copyright � 2006 voice-system.ro Revision History Revision $Revision$ $Date: 2008-08-06 12:08:33 +0200 - (Wed, 06 Aug 2008) $ - _________________________________________________________ + (Mi, 06 Aug 2008) $ + __________________________________________________________ Table of Contents @@ -60,8 +59,8 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * mysql - the development libraries forthe Mysql database. - In some Linux distributions named "libmysqlclient-dev". + * mysql - the development libraries forthe Mysql database. In + some Linux distributions named "libmysqlclient-dev". 1.3. Exported Parameters @@ -70,7 +69,7 @@ Chapter 1. Admin Guide Time interval in seconds to send ping messages to MySQL server in order to keep the connection open. - Default value is 300 (5 min). + Default value is 300 (5 min). Example 1.1. Set ping_interval parameter ... @@ -80,16 +79,15 @@ modparam("db_mysql", "ping_interval", 600) 1.3.2. timeout_interval (integer) Time interval (in seconds) after that an connection attempt, - read or write request is aborted. The value counts three - times, as several retries are done from the driver before it - gives up. + read or write request is aborted. The value counts three times, + as several retries are done from the driver before it gives up. The read timeout parameter is ignored on MySQL driver versions prior to "5.1.12", "5.0.25" and "4.1.22". The write timeout parameter is ignored on versions prior to "5.1.12" and "5.0.25", the "4.1" release don't support it at all. - Default value is 2 (6 sec). + Default value is 2 (6 sec). Example 1.2. Set timeout_interval parameter ... @@ -101,7 +99,7 @@ modparam("db_mysql", "timeout_interval", 2) Configure whether the module should automatically reconnect to MySQL server if the connection was lost. - Default value is 1 (1 - on / 0 - off). + Default value is 1 (1 - on / 0 - off). Example 1.3. Set auto_reconnect parameter ... @@ -114,12 +112,12 @@ modparam("auto_reconnect", "auto_reconnect", 0) 1.5. Installation - Because it dependes on an external library, the mysql module - is not compiled and installed by default. You can use one of - these options. + Because it dependes on an external library, the mysql module is + not compiled and installed by default. You can use one of these + options. * - edit the "Makefile" and remove "db_mysql" from - "excluded_modules" list. Then follow the standard - procedure to install Kamailio: "make all; make install". + "excluded_modules" list. Then follow the standard procedure + 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, 7 months

git:janakj/mysql: - regenerated all READMEs ( make modules-readme exclude_modules="")

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 409249d61e6fa1a0e478fdfc5dd1ac3dcad957c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=409249d… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Committer: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 10:49:19 2008 +0000 - regenerated all READMEs (make modules-readme exclude_modules="") git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4596 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_README | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/modules/db_mysql/km_README b/modules/db_mysql/km_README index a90e8f9..299309b 100644 --- a/modules/db_mysql/km_README +++ b/modules/db_mysql/km_README @@ -1,3 +1,4 @@ + mysql Module Daniel-Constantin Mierla @@ -12,9 +13,9 @@ Daniel-Constantin Mierla Copyright � 2006 voice-system.ro Revision History - Revision $Revision$ $Date: 2008-03-19 20:31:30 +0100 - (Mi, 19 Mär 2008) $ - __________________________________________________________ + Revision $Revision$ $Date: 2008-08-06 12:08:33 +0200 + (Wed, 06 Aug 2008) $ + _________________________________________________________ Table of Contents @@ -45,8 +46,8 @@ Chapter 1. Admin Guide 1.1. Overview - This is a module which provides MySQL connectivity for Kamailio. - It implements the DB API defined in Kamailio. + This is a module which provides MySQL connectivity for + Kamailio. It implements the DB API defined in Kamailio. 1.2. Dependencies @@ -59,8 +60,8 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * mysql - the development libraries forthe Mysql database. In - some Linux distributions named "libmysqlclient-dev". + * mysql - the development libraries forthe Mysql database. + In some Linux distributions named "libmysqlclient-dev". 1.3. Exported Parameters @@ -69,7 +70,7 @@ Chapter 1. Admin Guide Time interval in seconds to send ping messages to MySQL server in order to keep the connection open. - Default value is 300 (5 min). + Default value is 300 (5 min). Example 1.1. Set ping_interval parameter ... @@ -79,15 +80,16 @@ modparam("db_mysql", "ping_interval", 600) 1.3.2. timeout_interval (integer) Time interval (in seconds) after that an connection attempt, - read or write request is aborted. The value counts three times, - as several retries are done from the driver before it gives up. + read or write request is aborted. The value counts three + times, as several retries are done from the driver before it + gives up. The read timeout parameter is ignored on MySQL driver versions prior to "5.1.12", "5.0.25" and "4.1.22". The write timeout parameter is ignored on versions prior to "5.1.12" and "5.0.25", the "4.1" release don't support it at all. - Default value is 2 (6 sec). + Default value is 2 (6 sec). Example 1.2. Set timeout_interval parameter ... @@ -99,7 +101,7 @@ modparam("db_mysql", "timeout_interval", 2) Configure whether the module should automatically reconnect to MySQL server if the connection was lost. - Default value is 1 (1 - on / 0 - off). + Default value is 1 (1 - on / 0 - off). Example 1.3. Set auto_reconnect parameter ... @@ -112,12 +114,12 @@ modparam("auto_reconnect", "auto_reconnect", 0) 1.5. Installation - Because it dependes on an external library, the mysql module is - not compiled and installed by default. You can use one of these - options. + Because it dependes on an external library, the mysql module + is not compiled and installed by default. You can use one of + these options. * - edit the "Makefile" and remove "db_mysql" from - "excluded_modules" list. Then follow the standard procedure - to install Kamailio: "make all; make install". + "excluded_modules" list. Then follow the standard + procedure 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, 7 months

git:janakj/mysql: - fixed compile error - MYSQL_TYPE_NEWDECIMAL date type is supported

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: b863b51e8893c3ec47ceeb795cca3e16103084be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b863b51… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Sep 2 08:48:31 2008 +0000 - fixed compile error - MYSQL_TYPE_NEWDECIMAL date type is supported only starting with mysql 5.0, Reported by Andrew Pogrebennyk. related to opensips bug 2085158, credits to Bogdan git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4801 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_res.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index e572621..44e4f48 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -92,7 +92,9 @@ int db_mysql_get_columns(const db_con_t* _h, db_res_t* _r) case MYSQL_TYPE_INT24: case MYSQL_TYPE_LONGLONG: case MYSQL_TYPE_DECIMAL: + #if MYSQL_VERSION_ID > 49999 case MYSQL_TYPE_NEWDECIMAL: + #endif case MYSQL_TYPE_TIMESTAMP: LM_DBG("use DB_INT result type\n"); RES_TYPES(_r)[col] = DB_INT;

15 years, 7 months

git:janakj/mysql: - evaluate DECIMAL (and NEW_DECIMAL) type a DB_STRING, and not DB_INT

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: b74e6f6521af86e9fb68e8561c69fcfcd411d7c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b74e6f6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 15 10:26:35 2008 +0000 - evaluate DECIMAL (and NEW_DECIMAL) type a DB_STRING, and not DB_INT - patch from Alex Hermann, related to #2111861 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4901 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_res.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 44e4f48..4a649e3 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -91,10 +91,6 @@ int db_mysql_get_columns(const db_con_t* _h, db_res_t* _r) case MYSQL_TYPE_LONG: case MYSQL_TYPE_INT24: case MYSQL_TYPE_LONGLONG: - case MYSQL_TYPE_DECIMAL: - #if MYSQL_VERSION_ID > 49999 - case MYSQL_TYPE_NEWDECIMAL: - #endif case MYSQL_TYPE_TIMESTAMP: LM_DBG("use DB_INT result type\n"); RES_TYPES(_r)[col] = DB_INT; @@ -121,6 +117,10 @@ int db_mysql_get_columns(const db_con_t* _h, db_res_t* _r) RES_TYPES(_r)[col] = DB_BITMAP; break; + case MYSQL_TYPE_DECIMAL: + #if MYSQL_VERSION_ID > 49999 + case MYSQL_TYPE_NEWDECIMAL: + #endif case MYSQL_TYPE_STRING: case MYSQL_TYPE_VAR_STRING: LM_DBG("use DB_STRING result type\n");

15 years, 7 months

git:janakj/mysql: - initial support for BIGINT database in DB core and SQL based database

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 2d98f9c41be4b599a061b15765f10264b6da31b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d98f9c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Sep 16 16:44:10 2008 +0000 - initial support for BIGINT database in DB core and SQL based database modules, closes patch #2101659 - some tests for mysql were done, but more testing, especially for the postgres and unixodbc would be appreciated - Todo: fix other DB modules, at the moment some warnings are printed during compilation because of the unhandled BIGINT state git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4928 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_res.c | 6 +++++- modules/db_mysql/km_val.c | 42 +++++++++++++++++++++++++++++++----------- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 4a649e3..cf1e261 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -90,12 +90,16 @@ int db_mysql_get_columns(const db_con_t* _h, db_res_t* _r) case MYSQL_TYPE_SHORT: case MYSQL_TYPE_LONG: case MYSQL_TYPE_INT24: - case MYSQL_TYPE_LONGLONG: case MYSQL_TYPE_TIMESTAMP: LM_DBG("use DB_INT result type\n"); RES_TYPES(_r)[col] = DB_INT; break; + case MYSQL_TYPE_LONGLONG: + LM_DBG("use DB_BIGINT result type\n"); + RES_TYPES(_r)[col] = DB_BIGINT; + break; + case MYSQL_TYPE_FLOAT: case MYSQL_TYPE_DOUBLE: LM_DBG("use DB_DOUBLE result type\n"); diff --git a/modules/db_mysql/km_val.c b/modules/db_mysql/km_val.c index 2a50ba0..991b05d 100644 --- a/modules/db_mysql/km_val.c +++ b/modules/db_mysql/km_val.c @@ -75,11 +75,22 @@ int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int } break; + case DB_BIGINT: + LM_DBG("converting BIGINT [%s]\n", _s); + if (db_str2longlong(_s, &VAL_BIGINT(_v)) < 0) { + LM_ERR("error while converting big integer value from string\n"); + return -3; + } else { + VAL_TYPE(_v) = DB_BIGINT; + return 0; + } + break; + case DB_BITMAP: LM_DBG("converting BITMAP [%s]\n", _s); if (db_str2int(_s, &VAL_INT(_v)) < 0) { LM_ERR("error while converting bitmap value from string\n"); - return -3; + return -4; } else { VAL_TYPE(_v) = DB_BITMAP; return 0; @@ -90,7 +101,7 @@ int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int LM_DBG("converting DOUBLE [%s]\n", _s); if (db_str2double(_s, &VAL_DOUBLE(_v)) < 0) { LM_ERR("error while converting double value from string\n"); - return -4; + return -5; } else { VAL_TYPE(_v) = DB_DOUBLE; return 0; @@ -114,7 +125,7 @@ int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int LM_DBG("converting DATETIME [%s]\n", _s); if (db_str2time(_s, &VAL_TIME(_v)) < 0) { LM_ERR("error while converting datetime value from string\n"); - return -5; + return -6; } else { VAL_TYPE(_v) = DB_DATETIME; return 0; @@ -128,7 +139,7 @@ int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int VAL_TYPE(_v) = DB_BLOB; return 0; } - return -6; + return -7; } @@ -164,10 +175,19 @@ int db_mysql_val2str(const db_con_t* _c, const db_val_t* _v, char* _s, int* _len } break; + case DB_BIGINT: + if (db_longlong2str(VAL_BIGINT(_v), _s, _len) < 0) { + LM_ERR("error while converting string to big int\n"); + return -3; + } else { + return 0; + } + break; + case DB_BITMAP: if (db_int2str(VAL_BITMAP(_v), _s, _len) < 0) { LM_ERR("error while converting string to int\n"); - return -3; + return -4; } else { return 0; } @@ -176,7 +196,7 @@ int db_mysql_val2str(const db_con_t* _c, const db_val_t* _v, char* _s, int* _len case DB_DOUBLE: if (db_double2str(VAL_DOUBLE(_v), _s, _len) < 0) { LM_ERR("error while converting string to double\n"); - return -4; + return -5; } else { return 0; } @@ -186,7 +206,7 @@ int db_mysql_val2str(const db_con_t* _c, const db_val_t* _v, char* _s, int* _len l = strlen(VAL_STRING(_v)); if (*_len < (l * 2 + 3)) { LM_ERR("destination buffer too short\n"); - return -5; + return -6; } else { old_s = _s; *_s++ = '\''; @@ -201,7 +221,7 @@ int db_mysql_val2str(const db_con_t* _c, const db_val_t* _v, char* _s, int* _len case DB_STR: if (*_len < (VAL_STR(_v).len * 2 + 3)) { LM_ERR("destination buffer too short\n"); - return -6; + return -7; } else { old_s = _s; *_s++ = '\''; @@ -216,7 +236,7 @@ int db_mysql_val2str(const db_con_t* _c, const db_val_t* _v, char* _s, int* _len case DB_DATETIME: if (db_time2str(VAL_TIME(_v), _s, _len) < 0) { LM_ERR("error while converting string to time_t\n"); - return -7; + return -8; } else { return 0; } @@ -226,7 +246,7 @@ int db_mysql_val2str(const db_con_t* _c, const db_val_t* _v, char* _s, int* _len l = VAL_BLOB(_v).len; if (*_len < (l * 2 + 3)) { LM_ERR("destination buffer too short\n"); - return -8; + return -9; } else { old_s = _s; *_s++ = '\''; @@ -240,7 +260,7 @@ int db_mysql_val2str(const db_con_t* _c, const db_val_t* _v, char* _s, int* _len default: LM_DBG("unknown data type\n"); - return -9; + return -10; } /*return -8; --not reached*/ }

15 years, 7 months

git:janakj/mysql: - extend debugging with result type information

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 48855bffd52e5431ad3eb15ad48e3131e331b4f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48855bf… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Apr 1 08:54:30 2008 +0000 - extend debugging with result type information git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3968 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_res.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 3243919..5dac175 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -87,34 +87,40 @@ 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"); RES_TYPES(_r)[col] = DB_INT; break; case MYSQL_TYPE_FLOAT: case MYSQL_TYPE_DOUBLE: + LM_DBG("use DB_DOUBLE result type"); RES_TYPES(_r)[col] = DB_DOUBLE; break; case MYSQL_TYPE_DATETIME: + LM_DBG("use DB_DATETIME result type"); RES_TYPES(_r)[col] = DB_DATETIME; break; case MYSQL_TYPE_BLOB: + LM_DBG("use DB_BLOB result type"); RES_TYPES(_r)[col] = DB_BLOB; break; case FIELD_TYPE_SET: + LM_DBG("use DB_BITMAP result type"); RES_TYPES(_r)[col] = DB_BITMAP; break; case MYSQL_TYPE_STRING: case MYSQL_TYPE_VAR_STRING: + LM_DBG("use DB_STRING result type"); RES_TYPES(_r)[col] = DB_STRING; break; default: LM_WARN("unhandled data type column (%.*s) type id (%d), " - "use STRING as default\n", RES_NAMES(_r)[col]->len, + "use DB_STRING as default\n", RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s, fields[col].type); RES_TYPES(_r)[col] = DB_STRING; break;

15 years, 7 months

git:janakj/mysql: - updated old entity names

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: b25ae3d74e825bf2ed4aceec650696eabf697aa6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b25ae3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 19 19:31:30 2008 +0000 - updated old entity names git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3939 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 2dcbaf9..e6b3cd1 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">&sername;</productname> + <productname class="trade">&opensername;</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 60f4eab..8c3f39f 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>&ser; Modules</title> + <title>&openser; Modules</title> <para> The following modules must be loaded before this module: <itemizedlist> <listitem> <para> - <emphasis>No dependencies on other &ser; modules</emphasis>. + <emphasis>No dependencies on other &openser; 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 - &ser; with this module loaded: + &openser; 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 &ser;: + list. Then follow the standard procedure to install &openser;: "make all; make install". </para> </listitem>

15 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev