sr-dev

sr-dev@lists.kamailio.org

17 participants
44127 discussions

git:janakj/postgres: Merge branch 'master' of ssh://janakj@git.sip-router. org/sip-router into postgres

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 62b46f03f8f7a840fc635bb2715d59d0c3975e2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62b46f0… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 14:05:32 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into postgres * 'master' of ssh://janakj@git.sip-router.org/sip-router: Ignore emacs backup and lock files. ---

15 years, 10 months

git:janakj/postgres: Integrate functions and parameters from kamailio sources.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: f0546a246d0098405b61a64ca0fbaf32bbb5373f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0546a2… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 14:32:18 2009 +0100 Integrate functions and parameters from kamailio sources. This patch adds db_bind_api function from kamailio sources to the list of exported functions. Also we call the mod_init function from kamailio sources at the and of the mod_init function in pg_mod.c. To make this possible I added a new header file and removed static from the mod_init function declaration. --- modules/db_postgres/km_db_postgres.c | 9 ++----- modules/db_postgres/km_db_postgres.h | 39 ++++++++++++++++++++++++++++++++++ modules/db_postgres/pg_mod.c | 4 ++- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index c3df575..ffe9230 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -38,14 +38,11 @@ #include "../../lib/srdb1/db_con.h" #include "../../lib/srdb1/db.h" #include "km_dbase.h" +#include "km_db_postgres.h" /*MODULE_VERSION*/ -int db_postgres_bind_api(db_func_t *dbb); - -static int mod_init(void); - /* * PostgreSQL database module interface */ @@ -66,14 +63,14 @@ struct kam_module_exports kam_exports = { 0, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */ - mod_init, /* module initialization function */ + km_postgres_mod_init, /* module initialization function */ 0, /* response function*/ 0, /* destroy function */ 0 /* per-child init function */ }; -static int mod_init(void) +int km_postgres_mod_init(void) { return 0; } diff --git a/modules/db_postgres/km_db_postgres.h b/modules/db_postgres/km_db_postgres.h new file mode 100644 index 0000000..8959417 --- /dev/null +++ b/modules/db_postgres/km_db_postgres.h @@ -0,0 +1,39 @@ +/* + * $Id$ + * + * Copyright (C) 2001-2003 FhG Fokus + * Copyright (C) 2008 1&1 Internet AG + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! \file + * \brief DB_POSTGRES :: Core + * \ingroup db_postgres + * Module: \ref db_postgres + */ + +#ifndef _KM_DB_POSTGRES_H +#define _KM_DB_POSTGRES_H + +#include "../../lib/srdb1/db.h" + +int db_postgres_bind_api(db_func_t *dbb); + +int km_postgres_mod_init(void); + +#endif /* _KM_DB_POSTGRES_H */ diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index 1bc4ad4..3c1e2d9 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -42,6 +42,7 @@ #include "pg_cmd.h" #include "pg_res.h" #include "pg_fld.h" +#include "km_db_postgres.h" #include "../../sr_module.h" @@ -77,6 +78,7 @@ static cmd_export_t cmds[] = { {"db_next", (cmd_function)pg_cmd_next, 0, 0, 0}, {"db_setopt", (cmd_function)pg_setopt, 0, 0, 0}, {"db_getopt", (cmd_function)pg_getopt, 0, 0, 0}, + {"db_bind_api", (cmd_function)db_postgres_bind_api, 0, 0, 0}, {0, 0, 0, 0, 0} }; @@ -538,7 +540,7 @@ static int pg_mod_init(void) } return -1; #endif /* PG_TEST */ - return 0; + return km_postgres_mod_init(); } /** @} */

15 years, 10 months

git:master: Ignore emacs backup and lock files.

by Jan Janak

Module: sip-router Branch: master Commit: 530b267161620bbca3a59c38be3a5f1b7bb15c69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=530b267… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 12:29:20 2009 +0100 Ignore emacs backup and lock files. --- .gitignore | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 3dd9055..c3a6ef0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,7 @@ TAGS test/udp_flood utils/gen_ha1/gen_ha1 utils/sercmd/sercmd -*~ \ No newline at end of file +# Emacs backup files +*~ +# Emacs file locks +.#*

15 years, 10 months

git:janakj/postgres: - another error condition fix for a problem that gets introduced by a

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 70764fb02a5be0f7ccca4f6e66adbdf083fdaea8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70764fb… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jan 9 13:23:11 2009 +0000 - another error condition fix for a problem that gets introduced by a recent change: don't try to free memory in the row_buf that don't belong to us anymore - reported by Bayan Towfiq, bayan at flowroute dot com - remove row_buf[col] NULL assignment that was not executed anyway git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5438 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_res.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index 548e535..0cd80c5 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -256,19 +256,10 @@ int db_postgres_convert_rows(const db_con_t* _h, db_res_t* _r) if(db_postgres_convert_row(_h, _r, &(RES_ROWS(_r)[row - RES_LAST_ROW(_r)]), row_buf)<0){ LM_ERR("failed to convert row #%d\n", row); RES_ROW_N(_r) = row - RES_LAST_ROW(_r); - for (col = 0; col < RES_COL_N(_r); col++) { - LM_DBG("freeing row_buf[%d] at %p\n", col, row_buf[col]); - pkg_free(row_buf[col]); - } LM_DBG("freeing row buffer at %p\n", row_buf); pkg_free(row_buf); db_free_rows(_r); return -4; - /* - * The following housekeeping may not be technically required, but it - * is a good practice to NULL pointer fields that are no longer valid. - */ - row_buf[col] = (char *)NULL; } }

15 years, 10 months

git:janakj/postgres: Merge branch 'master' of ssh://janakj@git.sip-router. org/sip-router into postgres

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 269f7048510ed8f84ea0b568df53000d1421ddf8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=269f704… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 14:48:05 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into postgres * 'master' of ssh://janakj@git.sip-router.org/sip-router: (194 commits) Support for db driver names with "db_" prefix in libsrdb2. Make sure mod_init from kamailio/db_mysql is called. Export kamailio/db_mysql parameters through the module api. Export db_bind_api through the module interface. Eliminate conflicts with files imported from ser/mysql modules. DB_* renamed to DB1_* in files originating from kamailio/db_mysql. db_res renamed to db1_res in files originating from kamailio/db_mysql. db_con renamed to db1_con in files originating from kamailio/db_mysql. Integration of both modules, first step. Module name changed to db_mysql. Changes necessary to make the module compile in the sip-router tree. - 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 ... ---

15 years, 10 months

git:janakj/postgres: Merged contents of km_Makefile ( namely pg_config autodetection).

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: c53d4d36738cef4296d8cb4b9fcd7beb9712fedb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c53d4d3… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 00:52:27 2009 +0100 Merged contents of km_Makefile (namely pg_config autodetection). --- modules/db_postgres/Makefile | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index f32f99b..aa86b51 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -6,13 +6,30 @@ include ../../Makefile.defs auto_gen= NAME=postgres.so -# libpq-fe.h locations +# set CROSS_COMPILE to true if you want to skip +# the autodetection +# CROSS_COMPILE=true + +ifeq ($(CROSS_COMPILE),) +PGCFG=$(shell which pg_config) +endif + +ifneq ($(PGCFG),) + # use autodetection + DEFS += -I$(shell $(PGCFG) --includedir) + LIBS = -L$(shell $(PGCFG) --libdir) -lpq +else + # use standard know paths + # libpq-fe.h locations + DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include \ + -I$(SYSBASE)/include/pgsql -I$(SYSBASE)/include/postgresql \ + -I$(SYSBASE)/include/postgresql/8.0 + LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql \ + -L /usr/lib -lpq +endif + #DEFS += -DPG_TEST -DEFS +=-DSER_MOD_INTERFACE -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 +DEFS += -DSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1

15 years, 10 months

git:janakj/postgres: Updated filenames of locally includede header files

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 3298962b7d0d0324920df8616d9941e64a817828 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3298962… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 00:43:13 2009 +0100 Updated filenames of locally includede header files --- modules/db_postgres/km_db_postgres.c | 2 +- modules/db_postgres/km_dbase.c | 8 ++++---- modules/db_postgres/km_pg_con.c | 2 +- modules/db_postgres/km_res.c | 8 ++++---- modules/db_postgres/km_val.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index fad2183..5b7e6d1 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -37,7 +37,7 @@ #include "../../sr_module.h" #include "../../db/db_con.h" #include "../../db/db.h" -#include "dbase.h" +#include "km_dbase.h" MODULE_VERSION diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 88075e3..1e8b145 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -74,10 +74,10 @@ #include "../../db/db.h" #include "../../db/db_ut.h" #include "../../db/db_query.h" -#include "dbase.h" -#include "pg_con.h" -#include "val.h" -#include "res.h" +#include "km_dbase.h" +#include "km_pg_con.h" +#include "km_val.h" +#include "km_res.h" static void db_postgres_free_query(const db_con_t* _con); diff --git a/modules/db_postgres/km_pg_con.c b/modules/db_postgres/km_pg_con.c index 16d8c02..aa1d510 100644 --- a/modules/db_postgres/km_pg_con.c +++ b/modules/db_postgres/km_pg_con.c @@ -27,7 +27,7 @@ * Module: \ref db_postgres */ -#include "pg_con.h" +#include "km_pg_con.h" #include "../../mem/mem.h" #include "../../dprint.h" #include "../../ut.h" diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index 0cd80c5..8432d7f 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -47,10 +47,10 @@ #include "../../db/db_con.h" #include "../../dprint.h" #include "../../mem/mem.h" -#include "res.h" -#include "val.h" -#include "pg_con.h" -#include "pg_type.h" +#include "km_res.h" +#include "km_val.h" +#include "km_pg_con.h" +#include "km_pg_type.h" /*! diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index e47467e..756a69e 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -37,10 +37,10 @@ #include "../../db/db_val.h" #include "../../db/db_ut.h" #include "../../dprint.h" -#include "pg_con.h" +#include "km_pg_con.h" #include "../../mem/mem.h" -#include "val.h" +#include "km_val.h" /*!

