sr-dev

sr-dev@lists.kamailio.org

10 participants
43544 discussions

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

git:janakj/postgres: Jan's changes, his comments:

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 61ee30f2de9138dae297d0b740e5879357e1145a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61ee30f… Author: Greg Fausak <lgfausak(a)august.net> Committer: Greg Fausak <lgfausak(a)august.net> Date: Sun Feb 8 15:30:59 2004 +0000 Jan's changes, his comments: Attached patch makes postgres module in the unstable branch compile and load again (it didn't compile because of some changes I did a couple days ago). The changes are cosmetic only. I did verify that the code compiled in the current branch. I did not test this version. --- modules/db_postgres/con_postgres.h | 2 ++ modules/db_postgres/db_con.c | 2 +- modules/db_postgres/db_mod.c | 1 + modules/db_postgres/db_res.c | 1 + 4 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/con_postgres.h b/modules/db_postgres/con_postgres.h index dbf3211..5de0aee 100644 --- a/modules/db_postgres/con_postgres.h +++ b/modules/db_postgres/con_postgres.h @@ -46,6 +46,7 @@ * Postgres specific connection data */ struct con_postgres { + int connected; char *sqlurl; /* the url we are connected to, all connection memory parents from this */ PGconn *con; /* this is the postgres connection */ @@ -60,6 +61,7 @@ struct con_postgres { #define CON_CONNECTION(db_con) (((struct con_postgres*)((db_con)->tail))->con) #define CON_FP(db_con) (((struct con_postgres*)((db_con)->tail))->fp) #define CON_PID(db_con) (((struct con_postgres*)((db_con)->tail))->tpid) +#define CON_CONNECTED(db_con) (((struct con_postgres*)((db_con)->tail))->connected) #define PLOG(f,s) LOG(L_ERR, "PG[%d] %s %s\n",__LINE__,f,s) #define DLOG(f,s) LOG(L_INFO, "PG[%d] %s %s\n",__LINE__,f,s) diff --git a/modules/db_postgres/db_con.c b/modules/db_postgres/db_con.c index 5ee03d1..52a4fe1 100644 --- a/modules/db_postgres/db_con.c +++ b/modules/db_postgres/db_con.c @@ -37,12 +37,12 @@ */ #include <string.h> -#include "../../db/db_con.h" #include "../../dprint.h" #include "../../mem/mem.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 c53bddf..8d7b124 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -35,6 +35,7 @@ #include <stdio.h> #include "../../sr_module.h" +#include "db_con.h" #include "dbase.h" MODULE_VERSION diff --git a/modules/db_postgres/db_res.c b/modules/db_postgres/db_res.c index d9ac598..d8be1d7 100644 --- a/modules/db_postgres/db_res.c +++ b/modules/db_postgres/db_res.c @@ -38,6 +38,7 @@ #include <stdlib.h> #include "../../db/db_res.h" +#include "../../db/db_con.h" #include "../../dprint.h" #include "../../mem/mem.h" #include "defs.h"

15 years, 8 months

git:janakj/postgres: Changes to compile under debian.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 45ef7444a62254cf48b3c9754a3bf429a6a8a766 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45ef744… Author: Greg Fausak <lgfausak(a)august.net> Committer: Greg Fausak <lgfausak(a)august.net> Date: Wed Jul 30 16:29:00 2003 +0000 Changes to compile under debian. Also, MODULE_VERSION now creates an error condition instead of a warning, so it is needed for the postgres version of the code to run. These changes came from Alex Mayrhofer, checked in by me. --- modules/db_postgres/Makefile | 2 +- modules/db_postgres/db_mod.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 5dae7f9..ce55adf 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -7,7 +7,7 @@ auto_gen= NAME=postgres.so # libpq-fe.h locations -DEFS +=-I/usr/local/pgsql/include +DEFS +=-I/usr/local/pgsql/include -I/usr/include/postgresql LIBS=-L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -L/usr/pkg/lib \ -L/usr/pkg/lib/pgsql -lpq diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index 1240429..73f4def 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -37,6 +37,7 @@ #include "../../sr_module.h" #include "dbase.h" +MODULE_VERSION static int mod_init(void);

15 years, 8 months

git:janakj/postgres: Fixed startup crash -- applied slightly modified patch from

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 1ba3b94ffcc88bed5926e251f1aaf534d51ff6e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ba3b94… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Apr 25 15:24:06 2004 +0000 Fixed startup crash -- applied slightly modified patch from Alexander Mayrhofer <axelm(a)nic.at> --- modules/db_postgres/dbase.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/dbase.c b/modules/db_postgres/dbase.c index 24b7e80..253fe8d 100644 --- a/modules/db_postgres/dbase.c +++ b/modules/db_postgres/dbase.c @@ -240,8 +240,10 @@ db_con_t *db_init(const char* _sqlurl) /* ** this is the root memory for this database connection. */ - res = aug_alloc(sizeof(db_con_t) + sizeof(struct con_postgres), NULL); - memset(res, 0, sizeof(db_con_t) + sizeof(struct con_postgres)); + res = aug_alloc(sizeof(db_con_t), 0); + memset(res, 0, sizeof(db_con_t)); + (struct con_postgres*)res->tail = aug_alloc(sizeof(struct con_postgres), (char*)res); + memset((struct con_postgres*)res->tail, 0, sizeof(struct con_postgres)); if (connect_db(res, _sqlurl) < 0) {

15 years, 8 months

git:janakj/postgres: Add $(LOCALBASE)/ include into headers search path and $(LOCALBASE)/lib into

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 13f4e9799b7adadc90b9f33b69c5bceb70d550bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13f4e97… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Committer: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Tue Apr 13 09:05:16 2004 +0000 Add $(LOCALBASE)/include into headers search path and $(LOCALBASE)/lib into libs search path to make postgres compiling on FreeBSD. --- modules/db_postgres/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index ce55adf..56bced5 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -7,8 +7,8 @@ auto_gen= NAME=postgres.so # libpq-fe.h locations -DEFS +=-I/usr/local/pgsql/include -I/usr/include/postgresql -LIBS=-L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -L/usr/pkg/lib \ +DEFS +=-I$(LOCALBASE)/include -I/usr/local/pgsql/include -I/usr/include/postgresql +LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -L/usr/pkg/lib \ -L/usr/pkg/lib/pgsql -lpq include ../../Makefile.modules

15 years, 8 months

git:janakj/postgres: - sql:// changed to mysql:// in all modules

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: d357fdbcfa406c4f4b167170207c3120d0f8007e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d357fdb… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Nov 3 13:03:56 2003 +0000 - sql:// changed to mysql:// in all modules --- modules/db_postgres/dbase.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/dbase.c b/modules/db_postgres/dbase.c index 8262df6..24b7e80 100644 --- a/modules/db_postgres/dbase.c +++ b/modules/db_postgres/dbase.c @@ -115,7 +115,7 @@ static int connect_db(db_con_t* _h, const char* _db_url) /* ** get the connection parameters parsed from the db_url string - ** it looks like: sql://username:userpass@dbhost:dbport/dbname + ** it looks like: postgres://username:userpass@dbhost:dbport/dbname ** username/userpass : name and password for the database ** dbhost : the host name or ip address hosting the database ** dbport : the port to connect to database on

15 years, 8 months

git:janakj/bdb: Fixed wrong order of directives in modules Makefile.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 986445fbfdfd58dfb21992a9a098adda3be7a396 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=986445f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 15:54:00 2009 +0100 Fixed wrong order of directives in modules Makefile. Some of the directives in the Makefile of the module were listed in a wrong order and as a result they had no effect. --- modules/db_berkeley/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/db_berkeley/Makefile b/modules/db_berkeley/Makefile index 5671867..851d961 100644 --- a/modules/db_berkeley/Makefile +++ b/modules/db_berkeley/Makefile @@ -4,6 +4,9 @@ # # # WARNING: do not run this directly, it should be run by the master Makefile +include ../../Makefile.defs +auto_gen= +NAME=db_berkeley.so # extra debug messages # -DBDB_EXTRA_DEBUG is optional @@ -11,9 +14,6 @@ DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \ -I$(SYSBASE)/include -include ../../Makefile.defs -auto_gen= -NAME=db_berkeley.so LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb include ../../Makefile.modules

15 years, 8 months

git:janakj/bdb: Module db_berkeley updated to database api version 2.0.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 894ead1c6e50a3284aeb410842f023e295b953be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=894ead1… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 15:14:45 2009 +0100 Module db_berkeley updated to database api version 2.0. --- modules/db_berkeley/Makefile | 2 +- modules/db_berkeley/bdb_cmd.c | 572 +++++++++++++++++ modules/db_berkeley/bdb_cmd.h | 93 +++ modules/db_berkeley/bdb_con.c | 178 ++++++ modules/db_berkeley/bdb_con.h | 92 +++ modules/db_berkeley/bdb_fld.c | 78 +++ modules/db_berkeley/bdb_fld.h | 64 ++ modules/db_berkeley/bdb_lib.c | 895 +++++++++++++++----------- modules/db_berkeley/bdb_lib.h | 122 +++-- modules/db_berkeley/bdb_mi.c | 63 -- modules/db_berkeley/bdb_mi.h | 36 - modules/db_berkeley/bdb_mod.c | 121 ++++ modules/db_berkeley/bdb_res.c | 555 ++--------------- modules/db_berkeley/bdb_res.h | 54 +-- modules/db_berkeley/bdb_uri.c | 164 +++++ modules/db_berkeley/bdb_uri.h | 65 ++ modules/db_berkeley/bdb_util.c | 55 -- modules/db_berkeley/bdb_util.h | 39 -- modules/db_berkeley/bdb_val.c | 286 --------- modules/db_berkeley/bdb_val.h | 42 -- modules/db_berkeley/db_berkeley.c | 1262 ------------------------------------- modules/db_berkeley/db_berkeley.h | 96 --- 22 files changed, 2085 insertions(+), 2849 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=894…

15 years, 8 months

git:janakj/bdb: Merge commit 'berkeley/trunk' into bdb

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: f1b7917b954c7d8b34c688212b01d04096ea5cfc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1b7917… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 15:08:43 2009 +0100 Merge commit 'berkeley/trunk' into bdb * commit 'berkeley/trunk': (41 commits) - unify common rows and row allocation functionality in the DB API core - fix compilation on OpenBSD, related to missing includes paths and wrong - disable big integer (DB_BIGINT) support for non SQL DB modules for now - remove not reached return statement at the end of val2str functions - fix link entity names, patch from Carsten Gross - port from opensips r4526, credits goes to bogdan - renamed: bdb_recover -> kambdb_recover - regenerated all READMEs (make modules-readme exclude_modules="") - renaming: changed entities in documentation - renaming: openser -> kamailio - renaming scripts part 1 - fix some FAQ entries, change missing entity, regenerate READMEs - change name in copyright headers - fix unnecessary module library links, related to #1855859 - titles for admin, devel and faq chapters are defined via entities for coherence and easier management - updated some old entity names - content of faq removed (mistakenly added by me after Henning did the cleanup for modules' docs; rev 3839) - entity &user; replaced with &admin; to obey naming structure (entities to be replaced by xinclude); updated obsolete address tags - step 2 for the rest of modules to re-link history from sgml to xml files - step 1 for the rest of modules to re-link history from sgml to xml files ... ---

15 years, 8 months

git:janakj/bdb: Database flags renamed from DB_* to SRDB_* to avoid conflicts.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 54c0157e62003e2cef71f505bb55bfb2a07100e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54c0157… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 15:43:44 2009 +0100 Database flags renamed from DB_* to SRDB_* to avoid conflicts. The header files of Berkeley DB define constants whose names clash with the constants defined in lib/srdb/db.h. We renamed our constants to avoid the conflict. --- lib/srdb2/db.h | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/srdb2/db.h b/lib/srdb2/db.h index 80459b8..b93f483 100644 --- a/lib/srdb2/db.h +++ b/lib/srdb2/db.h @@ -52,20 +52,20 @@ extern "C" { /* * Various database flags shared by modules */ -#define DB_LOAD_SER (1 << 0) /* The row should be loaded by SER */ -#define DB_DISABLED (1 << 1) /* The row is disabled */ -#define DB_CANON (1 << 2) /* Canonical entry (domain or uri) */ -#define DB_IS_TO (1 << 3) /* The URI can be used in To */ -#define DB_IS_FROM (1 << 4) /* The URI can be used in From */ -#define DB_FOR_SERWEB (1 << 5) /* Credentials instance can be used by serweb */ -#define DB_PENDING (1 << 6) -#define DB_DELETED (1 << 7) -#define DB_CALLER_DELETED (1 << 8) /* Accounting table */ -#define DB_CALLEE_DELETED (1 << 9) /* Accounting table */ -#define DB_MULTIVALUE (1 << 10) /* Attr_types table */ -#define DB_FILL_ON_REG (1 << 11) /* Attr_types table */ -#define DB_REQUIRED (1 << 12) /* Attr_types table */ -#define DB_DIR (1 << 13) /* Domain_settings table */ +#define SRDB_LOAD_SER (1 << 0) /* The row should be loaded by SER */ +#define SRDB_DISABLED (1 << 1) /* The row is disabled */ +#define SRDB_CANON (1 << 2) /* Canonical entry (domain or uri) */ +#define SRDB_IS_TO (1 << 3) /* The URI can be used in To */ +#define SRDB_IS_FROM (1 << 4) /* The URI can be used in From */ +#define SRDB_FOR_SERWEB (1 << 5) /* Credentials instance can be used by serweb */ +#define SRDB_PENDING (1 << 6) +#define SRDB_DELETED (1 << 7) +#define SRDB_CALLER_DELETED (1 << 8) /* Accounting table */ +#define SRDB_CALLEE_DELETED (1 << 9) /* Accounting table */ +#define SRDB_MULTIVALUE (1 << 10) /* Attr_types table */ +#define SRDB_FILL_ON_REG (1 << 11) /* Attr_types table */ +#define SRDB_REQUIRED (1 << 12) /* Attr_types table */ +#define SRDB_DIR (1 << 13) /* Domain_settings table */ struct db_gen;

15 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev