sr-dev

sr-dev@lists.kamailio.org

15 participants
43426 discussions

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

by Jan Janak

Module: sip-router Branch: janakj/ldap DELETED Commit: a5ec520efadd627420028d1ffecba98575872299 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5ec520… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 15:18:01 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into ldap * 'master' of ssh://janakj@git.sip-router.org/sip-router: SER replaced with SIP Router in the doxygen main file. ---

15 years, 7 months

git:janakj/postgres DELETED: Integrate functions and parameters from kamailio sources.

by Jan Janak

Module: sip-router Branch: janakj/postgres DELETED Commit: f0546a246d0098405b61a64ca0fbaf32bbb5373f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0546a2… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 14:32:18 2009 +0100 Integrate functions and parameters from kamailio sources. This patch adds db_bind_api function from kamailio sources to the list of exported functions. Also we call the mod_init function from kamailio sources at the and of the mod_init function in pg_mod.c. To make this possible I added a new header file and removed static from the mod_init function declaration. --- modules/db_postgres/km_db_postgres.c | 9 ++----- modules/db_postgres/km_db_postgres.h | 39 ++++++++++++++++++++++++++++++++++ modules/db_postgres/pg_mod.c | 4 ++- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index c3df575..ffe9230 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -38,14 +38,11 @@ #include "../../lib/srdb1/db_con.h" #include "../../lib/srdb1/db.h" #include "km_dbase.h" +#include "km_db_postgres.h" /*MODULE_VERSION*/ -int db_postgres_bind_api(db_func_t *dbb); - -static int mod_init(void); - /* * PostgreSQL database module interface */ @@ -66,14 +63,14 @@ struct kam_module_exports kam_exports = { 0, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */ - mod_init, /* module initialization function */ + km_postgres_mod_init, /* module initialization function */ 0, /* response function*/ 0, /* destroy function */ 0 /* per-child init function */ }; -static int mod_init(void) +int km_postgres_mod_init(void) { return 0; } diff --git a/modules/db_postgres/km_db_postgres.h b/modules/db_postgres/km_db_postgres.h new file mode 100644 index 0000000..8959417 --- /dev/null +++ b/modules/db_postgres/km_db_postgres.h @@ -0,0 +1,39 @@ +/* + * $Id$ + * + * Copyright (C) 2001-2003 FhG Fokus + * Copyright (C) 2008 1&1 Internet AG + * + * 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 + */ + +/*! \file + * \brief DB_POSTGRES :: Core + * \ingroup db_postgres + * Module: \ref db_postgres + */ + +#ifndef _KM_DB_POSTGRES_H +#define _KM_DB_POSTGRES_H + +#include "../../lib/srdb1/db.h" + +int db_postgres_bind_api(db_func_t *dbb); + +int km_postgres_mod_init(void); + +#endif /* _KM_DB_POSTGRES_H */ diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index 1bc4ad4..3c1e2d9 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -42,6 +42,7 @@ #include "pg_cmd.h" #include "pg_res.h" #include "pg_fld.h" +#include "km_db_postgres.h" #include "../../sr_module.h" @@ -77,6 +78,7 @@ static cmd_export_t cmds[] = { {"db_next", (cmd_function)pg_cmd_next, 0, 0, 0}, {"db_setopt", (cmd_function)pg_setopt, 0, 0, 0}, {"db_getopt", (cmd_function)pg_getopt, 0, 0, 0}, + {"db_bind_api", (cmd_function)db_postgres_bind_api, 0, 0, 0}, {0, 0, 0, 0, 0} }; @@ -538,7 +540,7 @@ static int pg_mod_init(void) } return -1; #endif /* PG_TEST */ - return 0; + return km_postgres_mod_init(); } /** @} */

15 years, 7 months

git:janakj/mysql DELETED: Make sure mod_init from kamailio/ db_mysql is called.

by Jan Janak