15 years, 10 months

git:janakj/postgres: Merge branch 'master' of ssh://janakj@git.sip-router. org/sip-router into postgres

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 6607caf9c4f92dc4386a868399456748b649bed3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6607caf… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 23:15:51 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into postgres * 'master' of ssh://janakj@git.sip-router.org/sip-router: SER to sip-router module conversion script. Kamailio to sip-router module conversion script. ---

15 years, 10 months

git:janakj/postgres: - fix regression during value conversion when input SQL string is NULL,

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: fd355ee0b0d815fd42a0a4512566802f63c924f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd355ee… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 14 13:58:51 2009 +0000 - fix regression during value conversion when input SQL string is NULL, and value type is BLOB, reported from jordan at flowroute dot com git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5459 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_val.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index 7cc308a..e47467e 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -57,7 +57,8 @@ */ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l) { - if ( (_t != DB_BLOB && _v != NULL) || _v == NULL) { + /* use common function for non BLOB, NULL setting and input parameter checking */ + if ( _t != DB_BLOB || _s == NULL || _v == NULL) { return db_str2val(_t, _v, _s, _l, 1); } else { char * tmp_s = NULL;

15 years, 10 months

git:janakj/postgres: Align defines protecting headers with filenames.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: d5d6356037c2684425108ec4a4105a3453713f0e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5d6356… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 00:39:53 2009 +0100 Align defines protecting headers with filenames. --- modules/db_postgres/km_dbase.h | 6 +++--- modules/db_postgres/km_pg_con.h | 6 +++--- modules/db_postgres/km_res.h | 4 ++-- modules/db_postgres/km_val.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/db_postgres/km_dbase.h b/modules/db_postgres/km_dbase.h index ad05f54..531ec59 100644 --- a/modules/db_postgres/km_dbase.h +++ b/modules/db_postgres/km_dbase.h @@ -31,8 +31,8 @@ * Module: \ref db_postgres */ -#ifndef DBASE_H -#define DBASE_H +#ifndef KM_DBASE_H +#define KM_DBASE_H #include "../../db/db_con.h" #include "../../db/db_res.h" @@ -110,4 +110,4 @@ int db_postgres_fetch_result(const db_con_t* _h, db_res_t** _r, const int nrows) int db_postgres_use_table(db_con_t* _h, const str* _t); -#endif /* DBASE_H */ +#endif /* KM_DBASE_H */ diff --git a/modules/db_postgres/km_pg_con.h b/modules/db_postgres/km_pg_con.h index c7cf63e..ee46846 100644 --- a/modules/db_postgres/km_pg_con.h +++ b/modules/db_postgres/km_pg_con.h @@ -31,8 +31,8 @@ * Module: \ref db_mysql */ -#ifndef PG_CON_H -#define PG_CON_H +#ifndef KM_PG_CON_H +#define KM_PG_CON_H #include "../../db/db_pool.h" #include "../../db/db_id.h" @@ -75,4 +75,4 @@ struct pg_con* db_postgres_new_connection(struct db_id* id); */ void db_postgres_free_connection(struct pool_con* con); -#endif /* PG_CON_H */ +#endif /* KM_PG_CON_H */ diff --git a/modules/db_postgres/km_res.h b/modules/db_postgres/km_res.h index 5b2627f..959138e 100644 --- a/modules/db_postgres/km_res.h +++ b/modules/db_postgres/km_res.h @@ -27,8 +27,8 @@ * Module: \ref db_postgres */ -#ifndef DB_PG_RES_H -#define DB_PG_RES_H +#ifndef KM_RES_H +#define KM_RES_H #include "../../db/db_row.h" diff --git a/modules/db_postgres/km_val.h b/modules/db_postgres/km_val.h index cbee53a..6e0b253 100644 --- a/modules/db_postgres/km_val.h +++ b/modules/db_postgres/km_val.h @@ -26,8 +26,8 @@ * Module: \ref db_postgres */ -#ifndef DB_PG_VAL_H -#define DB_PG_VAL_H +#ifndef KM_VAL_H +#define KM_VAL_H int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l);

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