sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:master: Kamailio to sip-router module conversion script.
by Jan Janak 17 Feb '09

17 Feb '09

Module: sip-router Branch: master Commit: ec898038f34decb415e3adb696f2c0ff2ab007ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec89803… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 19:13:11 2009 +0100 Kamailio to sip-router module conversion script. This is a simple script which attempts to convert modules that use kamalio core to sip-router core. Signed-off-by: Jan Janak <jan(a)iptel.org> --- scripts/kam_to_sr.sh | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/scripts/kam_to_sr.sh b/scripts/kam_to_sr.sh new file mode 100755 index 0000000..330ee07 --- /dev/null +++ b/scripts/kam_to_sr.sh @@ -0,0 +1,107 @@ +#!/usr/bin/env sh +# +# This is a simple script which attempts to convert kamailio modules so that +# they can be used with the sip-router core. Most of the changes done by the +# script deal with the changes in the database abstraction layer in the +# sip-router source tree. +# +# Run this script in module directory to convert it from kamailio core to +# sip-router core. The root of the tree should be two levels up, otherwise +# relative paths to headers (../..) would not work and the module will not +# compile. +# +# Some of the changes done by the script: +# +# * Extra defines in the Makefile to make the module link with libsrdb1 +# * Path to database headers updated to point to lib/srdb1 +# * db_con_t and db_res_t renamed to db1_con_t and db1_res_t in *.[ch] +# * Value type names such as DB_INT changed to DB1_INT in *.[ch] +# +# NOTE: There is no guarantee that the update module would compile or even +# work. Make a backup before running the script. You have been warned! +# +# Written by Jan Janak <jan(a)iptel.org> +# + +if [ ! -f Makefile ] ; then + echo "ERROR: Could not find module Makefile" + echo " Run this file in the module directory" + exit 1 +fi + +if ! egrep "Makefile\.modules" Makefile >/dev/null ; then + echo "ERROR: Doesn't look like a module..." + exit 1 +fi + +if ! egrep '^#[ \t]*include[ \t]*".*\/db\/db(_(cap|id|key|op|pool|query|res|row|ut|val))?\.h[ \t]*"' *.[ch] >/dev/null ; then + echo "The module does not seem to include old database headers..." + exit 0 +fi + +echo -n "Updating Makefile..." +cp Makefile Makefile.backup +cat Makefile.backup | gawk ' +BEGIN { + serlibpath_seen = 0 + libs_seen = 0 + defs_seen = 0 +} + +# If the define already exists then skip it, this ensures that +# we do not add the same line more than once. +/^[ \t]*DEFS[ \t]*\+?=.*OPENSER_MOD_INTERFACE/ { + defs_seen = 1 +} + +/^[ \t]*SER_LIBS[ \t]*\+?=.*srdb1\/srdb1/ { + libs_seen = 1 +} + +/^[ \t]*SERLIBPATH[ \t]*=/ { + serlibpath_seen = 1 +} + +# Write everything just before the line including Makefile.modules, +# this is most likely the last line in the Makefile +/^[ \t]*include[ \t]+.*\/Makefile\.modules[ \t]*$/ { + if (serlibpath_seen == 0) print "SERLIBPATH=../../lib" + if (defs_seen == 0) print "DEFS+=-DOPENSER_MOD_INTERFACE" + if (libs_seen == 0) print "SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1" +} + +{ print $0 } + +' > Makefile +echo "done." + +for file in *.[ch] ; do + echo -n "Updating file $file..." + cp $file $file.backup + cat $file.backup | gawk ' + +/^#[ \t]*include[ \t]*".*\/db\/db(_(cap|id|key|op|pool|query|res|row|ut|val))?\.h[ \t]*"/ { + sub("/db/", "/lib/srdb1/", $0); +} + +/[^a-zA-Z0-9_](db_(con|res)_t|struct[ \t]+db_(con|res))[^a-zA-Z0-9_]/ { + gsub("struct[ \t]+db_con", "struct db1_con", $0); + gsub("struct[ \t]+db_res", "struct db1_res", $0); + gsub("db_con_t", "db1_con_t", $0); + gsub("db_res_t", "db1_res_t", $0); +} + +/[^a-zA-Z0-9_]DB_((BIG)?INT|DOUBLE|STR(ING)?|DATETIME|BLOB|BITMAP)[^a-zA-Z0-9_]/ { + gsub("DB_INT", "DB1_INT", $0); + gsub("DB_BIGINT", "DB1_BIGINT", $0); + gsub("DB_DOUBLE", "DB1_DOUBLE", $0); + gsub("DB_STR", "DB1_STR", $0); + gsub("DB_DATETIME", "DB1_DATETIME", $0); + gsub("DB_BLOB", "DB1_BLOB", $0); + gsub("DB_BITMAP", "DB1_BITMAP", $0); +} + +{ print $0 } +' >$file + echo "done." +done

1 0

git:master: SER to sip-router module conversion script.
by Jan Janak 17 Feb '09

17 Feb '09

Module: sip-router Branch: master Commit: beb252b7d97cba59830a321b0a4c8981c35ca0c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=beb252b… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 19:15:16 2009 +0100 SER to sip-router module conversion script. This is a simple script which attempts to convert modules that use ser core to sip-router core. Signed-off-by: Jan Janak <jan(a)iptel.org> --- scripts/ser_to_sr.sh | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/scripts/ser_to_sr.sh b/scripts/ser_to_sr.sh new file mode 100755 index 0000000..6826426 --- /dev/null +++ b/scripts/ser_to_sr.sh @@ -0,0 +1,107 @@ +#!/usr/bin/env sh +# +# This is a simple script which attempts to convert ser modules so that they +# can be used with the sip-router core. Most of the changes done by the script +# deal with the changes in the database abstraction layer in the sip-router +# source tree. +# +# Run this script in module directory to convert it from ser core to +# sip-router core. The root of the tree should be two levels up, otherwise +# relative paths to headers (../..) would not work and the module will not +# compile. +# +# Some of the changes done by the script: +# +# * Extra defines in the Makefile to make the module link with libsrdb2 +# * Path to database headers updated to point to lib/srdb2 +# * Database flag names renamed from DB_* to SRDB_* +# (DB_DISABLED -> SRDB_DISABLED) +# +# NOTE: There is no guarantee that the update module would compile or even +# work. Make a backup before running the script. You have been warned! +# +# Written by Jan Janak <jan(a)iptel.org> +# + +if [ ! -f Makefile ] ; then + echo "ERROR: Could not find module Makefile" + echo " Run this file in the module directory" + exit 1 +fi + +if ! egrep "Makefile\.modules" Makefile >/dev/null ; then + echo "ERROR: Doesn't look like a module..." + exit 1 +fi + +if ! egrep '^#[ \t]*include[ \t]*".*\/db\/db(_(cmd|con|ctx|drv|fld|gen|pool|rec|res|uri))?\.h[ \t]*"' *.[ch] >/dev/null ; then + echo "The module does not seem to include old database headers..." + exit 0 +fi + +echo -n "Updating Makefile..." +cp Makefile Makefile.backup +cat Makefile.backup | gawk ' +BEGIN { + serlibpath_seen = 0 + libs_seen = 0 + defs_seen = 0 +} + +# If the define already exists then skip it, this ensures that +# we do not add the same line more than once. +/^[ \t]*DEFS[ \t]*\+?=.*SER_MOD_INTERFACE/ { + defs_seen = 1 +} + +/^[ \t]*SER_LIBS[ \t]*\+?=.*srdb2\/srdb2/ { + libs_seen = 1 +} + +/^[ \t]*SERLIBPATH[ \t]*=/ { + serlibpath_seen = 1 +} + +# Write everything just before the line including Makefile.modules, +# this is most likely the last line in the Makefile +/^[ \t]*include[ \t]+.*\/Makefile\.modules[ \t]*$/ { + if (serlibpath_seen == 0) print "SERLIBPATH=../../lib" + if (defs_seen == 0) print "DEFS+=-DSER_MOD_INTERFACE" + if (libs_seen == 0) print "SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2" +} + +{ print $0 } + +' > Makefile +echo "done." + +for file in *.[ch] ; do + echo -n "Updating file $file..." + cp $file $file.backup + cat $file.backup | gawk ' + +/^#[ \t]*include[ \t]*".*\/db\/db(_(cmd|con|ctx|drv|fld|gen|pool|rec|res|uri))?\.h[ \t]*"/ { + sub("/db/", "/lib/srdb2/", $0); +} + +/[^a-zA-Z0-9_]DB_(LOAD_SER|DISABLED|CANON|IS_(TO|FROM)|FOR_SERWEB|PENDING|((CALLER|CALLEE)_)?DELETED|MULTIVALUE|FILL_ON_REG|REQUIRED|DIR)[^a-zA-Z0-9_]/ { + gsub("DB_LOAD_SER", "SRDB_LOAD_SER", $0); + gsub("DB_DISABLED", "SRDB_DISABLED", $0); + gsub("DB_CANON", "SRDB_CANON", $0); + gsub("DB_IS_TO", "SRDB_IS_TO", $0); + gsub("DB_IS_FROM", "SRDB_IS_FROM", $0); + gsub("DB_FOR_SERWEB", "SRDB_FOR_SERWEB", $0); + gsub("DB_PENDING", "SRDB_PENDING", $0); + gsub("DB_DELETED", "SRDB_DELETED", $0); + gsub("DB_CALLER_DELETED", "SRDB_CALLER_DELETED", $0); + gsub("DB_CALLEE_DELETED", "SRDB_CALLEE_DELETED", $0); + gsub("DB_MULTIVALUE", "SRDB_MULTIVALUE", $0); + gsub("DB_FILL_ON_REG", "SRDB_FILL_ON_REG", $0); + gsub("DB_REQUIRED", "SRDB_REQUIRED", $0); + gsub("DB_DIR", "SRDB_DIR", $0); +} + +{ print $0 } +' >$file + echo "done." +done

1 0

minutes for IRC meeting 17.02.2009, release dates
by Henning Westerholt 17 Feb '09

17 Feb '09

Hi all, the minutes for todays IRC meeting are now available in our wiki [1]. Among the discussed topics we decided about a date for the upcoming 1.5.0 release, this is scheduled for the 2th march 2009. The first release that will use the new common sip-router core [2] is scheduled for May. After 1.5.0 we will also do a bug fix release (1.4.4) for our latest stable branch. All dates can be found in our wiki as well at [3]. Cheers, Henning [1]http://www.kamailio.org/dokuwiki/doku.php/development:irc-meeting-minutes… [2]http://sip-router.org/benefits/ [3]http://www.kamailio.org/dokuwiki/doku.php/development:release-policy#date… -- Henning Westerholt - Development Consumer Products / DSL Core 1&1 Internet AG, Ernst-Frey-Str. 9, 76135 Karlsruhe, Germany

1 0

git:daniel/pv: - statistics API from Kamailio
by Daniel-Constantin Mierla 17 Feb '09

17 Feb '09

Module: sip-router Branch: daniel/pv Commit: 04080484dbbc4eb2638b0392e2c39ca9f753e044 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0408048… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Feb 17 16:53:34 2009 +0200 - statistics API from Kamailio - MI stats commands and core stats vars removed, to be included in a module --- lib/kstats/Makefile | 10 ++ lib/kstats/statistics.c | 341 +++++++++++++++++++++++++++++++++++++++++++++++ lib/kstats/statistics.h | 198 +++++++++++++++++++++++++++ 3 files changed, 549 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=040…

1 0

git:daniel/pv: - included int2bstr
by Daniel-Constantin Mierla 17 Feb '09

17 Feb '09

Module: sip-router Branch: daniel/pv Commit: 87f1c343346b40e03ad906369120797ceb198110 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87f1c34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Feb 17 16:55:19 2009 +0200 - included int2bstr --- ut.h | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/ut.h b/ut.h index 013f963..e384737 100644 --- a/ut.h +++ b/ut.h @@ -234,6 +234,24 @@ static inline int btostr( char *p, unsigned char val) #define INT2STR_MAX_LEN (19+1+1) /* 2^64~= 16*10^18 => 19+1 digits + \0 */ +static inline char* int2bstr(unsigned long l, char *s, int* len) +{ + int i; + + i=INT2STR_MAX_LEN-2; + s[INT2STR_MAX_LEN-1]=0; /* null terminate */ + do{ + s[i]=l%10+'0'; + i--; + l/=10; + }while(l && (i>=0)); + if (l && (i<0)){ + LM_CRIT("overflow error\n"); + } + if (len) *len=(INT2STR_MAX_LEN-2)-i; + return &s[i+1]; +} + /* * returns a pointer to a static buffer containing l in asciiz (with base "base") & sets len * left padded with 0 to "size"

1 0

git:master: Support for db driver names with "db_" prefix in libsrdb2.
by Jan Janak 17 Feb '09

17 Feb '09

