sr-dev

sr-dev@lists.kamailio.org

15 participants
43426 discussions

git:janakj/bdb: Merge db_berkeley modules from kamailio trunk into sip-router

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 89989d978429dc564362b350a76e6d679dbaa0e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89989d9… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 12:37:55 2009 +0100 Merge db_berkeley modules from kamailio trunk into sip-router * kamailio/db_berkeley: (41 commits) - unify common rows and row allocation functionality in the DB API core - fix compilation on OpenBSD, related to missing includes paths and wrong - disable big integer (DB_BIGINT) support for non SQL DB modules for now - remove not reached return statement at the end of val2str functions - fix link entity names, patch from Carsten Gross - port from opensips r4526, credits goes to bogdan - renamed: bdb_recover -> kambdb_recover - regenerated all READMEs (make modules-readme exclude_modules="") - renaming: changed entities in documentation - renaming: openser -> kamailio - renaming scripts part 1 - fix some FAQ entries, change missing entity, regenerate READMEs - change name in copyright headers - fix unnecessary module library links, related to #1855859 - titles for admin, devel and faq chapters are defined via entities for coherence and easier management - updated some old entity names - content of faq removed (mistakenly added by me after Henning did the cleanup for modules' docs; rev 3839) - entity &user; replaced with &admin; to obey naming structure (entities to be replaced by xinclude); updated obsolete address tags - step 2 for the rest of modules to re-link history from sgml to xml files - step 1 for the rest of modules to re-link history from sgml to xml files ... ---

15 years, 7 months

git:janakj/bdb: Remoted km_Makefile and km_README (same as README)

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: a5415d07a3534f72e611d5ae34e9ecf10bdf54c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5415d0… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 12:45:16 2009 +0100 Remoted km_Makefile and km_README (same as README) --- modules/db_berkeley/km_Makefile | 19 -- modules/db_berkeley/km_README | 481 --------------------------------------- 2 files changed, 0 insertions(+), 500 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a54…

15 years, 7 months

git:janakj/bdb: Integrate module interfaces.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 7f4d7327118d2bd5850bf0d9a9015f8eed322cd4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f4d732… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 15:03:30 2009 +0100 Integrate module interfaces. List of changes: * Export db_bind_api through the module interface * Rename mod_init to km_mod_init * Rename destroy to km_destroy * Make the two functions non-static * Call km_mod_init from bdb_mod_init * Call km_destroy from bdb_mod_destroy --- modules/db_berkeley/bdb_mod.c | 5 ++++- modules/db_berkeley/km_db_berkeley.c | 12 ++++-------- modules/db_berkeley/km_db_berkeley.h | 6 ++++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/modules/db_berkeley/bdb_mod.c b/modules/db_berkeley/bdb_mod.c index 7da25b3..268527e 100644 --- a/modules/db_berkeley/bdb_mod.c +++ b/modules/db_berkeley/bdb_mod.c @@ -46,6 +46,7 @@ #include "bdb_fld.h" #include "bdb_res.h" #include "bdb_cmd.h" +#include "km_db_berkeley.h" MODULE_VERSION @@ -73,6 +74,7 @@ static cmd_export_t cmds[] = { {"db_next", (cmd_function)bdb_cmd_next, 0, 0, 0}, {"db_res", (cmd_function)bdb_res, 0, 0, 0}, {"db_fld", (cmd_function)bdb_fld, 0, 0, 0}, + {"db_bind_api", (cmd_function)bdb_bind_api, 0, 0, 0}, {0, 0, 0, 0, 0} }; @@ -111,11 +113,12 @@ static int bdb_mod_init(void) if(bdblib_init(&p)) return -1; - return 0; + return km_mod_init(); } static void bdb_mod_destroy(void) { + km_destroy(); bdblib_destroy(); } diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index dbd2f17..dba09bd 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -58,9 +58,6 @@ /*MODULE_VERSION*/ -static int mod_init(void); -static void destroy(void); - int bdb_bind_api(db_func_t *dbb); /* @@ -99,14 +96,13 @@ struct kam_module_exports kam_exports = { mi_cmds, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */ - mod_init, /* module initialization function */ + km_mod_init, /* module initialization function */ 0, /* response function*/ - destroy, /* destroy function */ + km_destroy, /* destroy function */ 0 /* per-child init function */ }; - -static int mod_init(void) +int km_mod_init(void) { db_parms_t p; @@ -121,7 +117,7 @@ static int mod_init(void) return 0; } -static void destroy(void) +void km_destroy(void) { km_bdblib_destroy(); } diff --git a/modules/db_berkeley/km_db_berkeley.h b/modules/db_berkeley/km_db_berkeley.h index aaa800c..7376671 100644 --- a/modules/db_berkeley/km_db_berkeley.h +++ b/modules/db_berkeley/km_db_berkeley.h @@ -36,6 +36,7 @@ #include "../../lib/srdb1/db_key.h" #include "../../lib/srdb1/db_op.h" #include "../../lib/srdb1/db_val.h" +#include "../../lib/srdb1/db.h" /* reloads the berkeley db */ int bdb_reload(char* _n); @@ -92,5 +93,10 @@ int _bdb_delete_cursor(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, int bdb_update(db1_con_t* _h, db_key_t* _k, db_op_t* _o, db_val_t* _v, db_key_t* _uk, db_val_t* _uv, int _n, int _un); +int bdb_bind_api(db_func_t *dbb); + +int km_mod_init(void); +void km_destroy(void); + #endif

