sr-dev

sr-dev@lists.kamailio.org

12 participants
44199 discussions

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

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 832d455754bae7ef18599efcd5985a72c46a4cef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=832d455… 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_postgres/km_README | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/km_README b/modules/db_postgres/km_README index 1c5bde9..6eecde4 100644 --- a/modules/db_postgres/km_README +++ b/modules/db_postgres/km_README @@ -1,3 +1,4 @@ + postgres Module Greg Fausak @@ -10,9 +11,9 @@ Greg Fausak Copyright � 2003 Greg Fausak 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

15 years, 10 months

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

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 24958f3274961095daf6d6be903bff36ac69384e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24958f3… 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_postgres/km_README | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/km_README b/modules/db_postgres/km_README index 6eecde4..3a5e085 100644 --- a/modules/db_postgres/km_README +++ b/modules/db_postgres/km_README @@ -1,4 +1,3 @@ - postgres Module Greg Fausak @@ -12,8 +11,8 @@ Greg Fausak Copyright � 2003 Greg Fausak Revision History Revision $Revision$ $Date: 2008-08-06 12:08:33 +0200 - (Wed, 06 Aug 2008) $ - _________________________________________________________ + (Mi, 06 Aug 2008) $ + __________________________________________________________ Table of Contents

15 years, 10 months

git:janakj/postgres: - cleanup in modules, instead of logging module initialization

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: c1b232179bdde71f5df0cc11cbd0c43733a65725 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1b2321… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Sun Aug 10 22:51:44 2008 +0000 - cleanup in modules, instead of logging module initialization in each mod_init (with different messages, levels..) do this in the core git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4657 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_db_postgres.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index 1fdf4c0..02f1857 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -69,7 +69,6 @@ struct module_exports exports = { static int mod_init(void) { - LM_INFO("initializing...\n"); return 0; }

15 years, 10 months

git:janakj/postgres: - multiple fixes:

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: d65be2c006880ec492de2d106c570011efcac0e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d65be2c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 1 10:27:02 2008 +0000 - multiple fixes: 1) test memory allocations 2) return code overlapping in case of error (missing break) 3) bogus/ not needed NULL tests for result freeing - credits goes to Bogdan git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4784 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 29f817c..49c276c 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -405,6 +405,11 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) int rc = 0; *_r = db_new_result(); + if (*_r==NULL) { + LM_ERR("failed to init new result\n"); + rc = -1; + goto done; + } while (1) { if ((res = PQgetResult(CON_CONNECTION(_con)))) { @@ -421,18 +426,20 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) switch(pqresult) { case PGRES_COMMAND_OK: - /* Successful completion of a command returning no data (such as INSERT or UPDATE). */ + /* Successful completion of a command returning no data + * (such as INSERT or UPDATE). */ rc = 0; break; case PGRES_TUPLES_OK: - /* Successful completion of a command returning data (such as a SELECT or SHOW). */ + /* Successful completion of a command returning data + * (such as a SELECT or SHOW). */ if (db_postgres_convert_result(_con, *_r) < 0) { LM_ERR("%p Error returned from convert_result()\n", _con); - if (*_r) db_free_result(*_r); - + db_free_result(*_r); *_r = 0; rc = -4; + break; } rc = 0; break; @@ -441,7 +448,7 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) LM_ERR("%p - invalid query, execution aborted\n", _con); LM_ERR("%p: %s\n", _con, PQresStatus(pqresult)); LM_ERR("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); - if (*_r) db_free_result(*_r); + db_free_result(*_r); *_r = 0; rc = -3; break; @@ -458,13 +465,13 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) LM_ERR("%p Probable invalid query\n", _con); LM_ERR("%p: %s\n", _con, PQresStatus(pqresult)); LM_ERR("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); - if (*_r) db_free_result(*_r); - + db_free_result(*_r); *_r = 0; rc = -4; break; } +done: free_query(_con); return (rc); }

15 years, 10 months

git:janakj/postgres: - fix warning related to amd64

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: a1b6b664b5ca852a320d09fc8bfd73c9cd44a1d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1b6b66… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 12 11:21:41 2008 +0000 - fix warning related to amd64 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4894 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_res.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index 4dc07ad..95e5c11 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -116,7 +116,7 @@ int db_postgres_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, + LM_DBG("allocate %d bytes for RES_NAMES[%d] at %p\n", (unsigned int) sizeof(str), col, RES_NAMES(_r)[col]); /* The pointer that is here returned is part of the result structure. */

15 years, 10 months

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

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: af688644ebc2ac3e78fc1f1c5ddd6fcb05602eda URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af68864… 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_postgres/km_res.c | 5 +++- modules/db_postgres/km_val.c | 50 +++++++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index 95e5c11..24a1fcd 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -131,11 +131,14 @@ int db_postgres_get_columns(const db_con_t* _h, db_res_t* _r) { case INT2OID: case INT4OID: - case INT8OID: LM_DBG("use DB_INT result type\n"); RES_TYPES(_r)[col] = DB_INT; break; + case INT8OID: + LM_DBG("use DB_BIGINT result type\n"); + RES_TYPES(_r)[col] = DB_BIGINT; + case FLOAT4OID: case FLOAT8OID: case NUMERICOID: diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index 44e7dad..ce82b97 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -87,11 +87,22 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const } break; + case DB_BIGINT: + LM_DBG("converting BIGINT [%s]\n", _s); + if (db_str2longlong(_s, &VAL_BIGINT(_v)) < 0) { + LM_ERR("failed to convert BIGINT 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("failed to convert BITMAP value from string\n"); - return -3; + return -4; } else { VAL_TYPE(_v) = DB_BITMAP; return 0; @@ -102,7 +113,7 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const LM_DBG("converting DOUBLE [%s]\n", _s); if (db_str2double(_s, &VAL_DOUBLE(_v)) < 0) { LM_ERR("failed to convert DOUBLE value from string\n"); - return -4; + return -5; } else { VAL_TYPE(_v) = DB_DOUBLE; return 0; @@ -129,7 +140,7 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const LM_DBG("converting DATETIME [%s]\n", _s); if (db_str2time(_s, &VAL_TIME(_v)) < 0) { LM_ERR("failed to convert datetime\n"); - return -5; + return -6; } else { VAL_TYPE(_v) = DB_DATETIME; return 0; @@ -150,7 +161,7 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const LM_DBG("got blob len %d\n", _l); return 0; } - return -6; + return -7; } @@ -185,10 +196,19 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* } break; + case DB_BIGINT: + if (db_longlong2str(VAL_BIGINT(_v), _s, _len) < 0) { + LM_ERR("failed to convert 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("failed to convert string to int\n"); - return -3; + return -4; } else { return 0; } @@ -197,7 +217,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* case DB_DOUBLE: if (db_double2str(VAL_DOUBLE(_v), _s, _len) < 0) { LM_ERR("failed to convert string to double\n"); - return -3; + return -5; } else { return 0; } @@ -207,7 +227,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* l = strlen(VAL_STRING(_v)); if (*_len < (l * 2 + 3)) { LM_ERR("destination buffer too short for string\n"); - return -4; + return -6; } else { old_s = _s; *_s++ = '\''; @@ -216,7 +236,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* if(pgret!=0) { LM_ERR("PQescapeStringConn failed\n"); - return -4; + return -6; } LM_DBG("PQescapeStringConn: in: %d chars," " out: %d chars\n", l, ret); @@ -232,7 +252,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* l = VAL_STR(_v).len; if (*_len < (l * 2 + 3)) { LM_ERR("destination buffer too short for str\n"); - return -5; + return -7; } else { old_s = _s; *_s++ = '\''; @@ -241,7 +261,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* if(pgret!=0) { LM_ERR("PQescapeStringConn failed \n"); - return -5; + return -7; } LM_DBG("PQescapeStringConn: in: %d chars, out: %d chars\n", l, ret); _s += ret; @@ -255,7 +275,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* case DB_DATETIME: if (db_time2str(VAL_TIME(_v), _s, _len) < 0) { LM_ERR("failed to convert string to time_t\n"); - return -6; + return -8; } else { return 0; } @@ -266,7 +286,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* /* this estimation is not always correct, thus we need to check later again */ if (*_len < (l * 2 + 3)) { LM_ERR("destination buffer too short for blob\n"); - return -7; + return -9; } else { *_s++ = '\''; tmp_s = (char*)PQescapeByteaConn(CON_CONNECTION(_con), (unsigned char*)VAL_STRING(_v), @@ -274,11 +294,11 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* if(tmp_s==NULL) { LM_ERR("PQescapeBytea failed\n"); - return -7; + return -9; } if (tmp_len > *_len) { LM_ERR("escaped result too long\n"); - return -7; + return -9; } memcpy(_s, tmp_s, tmp_len); PQfreemem(tmp_s); @@ -292,7 +312,7 @@ int db_postgres_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* default: LM_DBG("unknown data type\n"); - return -7; + return -10; } return -8; }

15 years, 10 months

git:janakj/postgres: - doxygen conversion, write new documentation, small cleanups

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e7d596848ee7959fc5481bf669d9207d790cf7d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7d5968… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 19 09:45:51 2008 +0000 - doxygen conversion, write new documentation, small cleanups git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4963 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_db_postgres.c | 29 +++-- modules/db_postgres/km_dbase.c | 228 +++++++++++++++------------------- modules/db_postgres/km_dbase.h | 33 +++--- modules/db_postgres/km_pg_con.c | 21 +++- modules/db_postgres/km_pg_con.h | 35 +++--- modules/db_postgres/km_res.c | 45 +++++--- modules/db_postgres/km_res.h | 7 +- modules/db_postgres/km_val.c | 33 ++++-- modules/db_postgres/km_val.h | 8 +- 9 files changed, 233 insertions(+), 206 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e7d…

15 years, 10 months

git:janakj/postgres: - make small wrapper around PQclear void, nobody checks the return state

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: abf8e6a4dd9531420b3c0a9dea559377f2ad13b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abf8e6a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 19 11:28:06 2008 +0000 - make small wrapper around PQclear void, nobody checks the return state - sync db_postgres_free_result function logic with the mysql and unixodbc modules (check for errors in db_free_result, not necessary set res to 0) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4964 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 41a6d51..38bc36f 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -79,7 +79,7 @@ #include "val.h" #include "res.h" -static int free_query(const db_con_t* _con); +static void free_query(const db_con_t* _con); /*! @@ -289,9 +289,8 @@ int db_postgres_fetch_result(const db_con_t* _con, db_res_t** _res, const int nr /*! * \brief Free database and any old query results * \param _h database connection - * \return 0 */ -static int free_query(const db_con_t* _con) +static void free_query(const db_con_t* _con) { if(CON_RESULT(_con)) { @@ -299,8 +298,6 @@ static int free_query(const db_con_t* _con) PQclear(CON_RESULT(_con)); CON_RESULT(_con) = 0; } - - return 0; } @@ -308,14 +305,19 @@ static int free_query(const db_con_t* _con) * \brief Free the query and the result memory in the core * \param _con database connection * \param _r result set - * \return 0 + * \return 0 on success, -1 on failure */ int db_postgres_free_result(db_con_t* _con, db_res_t* _r) { + if ((!_con) || (!_r)) { + LM_ERR("invalid parameter value\n"); + return -1; + } + if (db_free_result(_r) < 0) { + LM_ERR("unable to free result structure\n"); + return -1; + } free_query(_con); - if (_r) db_free_result(_r); - _r = 0; - return 0; }

15 years, 10 months

git:janakj/postgres: - step 1 for the rest of modules to re-link history from sgml to xml files

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 4f5c68d9ff111f65a2bbd44781eeb5a07801fa75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f5c68d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 7 19:41:22 2008 +0000 - step 1 for the rest of modules to re-link history from sgml to xml files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3890 689a6050-402a-0410-94f2-e92a70836424 --- .../km_doc/{db_postgres.xml => db_postgres.sgml} | 4 ++-- ...db_postgres_admin.xml => db_postgres_user.sgml} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/km_doc/db_postgres.xml b/modules/db_postgres/km_doc/db_postgres.sgml similarity index 90% rename from modules/db_postgres/km_doc/db_postgres.xml rename to modules/db_postgres/km_doc/db_postgres.sgml index 40ab07b..c780a1b 100644 --- a/modules/db_postgres/km_doc/db_postgres.xml +++ b/modules/db_postgres/km_doc/db_postgres.sgml @@ -39,8 +39,8 @@ </copyright> <revhistory> <revision> - <revnumber>$Revision: 3839 $</revnumber> - <date>$Date: 2008-03-04 15:15:47 +0200 (Tue, 04 Mar 2008) $</date> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> </revision> </revhistory> </bookinfo> diff --git a/modules/db_postgres/km_doc/db_postgres_admin.xml b/modules/db_postgres/km_doc/db_postgres_user.sgml similarity index 100% rename from modules/db_postgres/km_doc/db_postgres_admin.xml rename to modules/db_postgres/km_doc/db_postgres_user.sgml

15 years, 10 months

git:janakj/postgres: - step 2 for the rest of modules to re-link history from sgml to xml files

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: dd5b160afe9e3035d91f1ff737905408ad7436b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd5b160… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 7 19:52:29 2008 +0000 - step 2 for the rest of modules to re-link history from sgml to xml files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3891 689a6050-402a-0410-94f2-e92a70836424 --- .../km_doc/{db_postgres.sgml => db_postgres.xml} | 0 ...db_postgres_user.sgml => db_postgres_admin.xml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/km_doc/db_postgres.sgml b/modules/db_postgres/km_doc/db_postgres.xml similarity index 100% rename from modules/db_postgres/km_doc/db_postgres.sgml rename to modules/db_postgres/km_doc/db_postgres.xml diff --git a/modules/db_postgres/km_doc/db_postgres_user.sgml b/modules/db_postgres/km_doc/db_postgres_admin.xml similarity index 100% rename from modules/db_postgres/km_doc/db_postgres_user.sgml rename to modules/db_postgres/km_doc/db_postgres_admin.xml

15 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev