sr-dev

sr-dev@lists.kamailio.org

12 participants
44199 discussions

git:janakj/bdb: Add km_prefix to locally included header files.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 048ca8ebe82398d347fc054773a850668ff33ef0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=048ca8e… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 12:50:28 2009 +0100 Add km_prefix to locally included header files. --- modules/db_berkeley/km_bdb_lib.c | 6 +++--- modules/db_berkeley/km_bdb_mi.c | 4 ++-- modules/db_berkeley/km_bdb_res.c | 2 +- modules/db_berkeley/km_bdb_res.h | 4 ++-- modules/db_berkeley/km_bdb_util.c | 2 +- modules/db_berkeley/km_bdb_val.c | 6 +++--- modules/db_berkeley/km_db_berkeley.c | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/db_berkeley/km_bdb_lib.c b/modules/db_berkeley/km_bdb_lib.c index 1592bf6..b3b6c46 100644 --- a/modules/db_berkeley/km_bdb_lib.c +++ b/modules/db_berkeley/km_bdb_lib.c @@ -36,9 +36,9 @@ #include "../../mem/mem.h" #include "../../dprint.h" -#include "bdb_util.h" -#include "bdb_lib.h" -#include "bdb_val.h" +#include "km_bdb_util.h" +#include "km_bdb_lib.h" +#include "km_bdb_val.h" static database_p *_cachedb = NULL; static db_parms_p _db_parms = NULL; diff --git a/modules/db_berkeley/km_bdb_mi.c b/modules/db_berkeley/km_bdb_mi.c index e7f10fa..6769751 100644 --- a/modules/db_berkeley/km_bdb_mi.c +++ b/modules/db_berkeley/km_bdb_mi.c @@ -29,8 +29,8 @@ #include "../../dprint.h" #include "../../db/db.h" -#include "db_berkeley.h" -#include "bdb_mi.h" +#include "km_db_berkeley.h" +#include "km_bdb_mi.h" /* diff --git a/modules/db_berkeley/km_bdb_res.c b/modules/db_berkeley/km_bdb_res.c index 0049d7b..f527b6a 100644 --- a/modules/db_berkeley/km_bdb_res.c +++ b/modules/db_berkeley/km_bdb_res.c @@ -31,7 +31,7 @@ #include <string.h> #include <sys/types.h> #include "../../mem/mem.h" -#include "bdb_res.h" +#include "km_bdb_res.h" int bdb_get_columns(table_p _tp, db_res_t* _res, int* _lres, int _nc) diff --git a/modules/db_berkeley/km_bdb_res.h b/modules/db_berkeley/km_bdb_res.h index fda96f3..0bce9e1 100644 --- a/modules/db_berkeley/km_bdb_res.h +++ b/modules/db_berkeley/km_bdb_res.h @@ -34,8 +34,8 @@ #include "../../db/db_op.h" #include "../../db/db_res.h" #include "../../db/db_con.h" -#include "bdb_lib.h" -#include "bdb_val.h" +#include "km_bdb_lib.h" +#include "km_bdb_val.h" typedef struct _con { diff --git a/modules/db_berkeley/km_bdb_util.c b/modules/db_berkeley/km_bdb_util.c index f6546c4..0fd8cc2 100644 --- a/modules/db_berkeley/km_bdb_util.c +++ b/modules/db_berkeley/km_bdb_util.c @@ -31,7 +31,7 @@ #include <sys/types.h> #include <dirent.h> -#include "bdb_util.h" +#include "km_bdb_util.h" /** * diff --git a/modules/db_berkeley/km_bdb_val.c b/modules/db_berkeley/km_bdb_val.c index 1f20c9c..26b9066 100644 --- a/modules/db_berkeley/km_bdb_val.c +++ b/modules/db_berkeley/km_bdb_val.c @@ -30,9 +30,9 @@ #include "../../db/db_val.h" #include "../../db/db_ut.h" -#include "db_berkeley.h" -#include "bdb_res.h" -#include "bdb_val.h" +#include "km_db_berkeley.h" +#include "km_bdb_res.h" +#include "km_bdb_val.h" #include <string.h> /** diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index c88adae..f1ba785 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -39,10 +39,10 @@ #include "../../sr_module.h" #include "../../db/db_res.h" #include "../../db/db.h" -#include "db_berkeley.h" -#include "bdb_lib.h" -#include "bdb_res.h" -#include "bdb_mi.h" +#include "km_db_berkeley.h" +#include "km_bdb_lib.h" +#include "km_bdb_res.h" +#include "km_bdb_mi.h" #ifndef CFG_DIR #define CFG_DIR "/tmp"

15 years, 10 months

git:janakj/bdb: Make km_sources compile within the db_berkeley sip-router module.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: f8605335dbb8154d8190eda058179fb6a64c6808 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f860533… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 13:09:32 2009 +0100 Make km_sources compile within the db_berkeley sip-router module. List of changes: * Field type names DB_* renamed to DB1_* * Linked with libkmi, the module uses kamailio management interface * Updated paths to headers in libsrdb1 * db_con_t renamed to db1_con_t * db_res_t renamed to db1_res_t * cmd_export_t renamed to kam_cmd_export_t * structure module_exports renamed to kam_module_exports * Variable exports renamed to kam_exports to avoid conflict with the same variable in bdb_mod.c --- modules/db_berkeley/km_bdb_lib.c | 10 ++-- modules/db_berkeley/km_bdb_lib.h | 4 +- modules/db_berkeley/km_bdb_mi.c | 2 +- modules/db_berkeley/km_bdb_res.c | 76 +++++++++++++++++----------------- modules/db_berkeley/km_bdb_res.h | 16 ++++---- modules/db_berkeley/km_bdb_val.c | 48 +++++++++++----------- modules/db_berkeley/km_bdb_val.h | 6 +- modules/db_berkeley/km_db_berkeley.c | 58 +++++++++++++------------- modules/db_berkeley/km_db_berkeley.h | 34 ++++++++-------- 9 files changed, 127 insertions(+), 127 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f86…

15 years, 10 months

git:janakj/bdb: Various functions prefixed with km_ to avoid conflicts.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: c876c13f77d68e28117509160cd61944704800a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c876c13… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 14:17:11 2009 +0100 Various functions prefixed with km_ to avoid conflicts. There are many non-static functions in km_* files which need to be renamed to avoid conflicts with functions with the same name in other source files (originating from ser). The list of functions prefixed with km_: bdblib_close, bdblib_destroy, bdblib_close, bdblib_reopen, bdblib_create_dbenv, bdblib_recover, bdblib_get_db, bdblib_is_database, bdblib_get_table, bdblib_log, bdblib_create_journal, bdblib_create_table, load_metadata_columns, load_metadata_defaults, load_metadata_keys, load_metadata_readonly, load_metadata_logflags, bdblib_valtochar, bdb_val2str, bdb_time2str, bdblib_init, bdb_query --- modules/db_berkeley/km_bdb_lib.c | 78 +++++++++++++++++----------------- modules/db_berkeley/km_bdb_lib.h | 34 +++++++------- modules/db_berkeley/km_bdb_util.c | 2 +- modules/db_berkeley/km_bdb_util.h | 2 +- modules/db_berkeley/km_bdb_val.c | 6 +- modules/db_berkeley/km_bdb_val.h | 2 +- modules/db_berkeley/km_db_berkeley.c | 58 +++++++++++++------------- modules/db_berkeley/km_db_berkeley.h | 4 +- 8 files changed, 93 insertions(+), 93 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c87…

15 years, 10 months

git:janakj/bdb: New header file bdb_mod. h with parameters defined in bdb_mod.c

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: b78bbf2bd8a14f7adab1867a47abd4fbd8fbda97 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b78bbf2… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 14:05:20 2009 +0100 New header file bdb_mod.h with parameters defined in bdb_mod.c This is file is necessary so that we can access the parameter variables from km_* files (and remove their equivalents from km_db_berkeley.c --- modules/db_berkeley/bdb_mod.h | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/modules/db_berkeley/bdb_mod.h b/modules/db_berkeley/bdb_mod.h new file mode 100644 index 0000000..0623418 --- /dev/null +++ b/modules/db_berkeley/bdb_mod.h @@ -0,0 +1,37 @@ +/* + * $Id$ + * + * db_berkeley module, portions of this code were templated using + * the dbtext and postgres modules. + + * Copyright (C) 2007 Cisco Systems + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * History: + * -------- + * 2007-09-19 genesis (wiquan) + */ + +#ifndef _BDB_MOD_H +#define _BDB_MOD_H + +extern int auto_reload; +extern int log_enable; +extern int journal_roll_interval; + +#endif /* _BDB_MOD_H */

15 years, 10 months

git:janakj/bdb: Comment out MODULE_VERSION in km_db_berkeley.c

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 7dc16168a0f690b6881721fc166e80410b5ae443 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7dc1616… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 13:18:35 2009 +0100 Comment out MODULE_VERSION in km_db_berkeley.c --- modules/db_berkeley/km_db_berkeley.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index e34d068..722d2dc 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -55,7 +55,7 @@ #define BDB_KEY 1 #define BDB_VALUE 0 -MODULE_VERSION +/*MODULE_VERSION*/ int auto_reload = 0; int log_enable = 0;

15 years, 10 months

git:janakj/bdb: - DB API export updated to be done via db_bind_api()

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 6a6d498f4437d0717af063aaa1ec8d29d6919a22 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a6d498… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 4 16:12:41 2008 +0000 - DB API export updated to be done via db_bind_api() git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3844 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_db_berkeley.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index c0483ca..b829ddb 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -38,6 +38,7 @@ #include "../../sr_module.h" #include "../../db/db_res.h" +#include "../../db/db.h" #include "db_berkeley.h" #include "bdb_lib.h" #include "bdb_res.h" @@ -63,18 +64,13 @@ int journal_roll_interval = 0; static int mod_init(void); static void destroy(void); +int bdb_bind_api(db_func_t *dbb); + /* * Exported functions */ static cmd_export_t cmds[] = { - {"db_use_table", (cmd_function)bdb_use_table, 2, 0, 0, 0}, - {"db_init", (cmd_function)bdb_init, 1, 0, 0, 0}, - {"db_close", (cmd_function)bdb_close, 2, 0, 0, 0}, - {"db_query", (cmd_function)bdb_query, 2, 0, 0, 0}, - {"db_free_result", (cmd_function)bdb_free_query, 2, 0, 0, 0}, - {"db_insert", (cmd_function)bdb_insert, 2, 0, 0, 0}, - {"db_delete", (cmd_function)bdb_delete, 2, 0, 0, 0}, - {"db_update", (cmd_function)bdb_update, 2, 0, 0, 0}, + {"db_bind_api", (cmd_function)bdb_bind_api, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -133,6 +129,25 @@ static void destroy(void) bdblib_destroy(); } +int dbt_bind_api(db_func_t *dbb) +{ + if(dbb==NULL) + return -1; + + memset(dbb, 0, sizeof(db_func_t)); + + dbb->use_table = bdb_use_table; + dbb->init = bdb_init; + dbb->close = bdb_close; + dbb->query = (db_query_f)bdb_query; + dbb->free_result = bdb_free_query; + dbb->insert = (db_insert_f)bdb_insert; + dbb->delete = (db_delete_f)bdb_delete; + dbb->update = (db_update_f)bdb_update; + + return 0; +} + int bdb_use_table(db_con_t* _h, const str* _t) { return db_use_table(_h, _t);

15 years, 10 months

git:janakj/bdb: - fix wrong function name for API bind

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 634bdd4c8f4ac0a6074df94587ec84c8642f81c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=634bdd4… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Mar 5 12:58:35 2008 +0000 - fix wrong function name for API bind git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3850 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_db_berkeley.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index b829ddb..2819c65 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -129,7 +129,7 @@ static void destroy(void) bdblib_destroy(); } -int dbt_bind_api(db_func_t *dbb) +int bdb_bind_api(db_func_t *dbb) { if(dbb==NULL) return -1;

15 years, 10 months

git:janakj/bdb: - change module docs FAQ link to a common one in the doc dir

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 0e9270182faddc32e606407667de38a46ca61e7b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e92701… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Mar 4 13:15:47 2008 +0000 - change module docs FAQ link to a common one in the doc dir - remove module specific FAQ content from the file in doc, this way no FAQ content will be created - credits for the patch/ the change scripts goes to Edson Gellert Schubert, 4lists at gmail dot com - update all READMEs, for most module docs the FAQ and devel information were now removed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3839 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_README | 42 ---------------------- modules/db_berkeley/km_doc/db_berkeley.sgml | 4 +-- modules/db_berkeley/km_doc/db_berkeley_user.sgml | 3 +- 3 files changed, 2 insertions(+), 47 deletions(-) diff --git a/modules/db_berkeley/km_README b/modules/db_berkeley/km_README index 4cc84b4..441723c 100644 --- a/modules/db_berkeley/km_README +++ b/modules/db_berkeley/km_README @@ -41,9 +41,6 @@ Will Quan 1.13. DB Recovery : bdb_recover 1.14. Known Limitations - 2. Developer's Guide - 3. Frequently Asked Questions - List of Examples 1-1. Set auto_reload parameter 1-2. Set log_enable parameter @@ -498,42 +495,3 @@ possible sequence) mechanism. Consequently, this version does not support surragate keys in dbschema. These are the id columns in the tables. - __________________________________________________________ - -Chapter 2. Developer's Guide - - The module does not provide any API to use in other OpenSER - modules. - __________________________________________________________ - -Chapter 3. Frequently Asked Questions - - 3.1. Where can I find more about OpenSER? - 3.2. Where can I post a question about this module? - 3.3. How can I report a bug? - - 3.1. Where can I find more about OpenSER? - - Take a look at http://openser.org/. - - 3.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>. - - 3.3. How can I report a bug? - - Please follow the guidelines provided at: - http://sourceforge.net/tracker/?group_id=139143. diff --git a/modules/db_berkeley/km_doc/db_berkeley.sgml b/modules/db_berkeley/km_doc/db_berkeley.sgml index 306f0b1..361a322 100644 --- a/modules/db_berkeley/km_doc/db_berkeley.sgml +++ b/modules/db_berkeley/km_doc/db_berkeley.sgml @@ -2,8 +2,7 @@ <!ENTITY user SYSTEM "db_berkeley_user.sgml"> -<!ENTITY devel SYSTEM "db_berkeley_devel.sgml"> -<!ENTITY faq SYSTEM "db_berkeley_faq.sgml"> +<!ENTITY faq SYSTEM "../../../doc/module_faq.sgml">  <!ENTITY % docentities SYSTEM "../../../doc/entities.sgml"> @@ -49,7 +48,6 @@ <toc></toc> &user; - &devel; &faq; </book> diff --git a/modules/db_berkeley/km_doc/db_berkeley_user.sgml b/modules/db_berkeley/km_doc/db_berkeley_user.sgml index affdf40..14e6c54 100644 --- a/modules/db_berkeley/km_doc/db_berkeley_user.sgml +++ b/modules/db_berkeley/km_doc/db_berkeley_user.sgml @@ -1,8 +1,7 @@  <chapter> - <chapterinfo> - </chapterinfo> + <title>User's Guide</title> <section>

15 years, 10 months

git:janakj/bdb: - modules documentation migrated from sgml to xml docbook format

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: e3806910cdc0553880960f23dc90b8ea6c4bb63b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e380691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 7 18:19:45 2008 +0000 - modules documentation migrated from sgml to xml docbook format - many thanks to Edson <4lists (at) gmail (dot) com> for providing script to replace headers and rename files - contact updated - follows re-sync with todays changes and update of Makefile to generate README and html files from XML git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3886 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_README | 101 ++++++++++++-------- .../km_doc/{db_berkeley.sgml => db_berkeley.xml} | 10 +- ...db_berkeley_user.sgml => db_berkeley_admin.xml} | 0 3 files changed, 66 insertions(+), 45 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e38…

15 years, 10 months

git:janakj/bdb: - renaming scripts part 1

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: f1b182490c7f577b840e759f59e5403c4c6fb016 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1b1824… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Committer: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Tue Aug 5 15:29:23 2008 +0000 - renaming scripts part 1 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4571 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_README | 52 +++++++++++----------- modules/db_berkeley/km_bdb_lib.c | 4 +- modules/db_berkeley/km_doc/db_berkeley_admin.xml | 48 ++++++++++---------- 3 files changed, 52 insertions(+), 52 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f1b…

15 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev