sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:janakj/bdb: Module renamed to db_bdb.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 7800eaf035782f64bd1c9786c1834bff5dc783f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7800eaf… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 15:14:48 2009 +0100 Module renamed to db_bdb. --- modules/db_berkeley/bdb_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/bdb_mod.c b/modules/db_berkeley/bdb_mod.c index 268527e..3ce1920 100644 --- a/modules/db_berkeley/bdb_mod.c +++ b/modules/db_berkeley/bdb_mod.c @@ -89,7 +89,7 @@ static param_export_t params[] = { }; struct module_exports exports = { - "bdb", + "db_bdb", cmds, /* Exported functions */ 0, /* RPC method */ params, /* Exported parameters */

15 years, 9 months

git:janakj/bdb: Merge branch janakj/bdb into master.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 728a5e6280219c2b4a2d58940b2e14a7e29950b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=728a5e6… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 15:06:58 2009 +0100 Merge branch janakj/bdb into master. * commit 'sr/janakj/bdb': (97 commits) Integrate module interfaces. Include bdb_mod.h and remove variables available there from the file. Various functions prefixed with km_ to avoid conflicts. New header file bdb_mod.h with parameters defined in bdb_mod.c Comment out MODULE_VERSION in km_db_berkeley.c Make km_sources compile within the db_berkeley sip-router module. Link the module with libkmi. Add km_prefix to locally included header files. Defines protecting header fields changed to match filenames. Remoted km_Makefile and km_README (same as README) Link the modules also with libsrdb1 Make the module compile in the sip-router source tree. Fixed wrong order of directives in modules Makefile. Database flags renamed from DB_* to SRDB_* to avoid conflicts. Module db_berkeley updated to database api version 2.0. - unify common rows and row allocation functionality in the DB API core - unify common rows and row allocation functionality in the DB API core - fix compilation on OpenBSD, related to missing includes paths and wrong - fix compilation on OpenBSD, related to missing includes paths and wrong - disable big integer (DB_BIGINT) support for non SQL DB modules for now ... ---

15 years, 9 months

git:master: Merge branch janakj/bdb into master.

by Jan Janak

Module: sip-router Branch: master Commit: 728a5e6280219c2b4a2d58940b2e14a7e29950b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=728a5e6… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 15:06:58 2009 +0100 Merge branch janakj/bdb into master. * commit 'sr/janakj/bdb': (97 commits) Integrate module interfaces. Include bdb_mod.h and remove variables available there from the file. Various functions prefixed with km_ to avoid conflicts. New header file bdb_mod.h with parameters defined in bdb_mod.c Comment out MODULE_VERSION in km_db_berkeley.c Make km_sources compile within the db_berkeley sip-router module. Link the module with libkmi. Add km_prefix to locally included header files. Defines protecting header fields changed to match filenames. Remoted km_Makefile and km_README (same as README) Link the modules also with libsrdb1 Make the module compile in the sip-router source tree. Fixed wrong order of directives in modules Makefile. Database flags renamed from DB_* to SRDB_* to avoid conflicts. Module db_berkeley updated to database api version 2.0. - unify common rows and row allocation functionality in the DB API core - unify common rows and row allocation functionality in the DB API core - fix compilation on OpenBSD, related to missing includes paths and wrong - fix compilation on OpenBSD, related to missing includes paths and wrong - disable big integer (DB_BIGINT) support for non SQL DB modules for now ... ---

15 years, 9 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, 9 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, 9 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, 9 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, 9 months

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

git:janakj/bdb: Include bdb_mod. h and remove variables available there from the file.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: bc848993b388bc4014277b9066a518c59ee80cd1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc84899… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 14:17:44 2009 +0100 Include bdb_mod.h and remove variables available there from the file. --- modules/db_berkeley/km_db_berkeley.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index 7dcd705..dbd2f17 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -43,6 +43,7 @@ #include "km_bdb_lib.h" #include "km_bdb_res.h" #include "km_bdb_mi.h" +#include "bdb_mod.h" #ifndef CFG_DIR #define CFG_DIR "/tmp" @@ -57,10 +58,6 @@ /*MODULE_VERSION*/ -int auto_reload = 0; -int log_enable = 0; -int journal_roll_interval = 0; - static int mod_init(void); static void destroy(void);

15 years, 9 months

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

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 0314e282b3db2ca61dfacc7bde5fb17a5004e573 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0314e28… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 11:12:08 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into bdb * 'master' of ssh://janakj@git.sip-router.org/sip-router: (176 commits) Make km_sources compile, part two. Link with libkmi, sources from kamailio use the management interface. Make km_ sources compile: Link also with libsrdb1 Added prefix km_ to locally included header files. Align defines protecting header files with filenames. Remove km_Makefile and km_README. Integrate functions and parameters from kamailio sources. Ignore emacs backup and lock files. Various changes to get rid of conflicts and make km_ files compile. Fixed matching of db flags names at the beginning of line. Two small fixes in regular expressions. Module renamed to db_postgres. Merged contents of km_Makefile (namely pg_config autodetection). Removed km_Makefile and km_README. Updated filenames of locally includede header files Align defines protecting headers with filenames. Link with both srdb1 and srdb2 SER to sip-router module conversion script. Kamailio to sip-router module conversion script. ... ---

15 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009