sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:master: Database flags renamed from DB_* to SRDB_* to avoid conflicts.
by Jan Janak 15 Feb '09

15 Feb '09

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;

1 0

git:janakj/oracle: Merge branch 'master' of ssh://git.sip-router.org/ sip-router into oracle
by Jan Janak 15 Feb '09

15 Feb '09

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 ---

1 0

git:janakj/oracle: Rename the module to db_oracle.
by Jan Janak 15 Feb '09

15 Feb '09

Module: sip-router Branch: janakj/oracle Commit: 4f27fa8f47e869f66fe46a5c49854f2860149258 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f27fa8… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 14:24:33 2009 +0100 Rename the module to db_oracle. --- modules/db_oracle/Makefile | 2 +- modules/db_oracle/oracle_mod.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_oracle/Makefile b/modules/db_oracle/Makefile index d9f2c79..662e301 100644 --- a/modules/db_oracle/Makefile +++ b/modules/db_oracle/Makefile @@ -4,7 +4,7 @@ include ../../Makefile.defs auto_gen = -NAME = oracle.so +NAME = db_oracle.so ORACLE_ROOT = /usr/lib/oracle/xe/app/oracle/product/10.2.0/client ORACLE_LIBS = $(ORACLE_ROOT)/lib diff --git a/modules/db_oracle/oracle_mod.c b/modules/db_oracle/oracle_mod.c index 1ea736e..4315de7 100644 --- a/modules/db_oracle/oracle_mod.c +++ b/modules/db_oracle/oracle_mod.c @@ -64,7 +64,7 @@ static cmd_export_t cmds[] = { struct module_exports exports = { - "oracle", + "db_oracle", cmds, 0, /* module paramers */

1 0

git:janakj/oracle: Get rid of compilation warnings emitted by
by Jan Janak 15 Feb '09

15 Feb '09

Module: sip-router Branch: janakj/oracle Commit: e6a00020f37ffef7f4e9a43baaaa2cf90885848c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6a0002… Author: Dmitry Semyonov <dsemyonov(a)dins.ru> Committer: Dmitry Semyonov <dsemyonov(a)dins.ru> Date: Sun Mar 11 18:55:24 2007 +0000 Get rid of compilation warnings emitted by gcc (GCC) 4.1.2 20061115 (prerelease) (Debian 4.1.1-21). --- modules/db_oracle/dbase.c | 119 ++++++++++++++++++++++----------------------- modules/db_oracle/dbase.h | 23 +++++++-- 2 files changed, 78 insertions(+), 64 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e6a…

1 0

git:janakj/oracle: - oracle module moved from experimental to the main tree
by Jan Janak 15 Feb '09

15 Feb '09

Module: sip-router Branch: janakj/oracle Commit: 9cdb3c3997c66e04a447bf6ba19d7d3ef7ff67e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cdb3c3… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Feb 16 15:35:16 2007 +0000 - oracle module moved from experimental to the main tree - libs and includes configured to match locations provided by oracle-xe-client package (the original paths are commented) - removed redefinition of ERR and DBG - fixed tracker location in common.h ---

1 0

git:janakj/oracle: Merge commit 'or/cvshead' into oracle
by Jan Janak 15 Feb '09

15 Feb '09

Module: sip-router Branch: janakj/oracle Commit: f25b29befa559e3fb58c64a54fa43a550e269a3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f25b29b… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 13:57:41 2009 +0100 Merge commit 'or/cvshead' into oracle * commit 'or/cvshead': Get rid of compilation warnings emitted by - oracle module moved from experimental to the main tree ---

1 0

git:janakj/oracle: Updated for database interface version 2.0.
by Jan Janak 15 Feb '09

15 Feb '09

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…

1 0

git:janakj/oracle: Make the oracle module compile in the sip-router tree.
by Jan Janak 15 Feb '09

15 Feb '09

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;

1 0

git:master: Merge commit 'origin/andrei/switch'
by Andrei Pelinescu-Onciul 13 Feb '09

13 Feb '09

Module: sip-router Branch: master Commit: bc7640b2368af50880b7d11c8ee6052e78bb5ef1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc7640b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 13 17:36:55 2009 +0100 Merge commit 'origin/andrei/switch' * commit 'origin/andrei/switch': 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 ---

1 0

git:master: Merge commit 'origin/daniel/pv'
by Andrei Pelinescu-Onciul 13 Feb '09

13 Feb '09

Module: sip-router Branch: master Commit: 7f9af44626a08f8b2da5d42d398c00db4d4d56a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f9af44… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 13 17:34:40 2009 +0100 Merge commit 'origin/daniel/pv' * commit 'origin/daniel/pv': - sync transformations add/lookup with kamailio init_mi_core() exported via mi.h mi include file MI: core part ---

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009