sr-dev

sr-dev@lists.kamailio.org

16 participants
45408 discussions

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

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: libsrdb1: futex warning fix
by Andrei Pelinescu-Onciul 13 Feb '09

13 Feb '09

Module: sip-router Branch: master Commit: fa825fd0e8fa5c29ded4276a0e021df67a327897 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa825fd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 13 17:28:40 2009 +0100 libsrdb1: futex warning fix - added _BSD_SOURCE define if _XOPEN_SOURCE is manually defined (the _XOPEN_SOURCE define in db_ut.h caused _BSD_SOURCE to be no longer defined in features.h => _USE_MISC not defined => syscall() not declared in unistd.h.) --- lib/srdb1/db_ut.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_ut.h b/lib/srdb1/db_ut.h index 050a75b..9c936df 100644 --- a/lib/srdb1/db_ut.h +++ b/lib/srdb1/db_ut.h @@ -45,6 +45,9 @@ */ #ifndef __OS_solaris #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ + #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect + of the above define on + features.h/unistd.h syscall() */ #else #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif

1 0

git:master: - port from kamailio trunk, r5607
by Henning Westerholt 13 Feb '09

13 Feb '09

Module: sip-router Branch: master Commit: 419a1662194e2b1e51e975d5cc24b83ba910b784 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=419a166… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Feb 13 17:19:11 2009 +0100 - port from kamailio trunk, r5607 - fix a few missing line breaks in debug logs --- lib/trie/dtrie.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 32e6dbd..62e0cc9 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -55,7 +55,7 @@ struct dtrie_node_t *dtrie_init(const unsigned int branches) SHM_MEM_ERROR; return NULL; } - LM_DBG("allocate %lu bytes for root at %p", + LM_DBG("allocate %lu bytes for root at %p\n", (long unsigned)sizeof(struct dtrie_node_t), root); memset(root, 0, sizeof(struct dtrie_node_t)); @@ -65,7 +65,7 @@ struct dtrie_node_t *dtrie_init(const unsigned int branches) SHM_MEM_ERROR; return NULL; } - LM_DBG("allocate %lu bytes for %d root children pointer at %p", + LM_DBG("allocate %lu bytes for %d root children pointer at %p\n", (long unsigned)sizeof(struct dtrie_node_t *) * branches, branches, root->child); memset(root->child, 0, sizeof(struct dtrie_node_t *) * branches); @@ -91,7 +91,7 @@ void dtrie_delete(struct dtrie_node_t *root, struct dtrie_node_t *node, } if (node != root) { - LM_DBG("free node at %p", node); + LM_DBG("free node at %p\n", node); shm_free(node); } } @@ -101,7 +101,7 @@ void dtrie_destroy(struct dtrie_node_t **root, dt_delete_func_t delete_payload, { if ((root!=NULL) && (*root!=NULL)) { dtrie_delete(*root, *root, delete_payload, branches); - LM_DBG("free root at %p", root); + LM_DBG("free root at %p\n", root); shm_free(*root); *root = NULL; } @@ -139,12 +139,12 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i if (node->child[digit] == NULL) { node->child[digit] = shm_malloc(sizeof(struct dtrie_node_t)); assert(node->child[digit] != NULL); - LM_DBG("allocate %lu bytes for node at %p", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); + LM_DBG("allocate %lu bytes for node at %p\n", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); memset(node->child[digit], 0, sizeof(struct dtrie_node_t)); node->child[digit]->child = shm_malloc(sizeof(struct dtrie_node_t *) * branches); assert(node->child[digit]->child != NULL); - LM_DBG("allocate %lu bytes for %d root children pointer at %p", + LM_DBG("allocate %lu bytes for %d root children pointer at %p\n", (long unsigned)sizeof(struct dtrie_node_t *) * branches, branches, node->child[digit]->child); memset(node->child[digit]->child, 0, sizeof(struct dtrie_node_t *) * branches);

1 0

Re: [SR-Dev] sr-dev post from new@sip-router.org requires approval
by Jan Janak 13 Feb '09

13 Feb '09

This was me, there was a bug in the commit mail script which I hopefully fixed. I updated the master branch and added both versions of the database API. The database library of SER 2.0 is in lib/srdb2, the database library of kamailio is in lib/srdb1. There is the full history of the kamailio database library, that's why there is so many commit messages in the previous email. I had to do some changes in the database library taken from kamailio in order to avoid conflicts between the two version, the changes are: 1) db_con_t has been renamed to db1_con_t 2) db_res_t has been renamed to db1_res_t 3) DB_INT, DB_STR,... macros have been renamed to DB1_INT, DB1_STR,... 4) The doxygen group db has been renamed to db1. All the changes have been applied to the kamailio database library synchronized yesterday, here is how you can get patches with the changes that I did if you need them: $ git-format-patch -o patches 18580 I also attached them to this email for your convenience, they should apply to the current kamailio/db after stripping the path prefix off (patch option -p). I will send a script to update other modules later tomorrow and also upload the updated mysql driver which works with both versions of the database library (i.e. that module should work with both ser and kamailio). Jan. On 12-02 23:25, sr-dev-owner(a)lists.sip-router.org wrote: > As list administrator, your authorization is requested for the > following mailing list posting: > > List: sr-dev(a)lists.sip-router.org > From: new(a)sip-router.org > Subject: text/plain; charset=UTF-8 > Reason: Post by non-member to a members-only list > > At your convenience, visit: > > http://lists.sip-router.org/cgi-bin/mailman/admindb/sr-dev > > to approve or deny the request. > Date: Thu, 12 Feb 2009 23:25:34 +0100 (CET) > From: New(a)sip-router.org, commits(a)sip-router.org, on(a)sip-router.org, > branch(a)sip-router.org, master(a)sip-router.org > Subject: text/plain; charset=UTF-8 > To: sr-dev(a)lists.sip-router.org > > From: sr-dev-request(a)lists.sip-router.org > Subject: confirm af3499ce3479bf6be60ee69ed389474e0ddabf1c > > If you reply to this message, keeping the Subject: header intact, > Mailman will discard the held message. Do this if the message is > spam. If you reply to this message and include an Approved: header > with the list password in it, the message will be approved for posting > to the list. The Approved: header can also appear in the first line > of the body of the reply.

3 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev