sr-dev

sr-dev@lists.kamailio.org

17 participants
44127 discussions

git:janakj/bdb: Add function bdb_time2str

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: c8928bf3a707be39b59176ec64dcd7a3951c1f10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c8928bf… Author: Will Quan <wiquan(a)employees.org> Committer: Will Quan <wiquan(a)employees.org> Date: Wed Nov 7 17:32:35 2007 +0000 Add function bdb_time2str git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3049 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/bdb_val.c | 43 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/bdb_val.c b/modules/db_berkeley/bdb_val.c index b030ec6..c1330c9 100644 --- a/modules/db_berkeley/bdb_val.c +++ b/modules/db_berkeley/bdb_val.c @@ -35,6 +35,47 @@ #include "bdb_val.h" #include <string.h> +/** + * A copy of db_ut::db_time2str EXCEPT does not wrap the date in single-quotes + * + * Convert a time_t value to string (w.o single-quote) + * \param _v source value + * \param _s target string + * \param _l available length and target length + * \return -1 on error, 0 on success + * \todo This functions add quotes to the time value. This + * should be done in the val2str function, as some databases + * like db_berkeley don't need or like this at all. + */ +inline int bdb_time2str(time_t _v, char* _s, int* _l) +{ + struct tm* t; + int l; + + if ((!_s) || (!_l) || (*_l < 2)) { + LM_ERR("Invalid parameter value\n"); + return -1; + } + +// *_s++ = '\''; + + /* Convert time_t structure to format accepted by the database */ + t = localtime(&_v); + l = strftime(_s, *_l -1, "%Y-%m-%d %H:%M:%S", t); + + if (l == 0) { + LM_ERR("Error during time conversion\n"); + /* the value of _s is now unspecified */ + _s = NULL; + _l = 0; + return -1; + } + *_l = l; + +// *(_s + l) = '\''; +// *_l = l + 2; + return 0; +} /** * Does not copy strings @@ -207,7 +248,7 @@ int bdb_val2str(db_val_t* _v, char* _s, int* _len) break; case DB_DATETIME: - if (db_time2str(VAL_TIME(_v), _s, _len) < 0) { + if (bdb_time2str(VAL_TIME(_v), _s, _len) < 0) { LM_ERR("Error while converting time_t to string\n"); return -6; } else {

15 years, 10 months

git:janakj/bdb: add support for default values on table columns

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 6adec9fa66d6d2b20e0837b4519c734429428394 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6adec9f… Author: Will Quan <wiquan(a)employees.org> Committer: Will Quan <wiquan(a)employees.org> Date: Tue Nov 13 08:13:30 2007 +0000 add support for default values on table columns git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3113 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/bdb_lib.c | 97 ++++++++++++++++++++++++++++++++++++++--- modules/db_berkeley/bdb_lib.h | 3 + 2 files changed, 94 insertions(+), 6 deletions(-) diff --git a/modules/db_berkeley/bdb_lib.c b/modules/db_berkeley/bdb_lib.c index 9c0a386..571ee09 100644 --- a/modules/db_berkeley/bdb_lib.c +++ b/modules/db_berkeley/bdb_lib.c @@ -619,7 +619,15 @@ table_p bdblib_create_table(database_p _db, str *_s) LM_ERR("FAILED to load METADATA COLS in table: %s.\n", tblname); goto error; } - + + /*initialize columns default values from metadata*/ + rc = load_metadata_defaults(tp); + if(rc!=0) + { + LM_ERR("FAILED to load METADATA DEFAULTS in table: %s.\n", tblname); + goto error; + } + rc = load_metadata_keys(tp); if(rc!=0) { @@ -937,6 +945,81 @@ int load_metadata_logflags(table_p _tp) return 0; } +int load_metadata_defaults(table_p _tp) +{ + int ret,n,len; + char dbuf[MAX_ROW_SIZE]; + char *s = NULL; + char cv[64]; + DB *db = NULL; + DBT key, data; + column_p col; + ret = n = len = 0; + + if(!_tp || !_tp->db) + return -1; + + db = _tp->db; + memset(&key, 0, sizeof(DBT)); + memset(&data, 0, sizeof(DBT)); + memset(dbuf, 0, MAX_ROW_SIZE); + + key.data = METADATA_DEFAULTS; + key.size = strlen(METADATA_DEFAULTS); + + /*memory for the result*/ + data.data = dbuf; + data.ulen = MAX_ROW_SIZE; + data.flags = DB_DBT_USERMEM; + + if ((ret = db->get(db, NULL, &key, &data, 0)) != 0) + { +#ifdef BDB_EXTRA_DEBUG + LM_DBG("NO DEFAULTS ; SETTING ALL columns to NULL! \n" ); +#endif + + /*no defaults in DB; make some up.*/ + for(n=0; n<_tp->ncols; n++) + { + col = _tp->colp[n]; + if( col ) + { /*set all columns default value to 'NULL' */ + len = strlen("NULL"); + col->dv.s = (char*)pkg_malloc(len * sizeof(char)); + memcpy(col->dv.s, "NULL", len); + col->dv.len = len; + } + } + return 0; + } + + /* use the defaults provided*/ + s = strtok(dbuf, DELIM); + while(s!=NULL && n< _tp->ncols) + { ret = sscanf(s,"%s", cv); + if(ret != 1) return -1; + col = _tp->colp[n]; + if( col ) + { /*set column default*/ + len = strlen(s); + col->dv.s = (char*)pkg_malloc(len * sizeof(char)); + memcpy(col->dv.s, cv, len); + col->dv.len = len; +#ifdef BDB_EXTRA_DEBUG + LM_DBG("COLUMN DEFAULT is %.*s for column[%.*s] \n" + , col->dv.len , ZSW(col->dv.s) + , col->name.len , ZSW(col->name.s) + ); +#endif + + } + n++; + s=strtok(NULL, DELIM); + } + + return 0; +} + /*creates a composite key _k of length _klen from n values of _v; provide your own initialized memory for target _k and _klen; @@ -1086,23 +1169,24 @@ int bdblib_valtochar(table_p _tp, int* _lres, char* _k, int* _klen, db_val_t* _v } /* - NO KEY provided; append a 'NULL' value since i - is considered a key according to our schema. + NO KEY provided; use the column default value (dv) + i.e _tp->colp[i]->dv */ #ifdef BDB_EXTRA_DEBUG - LM_DBG("Missing KEY[%i]: %.*s.%.*s \n", i + LM_DBG("Missing KEY[%i]: %.*s.%.*s using default [%.*s] \n", i , _tp->name.len , ZSW(_tp->name.s) , _tp->colp[i]->name.len, ZSW(_tp->colp[i]->name.s) + , _tp->colp[i]->dv.len , ZSW(_tp->colp[i]->dv.s) ); #endif - len = strlen(cNULL); + len = _tp->colp[i]->dv.len; sum += len; if(sum > total) { LM_ERR("Destination buffer too short for subval %s\n",cNULL); return -5; } - strncpy(p, cNULL, len); + strncpy(p, _tp->colp[i]->dv.s, len); p += len; *_klen = sum; @@ -1195,6 +1279,7 @@ int tbl_free(table_p _tp) for(i=0;i<_tp->ncols;i++) { if(_tp->colp[i]) { pkg_free(_tp->colp[i]->name.s); + pkg_free(_tp->colp[i]->dv.s); pkg_free(_tp->colp[i]); } } diff --git a/modules/db_berkeley/bdb_lib.h b/modules/db_berkeley/bdb_lib.h index 399d495..533b111 100644 --- a/modules/db_berkeley/bdb_lib.h +++ b/modules/db_berkeley/bdb_lib.h @@ -54,6 +54,7 @@ #define METADATA_KEY "METADATA_KEY" #define METADATA_READONLY "METADATA_READONLY" #define METADATA_LOGFLAGS "METADATA_LOGFLAGS" +#define METADATA_DEFAULTS "METADATA_DEFAULTS" /*journal logging flag masks */ #define JLOG_NONE 0 @@ -79,6 +80,7 @@ typedef struct _row typedef struct _column { str name; + str dv; /* default value */ int type; int flag; } column_t, *column_p; @@ -142,6 +144,7 @@ int load_metadata_columns(table_p _tp); int load_metadata_keys(table_p _tp); int load_metadata_readonly(table_p _tp); int load_metadata_logflags(table_p _tp); +int load_metadata_defaults(table_p _tp); int bdblib_valtochar(table_p _tp, int* _lres, char* _k, int* _klen, db_val_t* _v, int _n, int _ko);

15 years, 10 months

git:janakj/bdb: Moved definition of STANDARD_TABLES, EXTRA_TABLES, PRESENCE_TABLES to openserdbctl.base.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 16f4fa3431d64dcaec7e3cbc2a46531fecfc9eb5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16f4fa3… Author: Will Quan <wiquan(a)employees.org> Committer: Will Quan <wiquan(a)employees.org> Date: Wed Nov 28 20:34:07 2007 +0000 Moved definition of STANDARD_TABLES, EXTRA_TABLES, PRESENCE_TABLES to openserdbctl.base. Add tables 'dispatcher' and 'dialog' to list of STANDARD_TABLES (Patch provided from Ovidiu Sas). Modified bdb_lib::bdblib_create_table to return error if the table does not exist. These are all fixes for Bug# 1836601: db_berkeley don't work git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3227 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/bdb_lib.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/db_berkeley/bdb_lib.c b/modules/db_berkeley/bdb_lib.c index 54ee975..8b9f37f 100644 --- a/modules/db_berkeley/bdb_lib.c +++ b/modules/db_berkeley/bdb_lib.c @@ -543,6 +543,20 @@ void bdblib_log(int op, table_p _tp, char* _msg, int len) } /** + * The function is called to create a handle to a db table. + * + * On startup, we do not create any of the db handles. + * Instead it is done on first-use (lazy-initialized) to only create handles to + * files (db) that we require. + * + * There is one db file per openser table (eg. acc), and they should exist + * in your DB_PATH (refer to openserctlrc) directory. + * + * This function does _not_ create the underlying binary db tables. + * Creating the tables MUST be manually performed before + * openser startup by 'openserdbctl create' + * + * Function returns NULL on error, which will cause openser to exit. * */ table_p bdblib_create_table(database_p _db, str *_s) @@ -581,12 +595,12 @@ table_p bdblib_create_table(database_p _db, str *_s) LM_DBG("CREATE TABLE = %s\n", tblname); #endif - flags = DB_CREATE | DB_THREAD; + flags = DB_THREAD; if ((rc = bdb->open(bdb, NULL, tblname, NULL, DB_HASH, flags, 0664)) != 0) { _db->dbenv->err(_db->dbenv, rc, "DB->open: %s", tblname); - LM_ERR("bdb open: %s.\n",db_strerror(rc)); + LM_ERR("bdb open failed: %s.\n",db_strerror(rc)); pkg_free(tp); return NULL; }

15 years, 10 months

git:janakj/bdb: - output the database location on startup

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: e8503e72fe7355ccd8c61b9995ff95853ca8655b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8503e7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 22 18:09:46 2007 +0000 - output the database location on startup git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3200 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/db_berkeley.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/db_berkeley.c b/modules/db_berkeley/db_berkeley.c index f5e755f..b4ccc7c 100644 --- a/modules/db_berkeley/db_berkeley.c +++ b/modules/db_berkeley/db_berkeley.c @@ -186,7 +186,8 @@ db_con_t* bdb_init(const char* _sqlurl) } memset(_res, 0, sizeof(db_con_t) + sizeof(bdb_con_t)); _res->tail = (unsigned long)((char*)_res+sizeof(db_con_t)); - + + LM_INFO("using database at: %.*s", _s.len, _s.s); BDB_CON_CONNECTION(_res) = bdblib_get_db(&_s); if (!BDB_CON_CONNECTION(_res)) {

15 years, 10 months

git:janakj/bdb: - improve error msg on startup like in commit r3205 for dbtext

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 4921fa7934feb93395ccfdd62b8711f7458a82c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4921fa7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 26 13:22:51 2007 +0000 - improve error msg on startup like in commit r3205 for dbtext git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3207 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/bdb_lib.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/bdb_lib.c b/modules/db_berkeley/bdb_lib.c index 571ee09..54ee975 100644 --- a/modules/db_berkeley/bdb_lib.c +++ b/modules/db_berkeley/bdb_lib.c @@ -366,7 +366,8 @@ database_p bdblib_get_db(str *_s) if( !_cachedb) { - LM_ERR("_cachedb is not initialized!\n"); + LM_ERR("db_berkeley cache is not initialized! Check if you loaded db_berkeley " + "before any other module that uses it.\n"); return NULL; }

15 years, 10 months

git:janakj/bdb: - all README files regenerated from SGML

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 9f09b49795152d89d1aaa7175977d45886d28658 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f09b49… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Committer: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Thu Dec 13 10:43:52 2007 +0000 - all README files regenerated from SGML git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3351 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/README | 599 +++++++++++++++++++++++--------------------- 1 files changed, 312 insertions(+), 287 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9f0…

15 years, 10 months

git:master: Database flags renamed from DB_* to SRDB_* to avoid conflicts.

by Jan Janak

Module: sip-router Branch: master Commit: 83d38c79ed890f96a057da65bd6625d3963aa300 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83d38c7… 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, 10 months

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

by Jan Janak

Module: sip-router Branch: janakj/oracle Commit: 23f036db07bc32a7e2ca4ab96902c2f4335f63bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23f036d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 14:35:34 2009 +0100 Merge branch 'master' of ssh://git.sip-router.org/sip-router into oracle * 'master' of ssh://git.sip-router.org/sip-router: libsrdb1: futex warning fix - port from kamailio trunk, r5607 - sync transformations add/lookup with kamailio init_mi_core() exported via mi.h mi include file MI: core part script parsing: while support script engine: while() support script engine: switch() and break execution script engine: switch() fixup and optimizations script parsing: C style switch() & case support expr engine: minor additions ---

15 years, 10 months

git:janakj/oracle: Make the oracle module compile in the sip-router tree.

by Jan Janak

Module: sip-router Branch: janakj/oracle Commit: ba1086ac94b5080eb33a3f822a771c3f039b6499 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba1086a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 14:22:38 2009 +0100 Make the oracle module compile in the sip-router tree. Changes include: * Add -DSER_MOD_INTERFACE to Makefile * Link with libsrdb2 * Change relative paths to SER header files. --- modules/db_oracle/Makefile | 5 ++++- modules/db_oracle/ora_cmd.c | 2 +- modules/db_oracle/ora_cmd.h | 4 ++-- modules/db_oracle/ora_con.h | 8 ++++---- modules/db_oracle/ora_fld.c | 2 +- modules/db_oracle/ora_fld.h | 4 ++-- modules/db_oracle/ora_res.c | 2 +- modules/db_oracle/ora_res.h | 4 ++-- modules/db_oracle/ora_uri.c | 2 +- modules/db_oracle/ora_uri.h | 4 ++-- 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/modules/db_oracle/Makefile b/modules/db_oracle/Makefile index c47726c..d9f2c79 100644 --- a/modules/db_oracle/Makefile +++ b/modules/db_oracle/Makefile @@ -14,7 +14,10 @@ ORACLE_INCLUDES = $(ORACLE_ROOT)/rdbms/public # ORACLE_LIBS = $(ORACLE_ROOT) # ORACLE_INCLUDES = $(ORACLE_ROOT)/sdk/include -DEFS += -I$(ORACLE_INCLUDES) +DEFS += -DSER_MOD_INTERFACE -I$(ORACLE_INCLUDES) LIBS += -L$(ORACLE_LIBS) -lclntsh +SERLIBPATH=../../lib +SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 + include ../../Makefile.modules diff --git a/modules/db_oracle/ora_cmd.c b/modules/db_oracle/ora_cmd.c index c3a1883..e558cac 100644 --- a/modules/db_oracle/ora_cmd.c +++ b/modules/db_oracle/ora_cmd.c @@ -41,7 +41,7 @@ #include "../../mem/mem.h" #include "../../str.h" -#include "../../db/db_cmd.h" +#include "../../lib/srdb2/db_cmd.h" #include "../../ut.h" #include <strings.h> diff --git a/modules/db_oracle/ora_cmd.h b/modules/db_oracle/ora_cmd.h index df6d99e..4c1a44a 100644 --- a/modules/db_oracle/ora_cmd.h +++ b/modules/db_oracle/ora_cmd.h @@ -29,8 +29,8 @@ #ifndef _ORA_CMD_H_ #define _ORA_CMD_H_ -#include "../../db/db_drv.h" -#include "../../db/db_cmd.h" +#include "../../lib/srdb2/db_drv.h" +#include "../../lib/srdb2/db_cmd.h" #include <oci.h> #include <stdarg.h> #include "ora_con.h" diff --git a/modules/db_oracle/ora_con.h b/modules/db_oracle/ora_con.h index 89b62c3..52f3568 100644 --- a/modules/db_oracle/ora_con.h +++ b/modules/db_oracle/ora_con.h @@ -29,10 +29,10 @@ #ifndef _ORA_CON_H_ #define _ORA_CON_H_ -#include "../../db/db_pool.h" -#include "../../db/db_con.h" -#include "../../db/db_fld.h" -#include "../../db/db_uri.h" +#include "../../lib/srdb2/db_pool.h" +#include "../../lib/srdb2/db_con.h" +#include "../../lib/srdb2/db_fld.h" +#include "../../lib/srdb2/db_uri.h" #include <oci.h> diff --git a/modules/db_oracle/ora_fld.c b/modules/db_oracle/ora_fld.c index c87f946..69f0047 100644 --- a/modules/db_oracle/ora_fld.c +++ b/modules/db_oracle/ora_fld.c @@ -30,7 +30,7 @@ #include "../../mem/mem.h" #include "../../dprint.h" -#include "../../db/db_gen.h" +#include "../../lib/srdb2/db_gen.h" #include <string.h> diff --git a/modules/db_oracle/ora_fld.h b/modules/db_oracle/ora_fld.h index 4669307..5a3979d 100644 --- a/modules/db_oracle/ora_fld.h +++ b/modules/db_oracle/ora_fld.h @@ -33,8 +33,8 @@ * @{ */ -#include "../../db/db_drv.h" -#include "../../db/db_fld.h" +#include "../../lib/srdb2/db_drv.h" +#include "../../lib/srdb2/db_fld.h" #include <oci.h> typedef struct ora_fld { diff --git a/modules/db_oracle/ora_res.c b/modules/db_oracle/ora_res.c index fe59348..3232726 100644 --- a/modules/db_oracle/ora_res.c +++ b/modules/db_oracle/ora_res.c @@ -32,7 +32,7 @@ #include "../../mem/mem.h" #include "../../dprint.h" -#include "../../db/db_gen.h" +#include "../../lib/srdb2/db_gen.h" #include <oci.h> diff --git a/modules/db_oracle/ora_res.h b/modules/db_oracle/ora_res.h index f3b0ea7..af9fadb 100644 --- a/modules/db_oracle/ora_res.h +++ b/modules/db_oracle/ora_res.h @@ -29,8 +29,8 @@ #ifndef _ORA_RES_H_ #define _ORA_RES_H_ -#include "../../db/db_drv.h" -#include "../../db/db_res.h" +#include "../../lib/srdb2/db_drv.h" +#include "../../lib/srdb2/db_res.h" typedef struct _ora_res { db_drv_t gen; diff --git a/modules/db_oracle/ora_uri.c b/modules/db_oracle/ora_uri.c index 13901b1..7ecc30c 100644 --- a/modules/db_oracle/ora_uri.c +++ b/modules/db_oracle/ora_uri.c @@ -33,7 +33,7 @@ #include "../../dprint.h" #include "../../mem/mem.h" #include "../../ut.h" -#include "../../db/db_gen.h" +#include "../../lib/srdb2/db_gen.h" #include <stdlib.h> #include <string.h> diff --git a/modules/db_oracle/ora_uri.h b/modules/db_oracle/ora_uri.h index 248b9a2..905e286 100644 --- a/modules/db_oracle/ora_uri.h +++ b/modules/db_oracle/ora_uri.h @@ -31,8 +31,8 @@ #ifndef _ORA_URI_H_ #define _ORA_URI_H_ -#include "../../db/db_uri.h" -#include "../../db/db_drv.h" +#include "../../lib/srdb2/db_uri.h" +#include "../../lib/srdb2/db_drv.h" typedef struct _ora_uri_t { db_drv_t drv;

15 years, 10 months

git:janakj/oracle: Updated for database interface version 2.0.

by Jan Janak

Module: sip-router Branch: janakj/oracle Commit: e5b25b9f612f9b89c70d7da8e2b5cf5e8d133ff3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5b25b9… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 14:05:01 2009 +0100 Updated for database interface version 2.0. --- modules/db_oracle/dbase.c | 1193 ------------------------ modules/db_oracle/dbase.h | 104 --- modules/db_oracle/ora_cmd.c | 1273 ++++++++++++++++++++++++++ modules/db_oracle/ora_cmd.h | 80 ++ modules/db_oracle/ora_con.c | 273 ++++++ modules/db_oracle/ora_con.h | 104 +++ modules/db_oracle/{prepare.h => ora_fld.c} | 61 +- modules/db_oracle/{common.h => ora_fld.h} | 48 +- modules/db_oracle/{prepare.h => ora_res.c} | 69 +- modules/db_oracle/{utils.h => ora_res.h} | 25 +- modules/db_oracle/ora_uri.c | 282 ++++++ modules/db_oracle/{utils.h => ora_uri.h} | 33 +- modules/db_oracle/{db_mod.c => oracle_mod.c} | 31 +- modules/db_oracle/prepare.c | 450 --------- modules/db_oracle/utils.c | 166 ---- 15 files changed, 2165 insertions(+), 2027 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e5b…

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