Module: sip-router Branch: janakj/mysql DELETED Commit: 43f01015237b9fabd9ef36d9674aac5bababcb1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43f0101… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 11:12:04 2009 +0100 Make sure mod_init from kamailio/db_mysql is called. Changes include: * mysql_mod_init renamed to kam_mysql_mod_init to avoid conflicts with sources from ser * The function is no longer static so that it can be accessed from mysql_mod.c * mysql_mod_init modified to call kam_mysql_mod_init at the end. --- modules/db_mysql/km_db_mysql.c | 6 ++---- modules/db_mysql/km_db_mysql.h | 2 ++ modules/db_mysql/mysql_mod.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 5c564b1..eb0ca05 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -50,8 +50,6 @@ unsigned int db_mysql_timeout_interval = 2; /* Default is 6 seconds */ unsigned int db_mysql_auto_reconnect = 1; /* Default is enabled */ -static int mysql_mod_init(void); - /* MODULE_VERSION */ /*! \brief @@ -81,14 +79,14 @@ struct kam_module_exports kam_exports = { 0, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */ - mysql_mod_init, /* module initialization function */ + kam_mysql_mod_init, /* module initialization function */ 0, /* response function*/ 0, /* destroy function */ 0 /* per-child init function */ }; -static int mysql_mod_init(void) +int kam_mysql_mod_init(void) { LM_DBG("MySQL client version is %s\n", mysql_get_client_info()); return 0; diff --git a/modules/db_mysql/km_db_mysql.h b/modules/db_mysql/km_db_mysql.h index b0b475e..4705ca0 100644 --- a/modules/db_mysql/km_db_mysql.h +++ b/modules/db_mysql/km_db_mysql.h @@ -45,4 +45,6 @@ extern unsigned int db_mysql_auto_reconnect; int db_mysql_bind_api(db_func_t *dbb); +int kam_mysql_mod_init(void); + #endif /* KM_DB_MOD_H */ diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index 61c2683..bfd903d 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -144,7 +144,8 @@ static int mysql_mod_init(void) " compiled against %ld)\n", MYSQL_VERSION_ID); } #endif - return 0; + + return kam_mysql_mod_init(); } /** @} */

15 years, 7 months

DB Driver Migration Status

by Jan Janak

Here is a short summary of my database driver integration attempt. The following db driver modules have been merged from both (kamailio and ser), these modules should work with both projects and they have been merged into the sip-router master branch: * db_berkeley * db_flatstore * db_mysql * db_postgres I have verified that all the modules above can be compiled in sip-router and that they can be loaded and used. Two modules, db_flatstore and db_berkeley, contain support for kamailio MI interface. The interface wouldn't work right now because I could not export MI functions with the current state of sip-router module interface. All the functions are there but they won't be made available to the MI interface. Then there are some database drivers that I haven' integrated because it does not make much sense right now: * oracle in ser and db_oracle in kamailio, the ser module currently does not work * dbtext in ser and db_text in kamailio, the ser module currently does not work And finally db_unixodbc module in kamailio does not have an equivalent in ser so we can keep it where it is right now. I would like to extend the module with support for libsrdb2 in the future and make it work with sip-router as well. Jan.

15 years, 7 months

git:master: Module renamed to db_bdb.

by Jan Janak

Module: sip-router Branch: master 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, 7 months

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, 7 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, 7 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, 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: b209c3880db34ff43524027b3782bfd87b278b22 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b209c38… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 14:47:57 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: (194 commits) Support for db driver names with "db_" prefix in libsrdb2. Make sure mod_init from kamailio/db_mysql is called. Export kamailio/db_mysql parameters through the module api. Export db_bind_api through the module interface. Eliminate conflicts with files imported from ser/mysql modules. DB_* renamed to DB1_* in files originating from kamailio/db_mysql. db_res renamed to db1_res in files originating from kamailio/db_mysql. db_con renamed to db1_con in files originating from kamailio/db_mysql. Integration of both modules, first step. Module name changed to db_mysql. Changes necessary to make the module compile in the sip-router tree. - fixed auto_reconnect c&p error - add one DBG log to each drivers error condition, that the mem is freed - fix one DBG msg (still using module prefix), two small indention fixes - partial revert of commit rev5359 for db_mysql module - add group functionality to read content from specified sections - unify common rows and row allocation functionality in the DB API core - change behaviour of db_str2val, this now copy strings - move db_mysql and db_unixodbc str2val implementation to the DB core, - fix a few errors in doxygen documentation ... ---

15 years, 7 months

git:janakj/bdb: Link the module with libkmi.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: fde7a8e8c50bf4094ce678eb601cc3d4dc6aa8b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fde7a8e… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 12:52:45 2009 +0100 Link the module with libkmi. --- modules/db_berkeley/Makefile | 2 +- modules/db_berkeley/km_bdb_mi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_berkeley/Makefile b/modules/db_berkeley/Makefile index 3d37368..617c3c3 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 $(SERLIBPATH)/srdb1/srdb1 +SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/kmi/kmi include ../../Makefile.modules diff --git a/modules/db_berkeley/km_bdb_mi.h b/modules/db_berkeley/km_bdb_mi.h index 1e51302..1767e37 100644 --- a/modules/db_berkeley/km_bdb_mi.h +++ b/modules/db_berkeley/km_bdb_mi.h @@ -26,7 +26,7 @@ #ifndef _KM_BDB_MI_H_ #define _KM_BDB_MI_H_ -#include "../../mi/mi.h" +#include "../../lib/kmi/mi.h" #define MI_BDB_RELOAD "bdb_reload"

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