Module: sip-router Branch: master Commit: 2ba94ce0218a7e7ac0d849c0a9089dc57a59334b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ba94ce… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 14:46:42 2009 +0100 Support for db driver names with "db_" prefix in libsrdb2. This patch adds support for database driver names with "db_" prefix. We adopted this kamailio convention for sip-router and all database driver modules will have names starting with "db_", for example, the mysql database driver will be named "db_mysql". When searching for a database driver for database "foo", libsrdb2 will first try to search for a module named "db_foo". If no such module can be found then the library repeats the search for a module named just "foo". Signed-off-by: Jan Janak <jan(a)iptel.org> --- lib/srdb2/db_drv.c | 42 ++++++++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/lib/srdb2/db_drv.c b/lib/srdb2/db_drv.c index 52ae539..0cfcec8 100644 --- a/lib/srdb2/db_drv.c +++ b/lib/srdb2/db_drv.c @@ -62,28 +62,42 @@ void db_drv_free(db_drv_t* ptr) */ int db_drv_func(db_drv_func_t* func, str* module, char* func_name) { - char* buf; - - buf = pkg_malloc(module->len + 1); - if (buf == NULL) { + static str prefix = STR_STATIC_INIT("db_"); + char* buf = NULL, *name; + + if ((buf = pkg_malloc(prefix.len + module->len + 1)) == NULL) { LOG(L_ERR, "db_drv_func: No memory left\n"); - return -1; + goto error; } - memcpy(buf, module->s, module->len); - buf[module->len] = '\0'; - - if (find_module_by_name(buf) == 0) { - ERR("db_drv_func: database driver for '%s' not found\n", buf); - pkg_free(buf); - return -1; + + memcpy(buf, prefix.s, prefix.len); + memcpy(buf + prefix.len, module->s, module->len); + buf[prefix.len + module->len] = '\0'; + + /* First try to find the module with prefix "db_" */ + name = buf; + if (find_module_by_name(name) == 0) { + /* Not found, so try without the prefix */ + name = buf + prefix.len; + if (find_module_by_name(name) == 0) { + ERR("db_drv_func: database driver for '%.*s' not found\n", STR_FMT(module)); + goto error; + } } - *func = (db_drv_func_t)find_mod_export(buf, func_name, 0, 0); - pkg_free(buf); + + *func = (db_drv_func_t)find_mod_export(name, func_name, 0, 0); + + if (buf) pkg_free(buf); if (*func) return 0; else return 1; + +error: + if (buf) pkg_free(buf); + return -1; } + /* * Call function with name <func_name> in DB driver <module>, give * it pointer <db_struct> as the pointer to the corresponding DB structure

1 0

New commits on branch master
by Jan Janak 17 Feb '09

17 Feb '09

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43f0101… Author: 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. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a058e1… Author: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 11:04:29 2009 +0100 Export kamailio/db_mysql parameters through the module api. All parameters original exported by kamailio/db_mysql are now exported thought the api of the merged module in sip-router/modules/db_mysql. The parameter ping_interval is already present in the sources coming from ser, so we removed the original parameter from kamailio and used the one coming from ser. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4a0c89… Author: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 10:49:06 2009 +0100 Export db_bind_api through the module interface. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1061792… Author: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 00:05:25 2009 +0100 Eliminate conflicts with files imported from ser/mysql modules. * Comment out MODULE_VERSION, this is already used in mysql_mod.c * Prefix the type name of kamailio module data structures with kam_, this is how they were renamed in the sip-router repository. * Rename the exports structure to kam_exports to avoid conflict with the exports structure defined in mysql_mod.c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b81f22e… Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 23:17:48 2009 +0100 DB_* renamed to DB1_* in files originating from kamailio/db_mysql. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1fc20c… Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 23:13:16 2009 +0100 db_res renamed to db1_res in files originating from kamailio/db_mysql. The structure db_res has been renamed in lib/srdb1 to db1_res, thus we need to change the name of the structure in all files originating from kamailio/modules/db_mysql (and using lib/srdb1). URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=956802d… Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 23:09:32 2009 +0100 db_con renamed to db1_con in files originating from kamailio/db_mysql. The structure db_con has been renamed in lib/srdb1 to db1_con, thus we need to change the name of the structure in all files originating from kamailio/modules/db_mysql (and using lib/srdb1). URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9612127… Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 22:58:33 2009 +0100 Integration of both modules, first step. * Defines protecting header files from double inclusion fixed to match filenames. * Linked the module also with srdb1 * Fixed path to header files in lib/srdb1. * Filenames of local included header files prefixed with km_ to match their real filenames URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ba587f… Merge: 21153f2dbc67e80579b9797e56f0f789bbabe093 74f98d3161ed96afff958d48009fb4d7c74b2760 Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 21:54:06 2009 +0100 Merge of kamaililo db_mysql module history into the sip-router tree. This is a merge of the full history of the kamailio db_mysql module into the git tree of the sip-router project. The purpose of the merge is to preserve full history from kamailio svn also in the git repository. The module db_mysql already exists in the sip-router tree, it contains the sources merged from SER cvs (so called version 2 of the module). To avoid file conflicts we renamed all files that have been imported from kamailio svn and they are prefixed with km_. Further integration with existing db_mysql module will be commited on top of this merge. * my_filtered: (45 commits) - 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 - add a comment about the NULL value behaviour of libmysql - docs extension: explain fetch_result functionality better to prevent errors - remove not reached return statement at the end of val2str functions - initial support for BIGINT database in DB core and SQL based database - evaluate DECIMAL (and NEW_DECIMAL) type a DB_STRING, and not DB_INT - fixed compile error - MYSQL_TYPE_NEWDECIMAL date type is supported - fix link entity names, patch from Carsten Gross - port from opensips r4526, credits goes to bogdan - regenerated all READMEs (make modules-readme exclude_modules="") - renaming: changed entities in documentation - renaming: openser -> kamailio ... URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21153f2… Merge: 1ee9fa7cf857b8f770a13ab7174a02fef47938d0 5e3324ea2a02ea3dd6528e788ea01a766d4137bc Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 15:18:02 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into mysql * 'master' of ssh://janakj@git.sip-router.org/sip-router: SER replaced with SIP Router in the doxygen main file. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ee9fa7… Merge: 3d314ae153c733e6e7833a0a48a6920338fd4358 83d38c79ed890f96a057da65bd6625d3963aa300 Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 01:07:20 2009 +0100 Merge branches 'janakj/mysql' and 'master' of ssh://janakj@git.sip-router.org/sip-router into mysql * 'janakj/mysql' of ssh://janakj@git.sip-router.org/sip-router: * 'master' of ssh://janakj@git.sip-router.org/sip-router: Database flags renamed from DB_* to SRDB_* to avoid conflicts. libsrdb1: futex warning fix - port from kamailio trunk, r5607 - sync transformations add/lookup with kamailio init_mi_core() exported via mi.h mi include file MI: core part script parsing: while support script engine: while() support script engine: switch() and break execution script engine: switch() fixup and optimizations script parsing: C style switch() & case support expr engine: minor additions URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d314ae… Author: Jan Janak <jan(a)iptel.org> Date: Fri Feb 13 01:53:03 2009 +0100 Module name changed to db_mysql. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9bbb835… Author: Jan Janak <jan(a)iptel.org> Date: Fri Feb 13 01:51:33 2009 +0100 Changes necessary to make the module compile in the sip-router tree. This is a set of changes necessary to make the LDAP module compile in the sip-router tree. This includes: * Extra stuff in the Makefile to link with libsrdb2 * Defined SER_MOD_INTERFACE in the makefile * Updated relative paths to srdb2 header files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81e8933… Merge: 2d6bfb46145eb354f0ed22301a8fdeef67eacf2e 0af03a1d6a14ccdf3f0344d30a042060ea85743a Author: Jan Janak <jan(a)iptel.org> Date: Fri Feb 13 01:20:29 2009 +0100 Merge commit 'ser_mysql/master' into mysql * commit 'ser_mysql/master': (138 commits) - fixed a crash in mysql_stmt_fetch when the statement does not exist - mysql versions < 5.0 do not support MYSQL_DATA_TRUNCATED - buffer size increased to 1024 - put doxygen docs in correct group - support for 'last_id' getopt, which retrieves the unique id of the last - Support for fetching all data to the client at once - check_result_columns renamed to check_result - better check of the return value of mysql_stmt_result_metadata - reordered included header files for better detection of missing headers added non equal operator to DB API and mysql module - a couple of minor bug fixes backported from internal verion - dispose driver-specific driver properly on error - re-submit compiled queries to the server upon reconnect added doxygen comment to deal with these files updated update_params() to work with 3 sets of params added common prefix 'mysql:' into INFOs more descriptive comments removed forgotten abort() from error handler. added doxygen comment Preparation for implementation of UPDATE db statement. ... URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74f98d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Feb 10 20:59:58 2009 +0000 - fixed auto_reconnect c&p error git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5583 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d26ebfb… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 7 14:46:10 2009 +0000 - add one DBG log to each drivers error condition, that the mem is freed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5431 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50e2150… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 7 08:43:22 2009 +0000 - fix one DBG msg (still using module prefix), two small indention fixes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5425 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f628410… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 18:29:35 2009 +0000 - partial revert of commit rev5359 for db_mysql module - generalize db_str2val function in the DB API core, the string copying behaviour can now configured (its done for db_postgres, db_unixodbc, not done for db_mysql like in the 1.3, 1.4 branches) - still TODO: fix NULL case in db_unixodbc, try to fix double copying git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5423 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89215f1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 12:27:49 2009 +0000 - add group functionality to read content from specified sections of the mysql config to the db_mysql module, db_url examples: * mysql://user:pass@[group]host:port/db or * mysql://user:pass@[group]/db or * mysql://[group]/db - existing functionality is not changed, this is backward compatible - check usernames for NULL before comparing in DB API, otherwise it would segfault when only a group name is specified - patch from Andreas Granig, agranig at sipwise dot com, closes #1815631 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5413 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b7e436… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 16:33:22 2008 +0000 - unify common rows and row allocation functionality in the DB API core git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5362 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b32ac21… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 15:07:12 2008 +0000 - change behaviour of db_str2val, this now copy strings - this change was necessary because in some circumstances the memory that is returned from the database driver is used by some other means too fast, causes crashed or wrong results later on, this bug is timing related - this means for mysql and unixodbc that the performance will be decreased a bit, postgres already copied the string, so here nothing change - add a new function to DB core API, db_val2str that, usable to convert numerical values to a string, and common things like NULL values conversion, parameter checks - convert mysql, postgres and unixodbc module to use this new function - convert postgres function to use the core db_str2val function, the copying is now done at a different place, cleanup the code somewhat - remove unnecessary assignment if a NULL value is encountered in postgres - TODO: fix NULL handling and double copying that is done now for unixodbc git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5359 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f828dad… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Dec 10 18:41:09 2008 +0000 - move db_mysql and db_unixodbc str2val implementation to the DB core, remove the duplicated implementation in the modules (preparation for query copy problem) - introduced a small regression for the unixodbc in the NULL value handling that needs to be fixed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5322 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ffb6c9… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Nov 25 09:34:15 2008 +0000 - fix a few errors in doxygen documentation - sync one function definitions variables with declaration git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5254 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c56b449… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 13 16:14:34 2008 +0000 - add a comment about the NULL value behaviour of libmysql - add some doxygen documentation git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5197 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=205f28c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 17 08:01:23 2008 +0000 - docs extension: explain fetch_result functionality better to prevent errors because of wrong usage, found from Juha Heinanen git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5088 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c98552… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 19 11:56:49 2008 +0000 - remove not reached return statement at the end of val2str functions git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4965 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d98f9c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Sep 16 16:44:10 2008 +0000 - initial support for BIGINT database in DB core and SQL based database modules, closes patch #2101659 - some tests for mysql were done, but more testing, especially for the postgres and unixodbc would be appreciated - Todo: fix other DB modules, at the moment some warnings are printed during compilation because of the unhandled BIGINT state git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4928 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b74e6f6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 15 10:26:35 2008 +0000 - evaluate DECIMAL (and NEW_DECIMAL) type a DB_STRING, and not DB_INT - patch from Alex Hermann, related to #2111861 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4901 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b863b51… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Sep 2 08:48:31 2008 +0000 - fixed compile error - MYSQL_TYPE_NEWDECIMAL date type is supported only starting with mysql 5.0, Reported by Andrew Pogrebennyk. related to opensips bug 2085158, credits to Bogdan git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4801 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b96eb7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Aug 7 09:15:08 2008 +0000 - fix link entity names, patch from Carsten Gross - regenerate READMEs git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4630 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ec58d2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 6 15:32:44 2008 +0000 - port from opensips r4526, credits goes to bogdan - 64bits compile warnings fixed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4618 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=409249d… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 10:49:19 2008 +0000 - regenerated all READMEs (make modules-readme exclude_modules="") git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4596 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fce73b2… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 10:08:33 2008 +0000 - renaming: changed entities in documentation git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4594 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b8cb3b… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 08:20:30 2008 +0000 - renaming: openser -> kamailio git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4585 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d85d5a2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 30 09:20:54 2008 +0000 - fix some FAQ entries, change missing entity, regenerate READMEs git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4524 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31f52f1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jul 28 15:39:28 2008 +0000 - change name in copyright headers git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4518 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=083502f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jul 24 15:20:11 2008 +0000 - small doxygen updates (group, syntax), small docs update - patch provided from Olle E. Johansson, closes #2025079 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4505 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a37c75a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 17 13:06:28 2008 +0000 - fix database related doxygen errors git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4398 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0af03a1… Author: Jan Janak <jan(a)iptel.org> Date: Sun Jun 1 19:22:15 2008 +0000 - fixed a crash in mysql_stmt_fetch when the statement does not exist URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bbe2e8… Author: Jan Janak <jan(a)iptel.org> Date: Thu May 22 13:55:24 2008 +0000 - mysql versions < 5.0 do not support MYSQL_DATA_TRUNCATED patch provided by Alfred E. Heggestad closes SER-377 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3c3408… Author: Jan Janak <jan(a)iptel.org> Date: Thu May 15 10:51:19 2008 +0000 - buffer size increased to 1024 - fixed zero termination of truncated fields (reported by Miklos) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24d1af2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 13 12:00:36 2008 +0000 - add a few more missing '\n' to debug messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4163 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03018e8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri May 9 15:50:17 2008 +0000 - add a few missing '\n' to log messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4149 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcdd7e7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 8 16:12:31 2008 +0000 - some synchronisations with db_postgres driver - move LAST_ROW incrementation to the end of the function, to only update after a successfull fetch - add two debug messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4138 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=386508a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 7 16:36:48 2008 +0000 - convert existing documentation to doxygen format - add some comments, some smaller cleanups - small adjustment of the fetch_result function to the postgres one, add one DBG message, renames a parameter git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4124 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95e252d… Author: Jan Janak <jan(a)iptel.org> Date: Tue May 6 12:07:48 2008 +0000 - put doxygen docs in correct group URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48855bf… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Apr 1 08:54:30 2008 +0000 - extend debugging with result type information git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3968 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcdc7f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 19 20:40:18 2008 +0000 - titles for admin, devel and faq chapters are defined via entities for coherence and easier management git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3940 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b25ae3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 19 19:31:30 2008 +0000 - updated old entity names git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3939 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f532abc… Author: 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 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=982fe04… Author: 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 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=436dbd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 7 20:00:30 2008 +0000 - re-sync READMEs after last updates git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3892 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc99867… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 7 19:52:29 2008 +0000 - step 2 for the rest of modules to re-link history from sgml to xml files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3891 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47241f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 7 19:41:22 2008 +0000 - step 1 for the rest of modules to re-link history from sgml to xml files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3890 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9493640… Author: 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 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6043e41… Author: 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 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5ccb8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 29 20:38:56 2008 +0000 - mysql module exports db_bind_api() git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3813 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0045307… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 27 13:53:33 2008 +0000 - first round of cleanups for documentation - remove all FAQ and DEVEL files considered empty in content (no content at all or just the default lines) - remove of the <RevHistory>/</RevHistory> tag (and of course anything between them) - remove the comments at the end of the file that begins with "<!-- Keep this element at the end of the file" - credits for the patch/ the change scripts goes to Edson Gellert Schubert, 4lists at gmail dot com git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3769 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4944cf… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Feb 26 14:41:46 2008 +0000 - small optimization in db_mysql git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3761 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3df2afa… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 14 15:40:44 2008 +0000 - support for 'last_id' getopt, which retrieves the unique id of the last inserted row URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12fc5c1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Feb 8 11:39:46 2008 +0000 - rename db_mod.* files - rename my_con.* files in db_unixodbc - fix includes in modules git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3666 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7eb19c2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 15:46:09 2008 +0000 further changes after the db name change - update INSTALL file - fix Makefile skip modules variable - fix module Makefile, lib name - change db_bind_mod to add the db prefix in the function - change db url defines in db_berkeley and db_text - change database modules names in module struct - fix debian packaging - fix tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3642 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b4d3ac… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 13:32:59 2008 +0000 - fix user documentation and rename all sgml file after the name change of the database modules git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3639 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f77829… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 13:10:03 2008 +0000 - rename database modules to use the 'db_' prefix git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3638 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=905f205… Author: Jan Janak <jan(a)iptel.org> Date: Sun Feb 3 19:12:05 2008 +0000 - Support for fetching all data to the client at once - Implemented db_setopt and db_getopt support for "fetch_all" command, when set to 1 (default), the client library will fetch all data to client in one step, this behavior can be disabled by setting the parameter to 0. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5694182… Author: Jan Janak <jan(a)iptel.org> Date: Wed Jan 16 15:27:06 2008 +0000 - check_result_columns renamed to check_result - bind_result ignores empty result sets without indicating errors URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03547ce… Author: Jan Janak <jan(a)iptel.org> Date: Wed Jan 16 14:58:46 2008 +0000 - better check of the return value of mysql_stmt_result_metadata URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a201f9a… Author: Jan Janak <jan(a)iptel.org> Date: Wed Jan 16 14:17:28 2008 +0000 - reordered included header files for better detection of missing headers - disable automatic database reconnects, they do not work with pre-compiled statements - error/info/log message cleanup - auto_reconnect module parameter removed - introduced new module parameter retries which controls the number of times queries are tried to execute on server on failures URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9006064… Author: Nils Ohlmeier <nils(a)iptel.org> Date: Fri Jan 11 19:27:11 2008 +0000 added non equal operator to DB API and mysql module URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=356e43f… Author: Jan Janak <jan(a)iptel.org> Date: Thu Nov 15 17:27:06 2007 +0000 - a couple of minor bug fixes backported from internal verion - support for "fake NULL" values (strings or integers that will be written in database if the value is NULL) (compile time option) - proper support for raw SQL statements - the possibility to retrieve fields in the result set and their types from the server added (needed for queries like select *). URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae322c0… Author: Jan Janak <jan(a)iptel.org> Date: Thu Nov 15 15:09:01 2007 +0000 - dispose driver-specific driver properly on error URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea3fd38… Author: Jan Janak <jan(a)iptel.org> Date: Fri Jul 13 08:52:29 2007 +0000 - re-submit compiled queries to the server upon reconnect - removed superfluous INFO statements - removed C++ style comments URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d458b87… Author: Libor Chocholaty <libor(a)iptel.org> Date: Tue Jul 3 15:16:14 2007 +0000 added doxygen comment to deal with these files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ed9aa9… Author: Libor Chocholaty <libor(a)iptel.org> Date: Tue Jul 3 15:13:29 2007 +0000 updated update_params() to work with 3 sets of params URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cfdcbf… Author: Libor Chocholaty <libor(a)iptel.org> Date: Tue Jul 3 15:06:17 2007 +0000 added common prefix 'mysql:' into INFOs URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=904c3cf… Author: Libor Chocholaty <libor(a)iptel.org> Date: Tue Jul 3 14:53:22 2007 +0000 more descriptive comments URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5650c8c… Author: Libor Chocholaty <libor(a)iptel.org> Date: Mon Jul 2 11:04:05 2007 +0000 removed forgotten abort() from error handler. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b263021… Author: Libor Chocholaty <libor(a)iptel.org> Date: Mon Jun 25 17:53:12 2007 +0000 added doxygen comment URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1528972… Author: Libor Chocholaty <libor(a)iptel.org> Date: Mon Jun 25 17:51:27 2007 +0000 Preparation for implementation of UPDATE db statement. First of all we need two sets of params in db_cmd. First for match clause and the second as column-value pairs of changed columns. Currently it uses three sets of parameters: result, match and vals. - result - DB_GET output - match - DB_GET, DB_DEL (and DB_UPD in the future) - vals - DB_PUT (and DB_UPD) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1bc0f4e… Author: Jan Janak <jan(a)iptel.org> Date: Mon Jun 25 15:39:09 2007 +0000 Added the following features from Andrei: - connect_timeout parameter which allows to limit connection timeouts to mysql server - send_timeout parameter which can limit the time the client library spends sending data to the server - receive_timeout parameter which can limit the time the library spends waiting for the data from the server - enable reconnect for mysql >= 5.0.13 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=145a90d… Author: Jan Janak <jan(a)iptel.org> Date: Wed Apr 18 13:08:45 2007 +0000 - db_fld.v.str renamed to db_fld.v.lstr due to problems with g++ URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2cd3e83… Author: Jan Janak <jan(a)iptel.org> Date: Thu Apr 5 13:26:10 2007 +0000 - Support for raw sql queries URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e55ca85… Author: Jan Janak <jan(a)iptel.org> Date: Thu Apr 5 11:14:59 2007 +0000 - wrong comment fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=229049b… Author: Jan Janak <jan(a)iptel.org> Date: Wed Apr 4 13:59:17 2007 +0000 - extra debugging messages removed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25bdcd1… Author: Jan Janak <jan(a)iptel.org> Date: Wed Apr 4 12:33:06 2007 +0000 - fixed a couple of gcc warnings URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4198a3a… Author: Jan Janak <jan(a)iptel.org> Date: Wed Apr 4 11:48:20 2007 +0000 - mysql module updated to new db api URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f2d8d2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 23 21:03:38 2007 +0000 - relax db_init BUG check (allow db init from fixup functions) (SER-227 related) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01e5c3a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 22 15:56:48 2007 +0000 - fix the yesterday's fix: allow db_init from main if it's done from mod_init (but don't allow it and log a BUG if it happens from child_init(PROC_MAIN)). (SER-227 related) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03f6396… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 22 00:24:16 2007 +0000 - fix: db connections should not be opened from child_init(PROC_MAIN), or they will be inherited by all the tcp processes (bad). Bug reported by Jan Andres <jan.andres(a)freenet-ag.de>. closes SER-227 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cba9c4b… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Tue May 30 12:00:57 2006 +0000 bug currected: missing space in query between 'where' and 'order by' keywords URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c2f1d07… Author: Jan Janak <jan(a)iptel.org> Date: Mon Jan 30 16:49:51 2006 +0000 - enable reconnection explicitly Closes: SER-80 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77d5367… Author: Jan Janak <jan(a)iptel.org> Date: Tue Jan 10 22:16:07 2006 +0000 - DB_FLOAT support - fixed error in params_add in postgres module URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c89a6b9… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Sun Jan 8 22:43:14 2006 +0000 - export param types adjusted to PARAM_STR/STRING & PARAM_INT - removed corresponding obsolete strlen(str_param) in init URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd60366… Author: Jan Janak <jan(a)iptel.org> Date: Thu Jan 5 10:52:01 2006 +0000 - support for null values in where statements URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e42549d… Author: Jan Janak <jan(a)iptel.org> Date: Thu Dec 15 23:19:06 2005 +0000 - _timegm removed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aff750c… Author: Jan Janak <jan(a)iptel.org> Date: Tue Dec 13 00:19:29 2005 +0000 - module interface exended with list of management functions URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8508f5a… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Thu Nov 17 03:49:37 2005 +0000 Provide two useful macros for str initialization: STR_STATIC_INIT() and STR_NULL. Adjust all modules to use those macros where appropriate. Verified by: md5(1) (those modules, which actually compile) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b198137… Author: Jan Janak <jan(a)iptel.org> Date: Tue Nov 15 15:29:58 2005 +0000 - Store all date/time values in UTC in database - replacement for timegm (GNU extension) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b59ace5… Author: Jan Janak <jan(a)iptel.org> Date: Thu Oct 13 09:23:07 2005 +0000 - make debug message scheme independent URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f22f076… Author: Andreas Granig <agranig(a)linguin.org> Date: Wed Oct 12 02:57:00 2005 +0000 Mysql result wasn't free'd if converting result had failed. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b8946f… Author: Andreas Granig <agranig(a)linguin.org> Date: Tue Sep 20 13:28:34 2005 +0000 Moved mysql result from the connection to db_res_t to allow nested queries. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60bf49c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 1 22:25:05 2005 +0000 - makefiles cleanups (use $(LOCALBASE) everywhere) -- fixes some include path problems on netbsd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c32e609… Author: Jan Janak <jan(a)iptel.org> Date: Wed May 18 16:30:35 2005 +0000 - fixed misleading debug message URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce4c4dd… Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 28 18:52:51 2005 +0000 - Implemented DB_REPLACE capability URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=581857b… Author: Jan Janak <jan(a)iptel.org> Date: Fri Feb 25 16:31:45 2005 +0000 - All str pointers initialized to an emptry string, this is to prevent crashes when module writers do not check the NULL flag of a value properly. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2550113… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 24 19:37:11 2005 +0000 - previous commit was an older version of the function URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c77453e… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 24 17:44:54 2005 +0000 - atoi replaced with strtoul to convert also numbers > INT_MAX. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=942dd87… Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 7 15:21:08 2005 +0000 - parse_mysql_url not necessary anymore URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48d2c4c… Author: Jan Janak <jan(a)iptel.org> Date: Wed Feb 2 19:10:06 2005 +0000 - dead files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=344f101… Author: Jan Janak <jan(a)iptel.org> Date: Wed Feb 2 19:09:22 2005 +0000 - using improved connection pool URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c802ee8… Author: Jan Janak <jan(a)iptel.org> Date: Tue Feb 1 15:13:04 2005 +0000 - some useful debugging information URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=106f827… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Fri Jan 21 23:20:59 2005 +0000 -revert some dbg messages URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=730bddb… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Fri Jan 21 23:17:07 2005 +0000 -bug fixed in processing DB url without password URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3c7f85… Author: Jan Janak <jan(a)iptel.org> Date: Mon Dec 6 08:51:44 2004 +0000 - fixed typo -- dumplicated snprintf -- reported by Sun Zongjun URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61bd3ce… Author: Jan Janak <jan(a)iptel.org> Date: Sat Dec 4 23:40:28 2004 +0000 - Proper checking of the return value of snprintf Closes: SER-18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c922acc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 2 21:16:02 2004 +0000 - more warnings & signed/unsigned issues fixes (gcc 3.2/solaris) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=738c6a4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 2 15:55:25 2004 +0000 - removed -p port && extended -l to support the same syntax as listen= : -l [proto:]addr[:port] where proto=udp|tcp (default all), and addr=ip_addr|host|interface_name. E.g.: -l localhost, -l tcp:127.0.0.1 -l udp:[::1]:5062, -l eth0, -l tcp:xl1:5090 - mysql: fixed minor warning URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a1080c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 1 16:51:17 2004 +0000 core: - no fork unused sockets fix & cleanups mysql: - strptime XOPEN define URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cacef05… Author: Jan Janak <jan(a)iptel.org> Date: Wed Nov 3 13:16:45 2004 +0000 - All attributes of db_val_t set to 0 when the null attribute is set. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d7c807b… Author: Dan Pascu <dan(a)ag-projects.com> Date: Thu Oct 28 23:36:14 2004 +0000 - added ability to auto reconnect to mysql if a query attempt returns a 'server lost' error. - added auto_reconnect parameter to the mysql module, to allow switching it on/off (acts like a boolean value: 0 disabled, anything else enabled) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9b0c38… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 22 17:17:55 2004 +0000 - minor x86_64 fixes URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=955c461… Author: Jan Janak <jan(a)iptel.org> Date: Wed Sep 15 12:38:26 2004 +0000 - wrong parameter definition fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8193e4a… Author: Jan Janak <jan(a)iptel.org> Date: Thu Sep 9 14:45:48 2004 +0000 mysql_ping returns an error when connection is lost URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d54e993… Author: Jan Janak <jan(a)iptel.org> Date: Tue Aug 24 08:58:23 2004 +0000 - Spelling checked - READMEs updated URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c28c32a… Author: Jan Janak <jan(a)iptel.org> Date: Wed Aug 4 14:38:13 2004 +0000 Fixed a missing function URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6586f69… Author: Jan Janak <jan(a)iptel.org> Date: Wed Aug 4 14:25:06 2004 +0000 free_query changed to more descriptive free_result URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76c72cf… Author: Jan Janak <jan(a)iptel.org> Date: Tue Aug 3 17:43:41 2004 +0000 ping_interval == 0 disables this feature URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a041800… Author: Jan Janak <jan(a)iptel.org> Date: Tue Aug 3 17:22:06 2004 +0000 ping_interval parameter implemented, the module calls mysql_ping if the connection has been inactive for >= ping_interval. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d38a319… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 5 18:27:37 2004 +0000 mysql_real_escape_string called on string parameters URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86fa65f… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Feb 11 16:01:49 2004 +0000 - unwanted DBG message removed (added by me by mistake) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49131c4… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Fri Feb 6 18:56:49 2004 +0000 - basics for users preferences: - script param. "avp_db_url" added - scrit function "load_avp" with 2 or 3 params added - do_action updated - init. of bd connection from core on startup per each proccess - reseting avp list after main route and reply/failure_route execution URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0132ecd… Author: Jan Janak <jan(a)iptel.org> Date: Mon Jan 26 13:10:35 2004 +0000 Shallow copy of db_con->table instead of deep. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf63aa8… Author: Jan Janak <jan(a)iptel.org> Date: Mon Jan 26 12:46:15 2004 +0000 MySQL connection pool. Connections with the same URL are shared among modules within the same process. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95f5493… Author: Jan Janak <jan(a)iptel.org> Date: Mon Nov 17 22:49:50 2003 +0000 - small cleanup URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa1c003… Author: Jan Janak <jan(a)iptel.org> Date: Mon Nov 17 22:19:07 2003 +0000 - mysql parser state diagram URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3a64d8… Author: Jan Janak <jan(a)iptel.org> Date: Mon Nov 17 21:41:56 2003 +0000 - Better mysql URL parser URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd18ec1… Author: Jan Janak <jan(a)iptel.org> Date: Mon Nov 3 13:03:56 2003 +0000 - sql:// changed to mysql:// in all modules URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=555a346… Author: Daniel-Constantin Mierla <daniel(a)voice-system.ro> Date: Wed Oct 29 12:33:21 2003 +0000 - db_raw_query() does not return error when the result parameter is NULL -- usefull for INSERT/UPDATE when there is no result URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a40d3f… Author: Jan Janak <jan(a)iptel.org> Date: Fri Oct 24 20:36:03 2003 +0000 - removed obsolete files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37f120c… Author: Jan Janak <jan(a)iptel.org> Date: Fri Oct 24 20:35:35 2003 +0000 - More sane sources, additional include paths in Makefile URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cdf331… Author: Jan Janak <jan(a)iptel.org> Date: Wed Oct 8 13:07:21 2003 +0000 - Got rid of all the ~ at the beginning of functions that are not supposed to be called from scripts. It's a relict. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=473c6c0… Author: Jan Janak <jan(a)iptel.org> Date: Tue Sep 16 18:55:07 2003 +0000 - another mysql library directory added URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5e5955… Author: Jan Janak <jan(a)iptel.org> Date: Mon Sep 15 22:34:49 2003 +0000 - handling of DB_BITMAP added URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=929ce3c… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Jul 2 20:44:13 2003 +0000 one debug mesage commented out (it was screwing up the terminal when printing BLOBs) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e13713… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Mon May 26 13:05:57 2003 +0000 - in str2val() the 'nul' field is explcitly set to 0 if the value is not null (db_val.c line 154) - in get_columns() a switch brach for detecting BLOB type was added (db_res.c lines 94-99) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=087a1a6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri May 23 15:43:42 2003 +0000 - updated all makefiles (now 'cd modules/foo; make' will link with the proper libraries). Please add an "include ../../Makefile.defs" as first line of the local module Makefile if your module is not on the cvs) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=593f752… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Sun Apr 27 18:17:23 2003 +0000 module version checking introduced URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b4db74… Author: Jan Janak <jan(a)iptel.org> Date: Fri Apr 25 18:19:05 2003 +0000 -lz put back. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb0138d… Author: Nils Ohlmeier <nils(a)iptel.org> Date: Wed Apr 16 00:12:19 2003 +0000 Removed unnecessary zlib from linking libs. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4689590… Author: Jan Janak <jan(a)iptel.org> Date: Mon Apr 14 18:37:43 2003 +0000 - fixed the daylight saving problem. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3865b33… Author: Nils Ohlmeier <nils(a)iptel.org> Date: Fri Apr 11 18:24:55 2003 +0000 Inserted own timegm for non GNU systems. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d8e504… Author: Jan Janak <jan(a)iptel.org> Date: Sun Apr 6 20:25:51 2003 +0000 - child init called in all ser processes (main, timer, fifo, tcp_main, udp_children, tcp_children, tcp_main) - defined macros PROC_MAIN, PROC_TIMER, PROC_FIFO, PROC_TCP_MAIN - they substitute rank for special processes - listening children have rank 1 and higher - modified modules to use rank 1 instead of 0 (modules creating it's own children) - db connections are either not opened in mod_init or are closed immediately when needed (for example preloading data for all children from database) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8d0b22… Author: Nils Ohlmeier <nils(a)iptel.org> Date: Fri Apr 4 15:09:52 2003 +0000 Fixed timezone problem, where the localtime was added to the expires value of all contacts in the database. (Reported by Jiri) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc77617… Author: Jan Janak <jan(a)iptel.org> Date: Sun Mar 16 20:27:23 2003 +0000 flags parameter added to cmd_export_t URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca95bc2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 12 12:54:00 2003 +0000 - sun cc compilation fixes - various typos fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e09df6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 11 13:17:53 2003 +0000 - new module interface URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=452ba32… Author: Jan Janak <jan(a)iptel.org> Date: Mon Mar 3 20:45:45 2003 +0000 parameter checking in use_table fixed. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1902496… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 24 16:46:11 2003 +0000 - applied Maxim Sobolev <sobomax(a)FreeBSD.org> makefile patches (slightly adapted for the cvs version) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=316e41e… Author: Jan Janak <jan(a)iptel.org> Date: Tue Dec 3 12:37:11 2002 +0000 _XOPEN_SOURCE URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7d533a… Author: Jan Janak <jan(a)iptel.org> Date: Mon Dec 2 09:16:58 2002 +0000 Minor beautifications. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f361efc… Author: Jan Janak <jan(a)iptel.org> Date: Thu Nov 28 20:05:08 2002 +0000 Proper result handling for queries returning no result. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f46d75… Author: Jan Janak <jan(a)iptel.org> Date: Thu Nov 28 17:05:16 2002 +0000 An additional parameter to db_query, db_update, db_delete. New function - db_raw_query URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26b3ee5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 25 20:29:44 2002 +0000 - netbsd fixes - 64 bit mini-cleanup URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c2a2e9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Nov 12 12:32:17 2002 +0000 - added the proper libmysqlclient dir for FreeBSD URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ebf876a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 11 21:34:53 2002 +0000 - openbsd (3.2) support [ changes in fastlock.h, ser_module.c, tm/t_hooks.c, Makefiles ] - texops replace/search_append bugs fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ba8683… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 4 17:05:32 2002 +0000 - converted to autoconf compatible format (replaced some os specific ifdefs with HAVE_xxx a.s.o) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7208530… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Nov 2 01:35:08 2002 +0000 - fixed cfg.y for icc (hack) - many other small fixes URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcecf0b… Author: Daniel-Constantin Mierla <daniel(a)voice-system.ro> Date: Wed Oct 16 13:50:28 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0854a9f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 7 16:14:10 2002 +0000 - fixed some bad entries in debian/changelog & rpm spec - added -I & -L in mysql Makefile URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29c1e9a… Author: Jan Janak <jan(a)iptel.org> Date: Thu Sep 19 14:52:11 2002 +0000 Cosmetic change URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e280d3a… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Thu Sep 19 12:23:52 2002 +0000 GPLization banner introduced to *.[hc] files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc46395… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Thu Sep 19 11:51:26 2002 +0000 CVS substitutes introduced URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30b8dfb… Author: Jan Janak <jan(a)iptel.org> Date: Tue Sep 3 13:38:17 2002 +0000 bugs #342 & #343 fixed. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=06a690e… Author: Jan Janak <jan(a)iptel.org> Date: Fri Aug 30 10:16:58 2002 +0000 pkg_malloc result testing fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=deaea49… Author: Jan Janak <jan(a)iptel.org> Date: Wed Aug 21 20:18:11 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56877cd… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Aug 14 16:24:37 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd7ea16… Author: Jan Janak <jan(a)iptel.org> Date: Mon Aug 12 14:36:23 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a2212d… Author: Jan Janak <jan(a)iptel.org> Date: Mon Aug 12 11:34:04 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1d7b80… Author: Jan Janak <jan(a)iptel.org> Date: Mon Aug 12 11:33:17 2002 +0000 db_con internals changed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e34dfe9… Author: Jan Janak <jan(a)iptel.org> Date: Fri Aug 9 15:02:48 2002 +0000 Bug fixed. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc11734… Author: Jan Janak <jan(a)iptel.org> Date: Thu Aug 8 17:26:34 2002 +0000 return values changed, blob support added URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce699f8… Author: Jan Janak <jan(a)iptel.org> Date: Tue Aug 6 11:11:45 2002 +0000 str structure is supported now. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce7679f… Author: Jan Janak <jan(a)iptel.org> Date: Wed Jul 24 14:50:49 2002 +0000 Moved to sip_router/db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5d23c4… Author: Jan Janak <jan(a)iptel.org> Date: Wed Jul 24 14:45:10 2002 +0000 Header files split URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4017cbc… Author: Jan Janak <jan(a)iptel.org> Date: Tue Jul 9 09:08:25 2002 +0000 database module interface moved. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7bc9dd9… Author: Jan Janak <jan(a)iptel.org> Date: Fri May 10 01:00:09 2002 +0000 LOG typos fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73b7a1b… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Thu May 9 18:51:50 2002 +0000 added -L URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=817335e… Author: Jan Janak <jan(a)iptel.org> Date: Wed Apr 3 21:54:15 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6b41fd… Author: Jan Janak <jan(a)iptel.org> Date: Tue Mar 5 22:55:31 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bf9d6f… Author: Jan Janak <jan(a)iptel.org> Date: Tue Mar 5 14:36:03 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9799880… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 1 10:50:28 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fa0cfe… Author: Jan Janak <jan(a)iptel.org> Date: Sun Feb 24 17:11:42 2002 +0000 Order parameter added to db_query function URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e129165… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Fri Jan 11 19:58:58 2002 +0000 ref_count turned into ref_bitmap; oncancel module handler added URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78aa203… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Mon Jan 7 04:39:49 2002 +0000 performance and bug fixes URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cad239c… Author: Jan Janak <jan(a)iptel.org> Date: Thu Jan 3 22:09:27 2002 +0000 Database documentation added. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4553b3… Author: Jan Janak <jan(a)iptel.org> Date: Thu Jan 3 15:19:40 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c811180… Author: Jan Janak <jan(a)iptel.org> Date: Tue Dec 18 00:28:45 2001 +0000 Standalone database module

1 0

git:janakj/mysql: Export kamailio/ db_mysql parameters through the module api.
by Jan Janak 17 Feb '09

17 Feb '09

Module: sip-router Branch: janakj/mysql Commit: 1a058e14e1ae0b316c05999d088db2d0fdec03b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a058e1… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 11:04:29 2009 +0100 Export kamailio/db_mysql parameters through the module api. All parameters original exported by kamailio/db_mysql are now exported thought the api of the merged module in sip-router/modules/db_mysql. The parameter ping_interval is already present in the sources coming from ser, so we removed the original parameter from kamailio and used the one coming from ser. --- modules/db_mysql/km_db_mysql.c | 3 +-- modules/db_mysql/km_db_mysql.h | 1 - modules/db_mysql/km_dbase.c | 5 +++-- modules/db_mysql/mysql_mod.c | 3 +++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index eb17726..5c564b1 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -47,7 +47,6 @@ #include <mysql/mysql.h> -unsigned int db_mysql_ping_interval = 5 * 60; /* Default is 5 minutes */ unsigned int db_mysql_timeout_interval = 2; /* Default is 6 seconds */ unsigned int db_mysql_auto_reconnect = 1; /* Default is enabled */ @@ -67,7 +66,7 @@ static kam_cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"ping_interval", INT_PARAM, &db_mysql_ping_interval}, +/* {"ping_interval", INT_PARAM, &db_mysql_ping_interval}, */ {"timeout_interval", INT_PARAM, &db_mysql_timeout_interval}, {"auto_reconnect", INT_PARAM, &db_mysql_auto_reconnect}, {0, 0, 0} diff --git a/modules/db_mysql/km_db_mysql.h b/modules/db_mysql/km_db_mysql.h index fa6b698..b0b475e 100644 --- a/modules/db_mysql/km_db_mysql.h +++ b/modules/db_mysql/km_db_mysql.h @@ -40,7 +40,6 @@ #include "../../lib/srdb1/db.h" -extern unsigned int db_mysql_ping_interval; extern unsigned int db_mysql_timeout_interval; extern unsigned int db_mysql_auto_reconnect; diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 6294a02..49ab55a 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -42,6 +42,7 @@ #include "../../dprint.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" +#include "mysql_mod.h" #include "km_val.h" #include "km_my_con.h" #include "km_res.h" @@ -75,9 +76,9 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) return -1; } - if (db_mysql_ping_interval) { + if (my_ping_interval) { t = time(0); - if ((t - CON_TIMESTAMP(_h)) > db_mysql_ping_interval) { + if ((t - CON_TIMESTAMP(_h)) > my_ping_interval) { if (mysql_ping(CON_CONNECTION(_h))) { LM_WARN("driver error on ping: %s\n", mysql_error(CON_CONNECTION(_h))); } diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index bc9f3bb..61c2683 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -97,6 +97,9 @@ static param_export_t params[] = { {"send_timeout", PARAM_INT, &my_send_to}, {"receive_timeout", PARAM_INT, &my_recv_to}, {"retries", PARAM_INT, &my_retries}, + + {"timeout_interval", INT_PARAM, &db_mysql_timeout_interval}, + {"auto_reconnect", INT_PARAM, &db_mysql_auto_reconnect}, {0, 0, 0} };

1 0

git:janakj/mysql: Export db_bind_api through the module interface.
by Jan Janak 17 Feb '09

17 Feb '09

Module: sip-router Branch: janakj/mysql Commit: d4a0c89c75e8729d8185c93bb994f85cf0999646 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4a0c89… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 10:49:06 2009 +0100 Export db_bind_api through the module interface. --- modules/db_mysql/km_db_mysql.c | 3 --- modules/db_mysql/km_db_mysql.h | 4 ++++ modules/db_mysql/mysql_mod.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index efa5d88..eb17726 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -42,7 +42,6 @@ */ #include "../../sr_module.h" -#include "../../lib/srdb1/db.h" #include "km_dbase.h" #include "km_db_mysql.h" @@ -56,8 +55,6 @@ static int mysql_mod_init(void); /* MODULE_VERSION */ -int db_mysql_bind_api(db_func_t *dbb); - /*! \brief * MySQL database module interface */ diff --git a/modules/db_mysql/km_db_mysql.h b/modules/db_mysql/km_db_mysql.h index 8512fc2..fa6b698 100644 --- a/modules/db_mysql/km_db_mysql.h +++ b/modules/db_mysql/km_db_mysql.h @@ -38,8 +38,12 @@ #ifndef KM_DB_MOD_H #define KM_DB_MOD_H +#include "../../lib/srdb1/db.h" + extern unsigned int db_mysql_ping_interval; extern unsigned int db_mysql_timeout_interval; extern unsigned int db_mysql_auto_reconnect; +int db_mysql_bind_api(db_func_t *dbb); + #endif /* KM_DB_MOD_H */ diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index 469bfb6..bc9f3bb 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -32,12 +32,12 @@ * 2003-03-11 updated to the new module exports interface (andrei) * 2003-03-16 flags export parameter added (janakj) */ - /** @addtogroup mysql * @{ */ #include "mysql_mod.h" +#include "km_db_mysql.h" #include "my_uri.h" #include "my_con.h" @@ -83,6 +83,7 @@ static cmd_export_t cmds[] = { {"db_next", (cmd_function)my_cmd_next, 0, 0, 0}, {"db_setopt", (cmd_function)my_setopt, 0, 0, 0}, {"db_getopt", (cmd_function)my_getopt, 0, 0, 0}, + {"db_bind_api", (cmd_function)db_mysql_bind_api, 0, 0, 0}, {0, 0, 0, 0, 0} };

1 0

git:janakj/mysql: Make sure mod_init from kamailio/db_mysql is called.
by Jan Janak 17 Feb '09

17 Feb '09

Module: sip-router Branch: janakj/mysql 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(); } /** @} */

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009