15 years, 7 months

git:janakj/bdb: Defines protecting header fields changed to match filenames .

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: b78d0d7be6a45d09e4c3efc8757b98bd3ec21fd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b78d0d7… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 12:47:36 2009 +0100 Defines protecting header fields changed to match filenames. --- modules/db_berkeley/km_bdb_lib.h | 4 ++-- modules/db_berkeley/km_bdb_mi.h | 4 ++-- modules/db_berkeley/km_bdb_res.h | 4 ++-- modules/db_berkeley/km_bdb_util.h | 4 ++-- modules/db_berkeley/km_bdb_val.h | 4 ++-- modules/db_berkeley/km_db_berkeley.h | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/db_berkeley/km_bdb_lib.h b/modules/db_berkeley/km_bdb_lib.h index 92f670e..bb0a982 100644 --- a/modules/db_berkeley/km_bdb_lib.h +++ b/modules/db_berkeley/km_bdb_lib.h @@ -28,8 +28,8 @@ */ -#ifndef _BDB_LIB_H_ -#define _BDB_LIB_H_ +#ifndef _KM_BDB_LIB_H_ +#define _KM_BDB_LIB_H_ #include <stdlib.h> #include <syslog.h> diff --git a/modules/db_berkeley/km_bdb_mi.h b/modules/db_berkeley/km_bdb_mi.h index bff2439..1e51302 100644 --- a/modules/db_berkeley/km_bdb_mi.h +++ b/modules/db_berkeley/km_bdb_mi.h @@ -23,8 +23,8 @@ */ -#ifndef _BDB_MI_H_ -#define _BDB_MI_H_ +#ifndef _KM_BDB_MI_H_ +#define _KM_BDB_MI_H_ #include "../../mi/mi.h" diff --git a/modules/db_berkeley/km_bdb_res.h b/modules/db_berkeley/km_bdb_res.h index 073d1f8..fda96f3 100644 --- a/modules/db_berkeley/km_bdb_res.h +++ b/modules/db_berkeley/km_bdb_res.h @@ -28,8 +28,8 @@ */ -#ifndef _BDB_RES_H_ -#define _BDB_RES_H_ +#ifndef _KM_BDB_RES_H_ +#define _KM_BDB_RES_H_ #include "../../db/db_op.h" #include "../../db/db_res.h" diff --git a/modules/db_berkeley/km_bdb_util.h b/modules/db_berkeley/km_bdb_util.h index 6983f43..b57f5fc 100644 --- a/modules/db_berkeley/km_bdb_util.h +++ b/modules/db_berkeley/km_bdb_util.h @@ -28,8 +28,8 @@ */ -#ifndef _BDB_UTIL_H_ -#define _BDB_UTIL_H_ +#ifndef _KM_BDB_UTIL_H_ +#define _KM_BDB_UTIL_H_ #include "../../str.h" diff --git a/modules/db_berkeley/km_bdb_val.h b/modules/db_berkeley/km_bdb_val.h index 36294da..f5e73a7 100644 --- a/modules/db_berkeley/km_bdb_val.h +++ b/modules/db_berkeley/km_bdb_val.h @@ -28,8 +28,8 @@ */ -#ifndef _BDB_VAL_H_ -#define _BDB_VAL_H_ +#ifndef _KM_BDB_VAL_H_ +#define _KM_BDB_VAL_H_ #include "../../db/db_op.h" #include "../../db/db_res.h" diff --git a/modules/db_berkeley/km_db_berkeley.h b/modules/db_berkeley/km_db_berkeley.h index 8c2d17b..24c79cf 100644 --- a/modules/db_berkeley/km_db_berkeley.h +++ b/modules/db_berkeley/km_db_berkeley.h @@ -28,8 +28,8 @@ */ -#ifndef _BDB_H_ -#define _BDB_H_ +#ifndef _KM_BDB_H_ +#define _KM_BDB_H_ #include "../../db/db_con.h" #include "../../db/db_res.h"

15 years, 7 months

git:janakj/bdb: Link the modules also with libsrdb1

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 193d6c229d9afc5b60ba16f846112405ce5b247b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=193d6c2… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 12:41:26 2009 +0100 Link the modules also with libsrdb1 --- modules/db_berkeley/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/Makefile b/modules/db_berkeley/Makefile index 723bc6f..3d37368 100644 --- a/modules/db_berkeley/Makefile +++ b/modules/db_berkeley/Makefile @@ -17,6 +17,6 @@ DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/ LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb SERLIBPATH=../../lib -SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 +SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev