sr-dev

sr-dev@lists.kamailio.org

13 participants
43416 discussions

git:janakj/bdb: - entity &user; replaced with &admin; to obey naming structure (entities to be replaced by xinclude); updated obsolete address tags

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 10bfcda50f94ab15e1c27cfe5d3a2880e1d4aae0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10bfcda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 7 23:03:56 2008 +0000 - entity &user; replaced with &admin; to obey naming structure (entities to be replaced by xinclude); updated obsolete address tags - READMEs regenerated git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3898 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/README | 4 ++++ modules/db_berkeley/doc/db_berkeley.xml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/db_berkeley/README b/modules/db_berkeley/README index be20496..48fe320 100644 --- a/modules/db_berkeley/README +++ b/modules/db_berkeley/README @@ -484,6 +484,10 @@ possible Chapter 2. Frequently Asked Questions + Revision History + Revision $Revision: 2 $ $Date: 2005-06-13 19:47:24 +0300 (Mon, + 13 Jun 2005) $ + 2.1. Where can I find more about OpenSER? diff --git a/modules/db_berkeley/doc/db_berkeley.xml b/modules/db_berkeley/doc/db_berkeley.xml index 6c45cb4..4123ead 100644 --- a/modules/db_berkeley/doc/db_berkeley.xml +++ b/modules/db_berkeley/doc/db_berkeley.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ -<!ENTITY user SYSTEM "db_berkeley_admin.xml"> +<!ENTITY admin SYSTEM "db_berkeley_admin.xml"> <!ENTITY faq SYSTEM "../../../doc/module_faq.xml">  @@ -49,7 +49,7 @@ </bookinfo> <toc></toc> - &user; + &admin; &faq; </book>

15 years, 7 months

git:janakj/bdb: - updated some old entity names

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 894c5590d44ad8defcd5187a34bd8823c7522fc1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=894c559… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 10 15:13:24 2008 +0000 - updated some old entity names git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3912 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/doc/db_berkeley.xml | 2 +- modules/db_berkeley/doc/db_berkeley_admin.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/db_berkeley/doc/db_berkeley.xml b/modules/db_berkeley/doc/db_berkeley.xml index 4123ead..d7ae7d6 100644 --- a/modules/db_berkeley/doc/db_berkeley.xml +++ b/modules/db_berkeley/doc/db_berkeley.xml @@ -15,7 +15,7 @@ <book> <bookinfo> <title>Berkeley DB Module</title> - <productname class="trade">&sername;</productname> + <productname class="trade">&opensername;</productname> <authorgroup> <author> <firstname>Will</firstname> diff --git a/modules/db_berkeley/doc/db_berkeley_admin.xml b/modules/db_berkeley/doc/db_berkeley_admin.xml index 14e6c54..a6f85eb 100644 --- a/modules/db_berkeley/doc/db_berkeley_admin.xml +++ b/modules/db_berkeley/doc/db_berkeley_admin.xml @@ -15,13 +15,13 @@ <section> <title>Dependencies</title> <section> - <title>&ser; Modules</title> + <title>&openser; Modules</title> <para> The following modules must be loaded before this module: <itemizedlist> <listitem> <para> - <emphasis>No dependencies on other &ser; modules</emphasis>. + <emphasis>No dependencies on other &openser; modules</emphasis>. </para> </listitem> </itemizedlist> @@ -32,7 +32,7 @@ <title>External Libraries or Applications</title> <para> The following libraries or applications must be installed before running - &ser; with this module loaded: + &openser; with this module loaded: <itemizedlist> <listitem> <para> @@ -175,7 +175,7 @@ modparam("db_berkeley", "journal_roll_interval", 3600) <listitem> <para> edit the "Makefile" and remove "db_berkeley" from "excluded_modules" - list. Then follow the standard procedure to install &ser;: + list. Then follow the standard procedure to install &openser;: "make all; make install". </para> </listitem>

15 years, 7 months

git:janakj/bdb: - content of faq removed ( mistakenly added by me after Henning did the cleanup for modules' docs; rev 3839)

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 8165ad3b7064ab336b5af18c052fa20fb4ea7b76 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8165ad3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 10 11:17:28 2008 +0000 - content of faq removed (mistakenly added by me after Henning did the cleanup for modules' docs; rev 3839) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3901 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/README | 39 --------------------------------------- 1 files changed, 0 insertions(+), 39 deletions(-) diff --git a/modules/db_berkeley/README b/modules/db_berkeley/README index 48fe320..076082c 100644 --- a/modules/db_berkeley/README +++ b/modules/db_berkeley/README @@ -45,8 +45,6 @@ Will Quan 1.13. DB Recovery : bdb_recover 1.14. Known Limitations - 2. Frequently Asked Questions - List of Examples 1.1. Set auto_reload parameter @@ -481,40 +479,3 @@ possible sequence) mechanism. Consequently, this version does not support surragate keys in dbschema. These are the id columns in the tables. - -Chapter 2. Frequently Asked Questions - - Revision History - Revision $Revision: 2 $ $Date: 2005-06-13 19:47:24 +0300 (Mon, - 13 Jun 2005) $ - - 2.1. - - Where can I find more about OpenSER? - - Take a look at http://openser.org/. - - 2.2. - - Where can I post a question about this module? - - First at all check if your question was already answered on one - of our mailing lists: - * User Mailing List - - http://openser.org/cgi-bin/mailman/listinfo/users - * Developer Mailing List - - http://openser.org/cgi-bin/mailman/listinfo/devel - - E-mails regarding any stable OpenSER release should be sent to - <users(a)openser.org> and e-mails regarding development versions - should be sent to <devel(a)openser.org>. - - If you want to keep the mail private, send it to - <team(a)openser.org>. - - 2.3. - - How can I report a bug? - - Please follow the guidelines provided at: - http://sourceforge.net/tracker/?group_id=139143.

15 years, 7 months

git:janakj/bdb: - import berkeley database module into trunk

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 326fba488a0ea9a6f4f5ca7f1a6a2cccb127bf1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=326fba4… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 4 11:15:01 2007 +0000 - import berkeley database module into trunk - Many thanks to William Quan from Cisco Systems for the contribution - based on patch #1803180, renamed from berkely_db to db_berkeley - Some work still remains: - build berkley_db as own debian package - add berkley_db to the xml database creation process to generate the content in scripts/db_berkley/openser like the dbtext stuff - evaluate if its possible to use the db_free_row and db_free_rows functions for this module - port to new logging system git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2844 689a6050-402a-0410-94f2-e92a70836424 ---

15 years, 7 months

git:janakj/bdb: - updated the cmd_export_t according to latest structure

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 215a055edfb26327070b44ce6f6a89827735dbcb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=215a055… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 4 11:23:12 2007 +0000 - updated the cmd_export_t according to latest structure git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2846 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/db_berkeley.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/db_berkeley/db_berkeley.c b/modules/db_berkeley/db_berkeley.c index 4f5e2ca..a5b0b01 100644 --- a/modules/db_berkeley/db_berkeley.c +++ b/modules/db_berkeley/db_berkeley.c @@ -65,16 +65,16 @@ static void destroy(void); * Exported functions */ static cmd_export_t cmds[] = { - {"db_use_table", (cmd_function)sc_use_table, 2, 0, 0}, - {"db_init", (cmd_function)sc_init, 1, 0, 0}, - {"db_close", (cmd_function)sc_close, 2, 0, 0}, - {"db_query", (cmd_function)sc_query, 2, 0, 0}, - {"db_raw_query", (cmd_function)sc_raw_query, 2, 0, 0}, - {"db_free_result", (cmd_function)sc_free_query, 2, 0, 0}, - {"db_insert", (cmd_function)sc_insert, 2, 0, 0}, - {"db_delete", (cmd_function)sc_delete, 2, 0, 0}, - {"db_update", (cmd_function)sc_update, 2, 0, 0}, - {0, 0, 0, 0, 0} + {"db_use_table", (cmd_function)sc_use_table, 2, 0, 0, 0}, + {"db_init", (cmd_function)sc_init, 1, 0, 0, 0}, + {"db_close", (cmd_function)sc_close, 2, 0, 0, 0}, + {"db_query", (cmd_function)sc_query, 2, 0, 0, 0}, + {"db_raw_query", (cmd_function)sc_raw_query, 2, 0, 0, 0}, + {"db_free_result", (cmd_function)sc_free_query, 2, 0, 0, 0}, + {"db_insert", (cmd_function)sc_insert, 2, 0, 0, 0}, + {"db_delete", (cmd_function)sc_delete, 2, 0, 0, 0}, + {"db_update", (cmd_function)sc_update, 2, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} };

15 years, 7 months

git:janakj/bdb: - port to new logging system

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: be2347445d71f4395f55004a72d24372d026fd4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be23474… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 4 12:28:04 2007 +0000 - port to new logging system - increase log level for messages in db operation errors git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2851 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/bdb_lib.c | 124 ++++++++---------- modules/db_berkeley/bdb_res.c | 247 ++++++++++++++++++------------------- modules/db_berkeley/bdb_val.c | 40 +++--- modules/db_berkeley/db_berkeley.c | 191 ++++++++++++----------------- 4 files changed, 273 insertions(+), 329 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=be2…

15 years, 7 months

git:janakj/bdb: - move new_result and free_columns function to db directory

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: f982c8ed860022d384c1375c0d24e5a2e690c0e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f982c8e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 5 14:32:16 2007 +0000 - move new_result and free_columns function to db directory - remove the implementation of this functions in all database modules - still missing - postgresql and db_berkeley implement different, more thouroughly free methods for colums and such - review if we can use the common functions like the other three modules git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2871 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/bdb_res.c | 16 ---------------- modules/db_berkeley/bdb_res.h | 1 - modules/db_berkeley/db_berkeley.c | 7 ++++--- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/modules/db_berkeley/bdb_res.c b/modules/db_berkeley/bdb_res.c index a8a1a63..a6823ac 100644 --- a/modules/db_berkeley/bdb_res.c +++ b/modules/db_berkeley/bdb_res.c @@ -499,22 +499,6 @@ int* sc_get_colmap(table_p _dtp, db_key_t* _k, int _n) } -db_res_t* sc_result_new(void) -{ - db_res_t* _res = NULL; - _res = (db_res_t*)pkg_malloc(sizeof(db_res_t)); - if (!_res) - { - LM_ERR("Failed to allocate %lu bytes for result structure\n" - , (unsigned long)sizeof(db_res_t)); - return NULL; - } - - memset(_res, 0, sizeof(db_res_t)); - return _res; -} - - int sc_free_result(db_res_t* _res) { sc_free_columns(_res); diff --git a/modules/db_berkeley/bdb_res.h b/modules/db_berkeley/bdb_res.h index 79685fd..77fded0 100644 --- a/modules/db_berkeley/bdb_res.h +++ b/modules/db_berkeley/bdb_res.h @@ -53,7 +53,6 @@ int sc_convert_row( db_res_t* _res, char *bdb_result, int* _lres); int sc_append_row(db_res_t* _res, char *bdb_result, int* _lres, int _rx); int* sc_get_colmap(table_p _tp, db_key_t* _k, int _n); -db_res_t* sc_result_new(void); int sc_free_result(db_res_t* _res); int sc_free_columns(db_res_t* _res); int sc_free_rows(db_res_t* _res); diff --git a/modules/db_berkeley/db_berkeley.c b/modules/db_berkeley/db_berkeley.c index 08fc907..af464a4 100644 --- a/modules/db_berkeley/db_berkeley.c +++ b/modules/db_berkeley/db_berkeley.c @@ -36,6 +36,7 @@ #include "../../mem/mem.h" #include "../../sr_module.h" +#include "../../db/db_res.h" #include "db_berkeley.h" #include "bdb_lib.h" #include "bdb_res.h" @@ -428,7 +429,7 @@ int sc_query(db_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, LM_DBG("%i = SELECT COUNT(*) FROM %.*s\n", i, _tp->name.len, _tp->name.s); #endif - *_r = sc_result_new(); + *_r = db_new_result(); if (!*_r) { LM_ERR("no memory left for result \n"); ret = -2; @@ -504,7 +505,7 @@ int sc_query(db_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, data.flags = DB_DBT_USERMEM; /*create an empty db_res_t which gets returned even if no result*/ - *_r = sc_result_new(); + *_r = db_new_result(); if (!*_r) { LM_ERR("no memory left for result \n"); ret = -2; @@ -926,7 +927,7 @@ int _sc_delete_cursor(db_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, in } /* create an empty db_res_t which gets returned even if no result */ - _r = sc_result_new(); + _r = db_new_result(); if (!_r) { LM_ERR("no memory for result \n"); }

15 years, 7 months

git:janakj/bdb: - remove raw_query module export, this is not implemented anyway

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: a1d72c4cc687c2e37b1c232a7acf5e04d744d62d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1d72c4… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 12 15:12:11 2007 +0000 - remove raw_query module export, this is not implemented anyway git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2912 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/db_berkeley.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/db_berkeley.c b/modules/db_berkeley/db_berkeley.c index af464a4..105186d 100644 --- a/modules/db_berkeley/db_berkeley.c +++ b/modules/db_berkeley/db_berkeley.c @@ -70,7 +70,6 @@ static cmd_export_t cmds[] = { {"db_init", (cmd_function)sc_init, 1, 0, 0, 0}, {"db_close", (cmd_function)sc_close, 2, 0, 0, 0}, {"db_query", (cmd_function)sc_query, 2, 0, 0, 0}, - {"db_raw_query", (cmd_function)sc_raw_query, 2, 0, 0, 0}, {"db_free_result", (cmd_function)sc_free_query, 2, 0, 0, 0}, {"db_insert", (cmd_function)sc_insert, 2, 0, 0, 0}, {"db_delete", (cmd_function)sc_delete, 2, 0, 0, 0},

15 years, 7 months

git:janakj/bdb: -fix memory leak in 'bdb_insert'

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 734538721b6a3985ea97268a7b1413ef3e347d94 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7345387… Author: Will Quan <wiquan(a)employees.org> Committer: Will Quan <wiquan(a)employees.org> Date: Wed Nov 7 00:44:14 2007 +0000 -fix memory leak in 'bdb_insert' -fix memory scribbler in '_bdb_delete_cursor' -renamed function prefixes from 'sc_' to 'bdb_' -added mi command for bdb_reload (added openserctl.db_berkeley) -globally replaced openserctlrc parameter 'DBTEXT_PATH' with 'DB_PATH' so db_berkeley can use it too. -modified openserdbctl to print error when invoking serweb with DBTEXT or DB_BERKELEY -update docs for db_berkeley git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3036 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/Makefile | 2 +- modules/db_berkeley/README | 568 +++++++++++++------------ modules/db_berkeley/bdb_lib.c | 91 +++-- modules/db_berkeley/bdb_lib.h | 30 +- modules/db_berkeley/bdb_mi.c | 63 +++ modules/db_berkeley/bdb_mi.h | 36 ++ modules/db_berkeley/bdb_res.c | 76 ++-- modules/db_berkeley/bdb_res.h | 30 +- modules/db_berkeley/bdb_util.c | 2 +- modules/db_berkeley/bdb_util.h | 2 +- modules/db_berkeley/bdb_val.c | 5 +- modules/db_berkeley/bdb_val.h | 4 +- modules/db_berkeley/db_berkeley.c | 290 +++++++------ modules/db_berkeley/db_berkeley.h | 24 +- modules/db_berkeley/doc/db_berkeley_user.sgml | 218 +++++++---- 15 files changed, 835 insertions(+), 606 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=734…

15 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev