sr-dev

sr-dev@lists.kamailio.org

10 participants
42783 discussions

git:janakj/postgres: Postgres module update, includes:

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: d4640607089efc1c5dfdf89bd451ed3e07e46b42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d464060… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Oct 27 23:11:44 2005 +0000 Postgres module update, includes: - Support for connection pools - Support for multiple simultaneous results - No static buffer usage, uses more efficient PQExecParams - Support for database reconnects (not handled by libpq) - Support for binary parameters in PQExecParams (this brings us one step closer to prepared statements and removes tedious and error prone text conversions) - No data is copied from postgres result unless necessary - SQL injection vulnerability fixed - Configurable connectionn timeout - Configurable number of reconnect attempts - Support for bitmap data type - Support for binary data values - Support for timestamp format auto-detection --- modules/db_postgres/aug_alloc.c | 632 ------------ modules/db_postgres/aug_alloc.h | 95 -- modules/db_postgres/aug_debug.h | 158 --- modules/db_postgres/aug_std.h | 154 --- modules/db_postgres/aug_sysdep.h | 359 ------- modules/db_postgres/aug_util.c | 131 --- modules/db_postgres/con_postgres.h | 69 -- modules/db_postgres/db_con.c | 33 +- modules/db_postgres/db_mod.c | 68 +- modules/db_postgres/{defs.h => db_mod.h} | 30 +- modules/db_postgres/db_res.c | 228 ----- modules/db_postgres/db_utils.c | 145 --- modules/db_postgres/db_val.c | 358 ------- modules/db_postgres/dbase.c | 1536 ++++++++++++++++------------- modules/db_postgres/dbase.h | 59 +- modules/db_postgres/pg_con.c | 202 ++++ modules/db_postgres/pg_con.h | 74 ++ modules/db_postgres/pg_type.h | 165 ++-- modules/db_postgres/res.c | 409 ++++++++ modules/db_postgres/{db_utils.h => res.h} | 48 +- 20 files changed, 1739 insertions(+), 3214 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d46…

15 years, 2 months

git:janakj/postgres: - safer public function names

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 96d2a408aca38cd424b37f12de53b3cd2f04afb9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96d2a40… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Jan 6 13:21:35 2006 +0000 - safer public function names - short test code added - fixed module name in comments - support for NULL values in where clause - LOG(L_ERR, -> ERR - PQserverVersion compiled conditionaly --- modules/db_postgres/db_con.c | 4 +- modules/db_postgres/db_mod.c | 118 ++++++++++++++++-- modules/db_postgres/dbase.c | 292 ++++++++++++++++++++++-------------------- modules/db_postgres/dbase.h | 18 ++-- modules/db_postgres/pg_con.c | 37 +++--- modules/db_postgres/pg_con.h | 4 +- modules/db_postgres/res.c | 46 ++++---- modules/db_postgres/res.h | 6 +- 8 files changed, 321 insertions(+), 204 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=96d…

15 years, 2 months

git:janakj/postgres: - 0.9.4 changes forward ported (docs, radius Makefile *bsd update, postgress

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: d6eb6d0550bcefe15aac8d3ba9dd595daf48b9bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6eb6d0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 13 13:53:11 2005 +0000 - 0.9.4 changes forward ported (docs, radius Makefile *bsd update, postgress Makefile *bsd update a.s.o) --- modules/db_postgres/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 342e8a3..225db9b 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -8,6 +8,7 @@ NAME=postgres.so # libpq-fe.h locations DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include \ + -I$(LOCALBASE)/include/postgresql \ -I/usr/include/postgresql -I/usr/include/postgresql/8.0 \ -I/usr/include/pgsql/ LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -L /usr/lib -lpq

15 years, 2 months

git:janakj/postgres: Initial checkin.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 3175f89b8fa3dabb5052a19a02d30f82851f1dbb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3175f89… Author: Greg Fausak <lgfausak(a)august.net> Committer: Greg Fausak <lgfausak(a)august.net> Date: Tue Apr 8 01:25:35 2003 +0000 Initial checkin. ---

15 years, 2 months

git:janakj/postgres: - exec compiles now on freebsd 5.0 (wrong header)

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: f73f6431d3875a73cb2a3d2f2ea762f163fec1da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f73f643… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 18 17:58:34 2003 +0000 - exec compiles now on freebsd 5.0 (wrong header) - lots of Makefile LIBS fixes (use $(LOCALBASE) instead of /usr/local and added -L/usr/pkg/lib where missing, removed old comments) --- modules/db_postgres/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index b4db5dd..50a2133 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -7,6 +7,7 @@ NAME=postgres.so # libpq-fe.h locations DEFS +=-I/usr/local/pgsql/include -LIBS=-L/usr/local/pgsql/lib -lpq +LIBS=-L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -L/usr/pkg/lib \ + -L/usr/pkg/lib/pgsql -lpq include ../../Makefile.modules

15 years, 2 months

git:janakj/postgres: - fixed daylight saving bug previously found in mysql module

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: d79af6c63a8386f8d50b5dc41e045e754a70a587 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d79af6c… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Apr 14 18:52:47 2003 +0000 - fixed daylight saving bug previously found in mysql module - struct tm structure properly initialized - gmtime changed to localtime because mktime expects local time later --- modules/db_postgres/db_val.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/db_val.c b/modules/db_postgres/db_val.c index 6c91a7d..9af7d9e 100644 --- a/modules/db_postgres/db_val.c +++ b/modules/db_postgres/db_val.c @@ -33,6 +33,9 @@ * History * ------- * 2003-04-06 initial code written (Greg Fausak/Andy Fullford) + * 2003-04-14 gmtime changed to localtime because mktime later + * expects localtime, changed daylight saving bug + * previously found in mysql module (janakj) * */ @@ -94,7 +97,15 @@ static inline int str2time(const char* _s, time_t* _v) } #endif + memset(&t, '\0', sizeof(struct tm)); strptime(_s,"%Y-%m-%d %H:%M:%S %z",&t); + + /* Daylight saving information got lost in the database + * so let mktime to guess it. This eliminates the bug when + * contacts reloaded from the database have different time + * of expiration by one hour when daylight saving is used + */ + t.tm_isdst = -1; *_v = mktime(&t); return 0; @@ -147,7 +158,7 @@ static inline int time2str(time_t _v, char* _s, int* _l) } #endif - t = gmtime(&_v); + t = localtime(&_v); if((bl=strftime(_s,(size_t)(*_l)-1,"'%Y-%m-%d %H:%M:%S %z'",t))>0) *_l = bl;

15 years, 2 months

git:janakj/postgres: - docbook documentation template.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 62e5f5f2c2823a53eeac94ae8633677409d2aacf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62e5f5f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Jul 24 18:17:16 2003 +0000 - docbook documentation template. --- modules/db_postgres/doc/postgres.sgml | 52 +++++++++++++ modules/db_postgres/doc/postgres_devel.sgml | 22 ++++++ modules/db_postgres/doc/postgres_faq.sgml | 67 ++++++++++++++++ modules/db_postgres/doc/postgres_user.sgml | 110 +++++++++++++++++++++++++++ 4 files changed, 251 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/doc/postgres.sgml b/modules/db_postgres/doc/postgres.sgml new file mode 100644 index 0000000..b814928 --- /dev/null +++ b/modules/db_postgres/doc/postgres.sgml @@ -0,0 +1,52 @@ +<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [ + + +<!ENTITY user SYSTEM "postgres_user.sgml"> +<!ENTITY devel SYSTEM "postgres_devel.sgml"> +<!ENTITY faq SYSTEM "postgres_faq.sgml"> + + +<!ENTITY % serentities SYSTEM "../../../doc/ser_entities.sgml"> +%serentities; + +]> + +<book> + <bookinfo> + <title>postgres Module</title> + <productname class="trade">&sername;</productname> + <authorgroup> + <author> + <firstname>Greg</firstname> + <surname>Fausak</surname> + <affiliation><orgname>August.net</orgname></affiliation> + <address> + <email>greg(a)august.net</email> + </address> + </author> + <editor> + <firstname>Greg</firstname> + <surname>Fausak</surname> + <address> + <email>greg(a)august.net</email> + </address> + </editor> + </authorgroup> + <copyright> + <year>2003</year> + <holder>Greg Fausak</holder> + </copyright> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </bookinfo> + <toc></toc> + + &user; + &devel; + &faq; + +</book> diff --git a/modules/db_postgres/doc/postgres_devel.sgml b/modules/db_postgres/doc/postgres_devel.sgml new file mode 100644 index 0000000..9983429 --- /dev/null +++ b/modules/db_postgres/doc/postgres_devel.sgml @@ -0,0 +1,22 @@ + + +<chapter> + <chapterinfo> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </chapterinfo> + <title>Developer's Guide</title> + <para> + The module does not provide any sort of API to use in other SER modules. + </para> +</chapter> + + diff --git a/modules/db_postgres/doc/postgres_faq.sgml b/modules/db_postgres/doc/postgres_faq.sgml new file mode 100644 index 0000000..9322cc4 --- /dev/null +++ b/modules/db_postgres/doc/postgres_faq.sgml @@ -0,0 +1,67 @@ + + +<chapter> + <chapterinfo> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </chapterinfo> + <title>Frequently Asked Questions</title> + <qandaset defaultlabel="number"> + <qandaentry> + <question> + <para>Where can I find more about &ser;?</para> + </question> + <answer> + <para> + Take a look at &serhomelink;. + </para> + </answer> + </qandaentry> + <qandaentry> + <question> + <para>Where can I post a question about this module?</para> + </question> + <answer> + <para> + First at all check if your question was already answered on one of + our mailing lists: + </para> + <itemizedlist> + <listitem> + <para>&seruserslink;</para> + </listitem> + <listitem> + <para>&serdevlink;</para> + </listitem> + </itemizedlist> + <para> + E-mails regarding any stable version should be sent to &serusersmail; and e-mail + regarding development versions or CVS snapshots should be send to &serdevmail;. + </para> + <para> + If you want to keep the mail private, send it to &serhelpmail;. + </para> + </answer> + </qandaentry> + <qandaentry> + <question> + <para>How can I report a bug?</para> + </question> + <answer> + <para> + Please follow the guidelines provided at: &serbugslink; + </para> + </answer> + </qandaentry> + </qandaset> +</chapter> + + diff --git a/modules/db_postgres/doc/postgres_user.sgml b/modules/db_postgres/doc/postgres_user.sgml new file mode 100644 index 0000000..2d68cfe --- /dev/null +++ b/modules/db_postgres/doc/postgres_user.sgml @@ -0,0 +1,110 @@ + + +<chapter> + <chapterinfo> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </chapterinfo> + <title>User's Guide</title> + + <section> + <title>Overview</title> + <para>Module description</para> + </section> + <section> + <title>Dependencies</title> + <section> + <title>&ser; Modules</title> + <para> + The following modules must be loaded before this module: + <itemizedlist> + <listitem> + <para> + <emphasis>No dependencies on other &ser; modules</emphasis>. + </para> + </listitem> + </itemizedlist> + </para> + </section> + <section> + <title>External Libraries or Applications</title> + <para> + The following libraries or applications must be installed before running + &ser; with this module loaded: + <itemizedlist> + <listitem> + <para> + <emphasis>None</emphasis>. + </para> + </listitem> + </itemizedlist> + </para> + </section> + </section> + <section> + <title>Exported Parameters</title> + <section> + <title><varname>param_name</varname> (param_type)</title> + <para> + Param description. + </para> + <para> + <emphasis> + Default value is <quote>value</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>param_name</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("module", "param_name", "param_value") +... +</programlisting> + </example> + </section> + </section> + <section> + <title>Exported Functions</title> + <section> + <title> + <function moreinfo="none">function_name(param1, param2)</function> + </title> + <para> + Description + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>param1</emphasis> - description. + </para> + </listitem> + <listitem> + <para><emphasis>param2</emphasis> - description. + </para> + </listitem> + </itemizedlist> + <example> + <title><function>function_name</function> usage</title> + <programlisting format="linespecific"> +... +function_name("sample_param1", "sample_param2"); +... +</programlisting> + </example> + </section> + </section> + <section> + <title>Installation & Running</title> + <para>Notes about installation and running.</para> + </section> +</chapter> + +

15 years, 2 months

git:janakj/postgres: - updated all makefiles (now 'cd modules/foo; make' will link with the

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 80b11a1361effef6faf817f2e5a9d2b4649793ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80b11a1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri May 23 15:43:42 2003 +0000 - updated all makefiles (now 'cd modules/foo; make' will link with the proper libraries). Please add an "include ../../Makefile.defs" as first line of the local module Makefile if your module is not on the cvs) --- modules/db_postgres/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 50a2133..5dae7f9 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -2,6 +2,7 @@ # # WARNING: do not run this directly, it should be run by the master Makefile +include ../../Makefile.defs auto_gen= NAME=postgres.so

15 years, 2 months

git:janakj/postgres: - Got rid of all the ~ at the beginning of functions that are not supposed

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 8bcba8987e78f28548bd96fd69ae0c194a6faa00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bcba89… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Oct 8 13:07:21 2003 +0000 - Got rid of all the ~ at the beginning of functions that are not supposed to be called from scripts. It's a relict. --- modules/db_postgres/db_mod.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index 73f4def..c53bddf 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -48,15 +48,15 @@ static int mod_init(void); static cmd_export_t cmds[]={ - {"~db_use_table", (cmd_function)use_table, 2, 0, 0}, - {"~db_init", (cmd_function)db_init, 1, 0, 0}, - {"~db_close", (cmd_function)db_close, 2, 0, 0}, - {"~db_query", (cmd_function)db_query, 2, 0, 0}, - {"~db_raw_query", (cmd_function)db_raw_query, 2, 0, 0}, - {"~db_free_query", (cmd_function)db_free_query, 2, 0, 0}, - {"~db_insert", (cmd_function)db_insert, 2, 0, 0}, - {"~db_delete", (cmd_function)db_delete, 2, 0, 0}, - {"~db_update", (cmd_function)db_update, 2, 0, 0}, + {"db_use_table", (cmd_function)use_table, 2, 0, 0}, + {"db_init", (cmd_function)db_init, 1, 0, 0}, + {"db_close", (cmd_function)db_close, 2, 0, 0}, + {"db_query", (cmd_function)db_query, 2, 0, 0}, + {"db_raw_query", (cmd_function)db_raw_query, 2, 0, 0}, + {"db_free_query", (cmd_function)db_free_query, 2, 0, 0}, + {"db_insert", (cmd_function)db_insert, 2, 0, 0}, + {"db_delete", (cmd_function)db_delete, 2, 0, 0}, + {"db_update", (cmd_function)db_update, 2, 0, 0}, {0,0,0,0,0} };

15 years, 2 months

git:janakj/postgres: - Broken headers fixed

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 9c0a9d956c49f1d2b09467833713b935ea15c909 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c0a9d9… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Apr 13 14:58:05 2004 +0000 - Broken headers fixed - Missing prototypes added (Reported by Maxim Sobolev) --- modules/db_postgres/db_con.c | 2 +- modules/db_postgres/db_mod.c | 2 +- modules/db_postgres/db_val.c | 1 + modules/db_postgres/dbase.h | 12 ++++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/db_con.c b/modules/db_postgres/db_con.c index 52a4fe1..4f0e4ca 100644 --- a/modules/db_postgres/db_con.c +++ b/modules/db_postgres/db_con.c @@ -39,10 +39,10 @@ #include <string.h> #include "../../dprint.h" #include "../../mem/mem.h" +#include "../../db/db_con.h" #include "defs.h" #include "con_postgres.h" #include "aug_std.h" -#include "db_con.h" /* * Store name of table that will be used by diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index 8d7b124..bd0601c 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -35,7 +35,7 @@ #include <stdio.h> #include "../../sr_module.h" -#include "db_con.h" +#include "../../db/db_con.h" #include "dbase.h" MODULE_VERSION diff --git a/modules/db_postgres/db_val.c b/modules/db_postgres/db_val.c index 9af7d9e..d80ec04 100644 --- a/modules/db_postgres/db_val.c +++ b/modules/db_postgres/db_val.c @@ -188,6 +188,7 @@ int str2valp(db_type_t _t, db_val_t* _v, const char* _s, int _l, void *_p) switch(_t) { case DB_INT: + case DB_BITMAP: sprintf(dbuf, "got int %s", _s); DLOG("str2valp", dbuf); if (str2int(_s, &VAL_INT(_v)) < 0) { diff --git a/modules/db_postgres/dbase.h b/modules/db_postgres/dbase.h index b10dadf..9406896 100644 --- a/modules/db_postgres/dbase.h +++ b/modules/db_postgres/dbase.h @@ -106,4 +106,16 @@ int db_update(db_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t* _v, db_key_t* _uk, db_val_t* _uv, int _n, int _un); +/* + * Store name of table that will be used by + * subsequent database functions + */ +int use_table(db_con_t* _h, const char* _t); + +int val2str(db_val_t* _v, char* _s, int* _len); + +int free_result(db_res_t* _r); + +int convert_result(db_con_t* _h, db_res_t* _r); + #endif /* DBASE_H */

15 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev