sr-dev

sr-dev@lists.kamailio.org

15 participants
43426 discussions

git:janakj/bdb: - output the database location on startup

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 1e8db50b481f5281938a6a987a8641a0d264f9cb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e8db50… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 22 18:09:46 2007 +0000 - output the database location on startup git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3200 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_db_berkeley.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index f5e755f..b4ccc7c 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -186,7 +186,8 @@ db_con_t* bdb_init(const char* _sqlurl) } memset(_res, 0, sizeof(db_con_t) + sizeof(bdb_con_t)); _res->tail = (unsigned long)((char*)_res+sizeof(db_con_t)); - + + LM_INFO("using database at: %.*s", _s.len, _s.s); BDB_CON_CONNECTION(_res) = bdblib_get_db(&_s); if (!BDB_CON_CONNECTION(_res)) {

15 years, 7 months

git:janakj/bdb: - import berkeley database module into trunk

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 749259efdfd2bfec4baa3829c615a74843217a62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=749259e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 4 11:15:01 2007 +0000 - import berkeley database module into trunk - Many thanks to William Quan from Cisco Systems for the contribution - based on patch #1803180, renamed from berkely_db to db_berkeley - Some work still remains: - build berkley_db as own debian package - add berkley_db to the xml database creation process to generate the content in scripts/db_berkley/openser like the dbtext stuff - evaluate if its possible to use the db_free_row and db_free_rows functions for this module - port to new logging system git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2844 689a6050-402a-0410-94f2-e92a70836424 ---

15 years, 7 months

git:janakj/bdb: - updated the cmd_export_t according to latest structure

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 0b499efd8edbc7324079097f71a2e9c1ccc7ac8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b499ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 4 11:23:12 2007 +0000 - updated the cmd_export_t according to latest structure git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2846 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_db_berkeley.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index 4f5e2ca..a5b0b01 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -65,16 +65,16 @@ static void destroy(void); * Exported functions */ static cmd_export_t cmds[] = { - {"db_use_table", (cmd_function)sc_use_table, 2, 0, 0}, - {"db_init", (cmd_function)sc_init, 1, 0, 0}, - {"db_close", (cmd_function)sc_close, 2, 0, 0}, - {"db_query", (cmd_function)sc_query, 2, 0, 0}, - {"db_raw_query", (cmd_function)sc_raw_query, 2, 0, 0}, - {"db_free_result", (cmd_function)sc_free_query, 2, 0, 0}, - {"db_insert", (cmd_function)sc_insert, 2, 0, 0}, - {"db_delete", (cmd_function)sc_delete, 2, 0, 0}, - {"db_update", (cmd_function)sc_update, 2, 0, 0}, - {0, 0, 0, 0, 0} + {"db_use_table", (cmd_function)sc_use_table, 2, 0, 0, 0}, + {"db_init", (cmd_function)sc_init, 1, 0, 0, 0}, + {"db_close", (cmd_function)sc_close, 2, 0, 0, 0}, + {"db_query", (cmd_function)sc_query, 2, 0, 0, 0}, + {"db_raw_query", (cmd_function)sc_raw_query, 2, 0, 0, 0}, + {"db_free_result", (cmd_function)sc_free_query, 2, 0, 0, 0}, + {"db_insert", (cmd_function)sc_insert, 2, 0, 0, 0}, + {"db_delete", (cmd_function)sc_delete, 2, 0, 0, 0}, + {"db_update", (cmd_function)sc_update, 2, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} };

15 years, 7 months

git:master: Merge branch janakj/flatstore into branch master

by Jan Janak

Module: sip-router Branch: master Commit: 8be42318025c413d0aecf01f84d32b5e1a0af2f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8be4231… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 00:02:32 2009 +0100 Merge branch janakj/flatstore into branch master * commit 'origin/janakj/flatstore': (57 commits) Make km_sources compile, part two. Link with libkmi, sources from kamailio use the management interface. Make km_ sources compile: Link also with libsrdb1 Added prefix km_ to locally included header files. Align defines protecting header files with filenames. Remove km_Makefile and km_README. Renamed to db_flatstore. Make the module compile in the sip-router source tree. - disable big integer (DB_BIGINT) support for non SQL DB modules for now - don't link with unnecessary libs, related to bug #1855859 - fix link entity names, patch from Carsten Gross - rebuilt default READMEs - renaming: changed entities in documentation - renaming scripts part 1 - fix some FAQ entries, change missing entity, regenerate READMEs - change name in copyright headers - a set of minimalistic config files for testing purposes - adding missing end of doxygen group - missing READMEs added ... ---

15 years, 7 months

How to import modules with full history

by Jan Janak

Here is how you can import a kamailio module with full history (that means all previous commits done on the svn will also be visible in git) into the sip-router git repository. First off, make sure you have a local copy of the sip-router git repository with kamailio history merged into it. You can find a step-by-step guide in the previous email with subject "Annotated git configuration file". I suppose that the module you want to import into the git repository will be based on the sources present in the kamailio svn trunk, so as the next step create a new branch based on the kamailio trunk: git co -b sqlops_filtered km/trunk The name of the new branch is sqlops_filtered because I am importing kamailio sqlops module, "_filtered" because this branch will be used to filter commits. Like revision numbers in svn (and unlike versions in cvs), git commits, identified by those cryptic sha1 hashes, record the state of _all_ files in the source tree at the time when the commit was made. But this is a problem because we only one to import the files in modules/sqlops directory and ignore all other files outside this directory. Even if you try to checkout an older commit which changed only files within modules/sqlops, you always get a full source tree, including files of all other modules. There is no way you can get a particular revision of selected files only--like you can do it with cvs. But there is a solution: git-filter-branch. This is a handy git command which (among other things) can walk through all commits in the history of the current branch and tranform the commits into new commits with selected files only. To include only files in modules/sqlops we can do the following: git-filter-branch --subdirectory-filter modules/sqlops The command rewrite the history of the current branch, your current branch should be sqlops_filtered if you followed this guide from the beginning. If you investigate the history of the branch with git log, you should see only commits that are related to files in modules/sqlops. (The module contained only one commit at the time of writing of this memo so don't be surprised if you only see one commit in the history). If you examine your current working directory now, you'll notice that the directory contains files from modules/sqlops in the top level directory. We need to put them back into modules/sqlopts before we can merge the branch into sip-router tree, this can be done with git-filter-branch again. But before we can run the command second time, we need to remove some residual files from the previous run: rm -rf .git/refs/original And the following command will move all the files back to modules/sqlops subdirectory: git-filter-branch --index-filter 'git ls-files -s | sed "s-\t-&modules/sqlopt/-" | GIT_INDEX_FILE=$GIT_INDEX_FILE.new git update-index --index-info && mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD The previous command might look a little scary, but it is documented in man git-filter-branch if you are interested in details. If you examine your current working directory now, it should contain modules directory with sqlops subdirectory and all the module files there. This branch is now ready to be merged into the sip-router tree, so create a new branch, for example sqlops, based on the sip-router master branch: git co -b sqlops sr/master And now you can merge branch sqlops_filtered into the newly created branch: git merge sqlops_filtered And if everything went well, congratulations, you successfully imported your first kamailio module into the sip-router git repository. Branch sqlops_filtered is no more needed so you can safely delete it. Jan.

15 years, 7 months

git:janakj/flatstore: - fix link entity names, patch from Carsten Gross

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 6ed244291d3662a7284bedeb8eb82fedf32d456e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6ed2442… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: 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 --- modules/db_flatstore/km_README | 76 ++++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/modules/db_flatstore/km_README b/modules/db_flatstore/km_README index ba460ed..ee2427f 100644 --- a/modules/db_flatstore/km_README +++ b/modules/db_flatstore/km_README @@ -1,4 +1,3 @@ - Flatstore Module Jan Janak @@ -12,8 +11,8 @@ Jan Janak Copyright � 2004, 2005 FhG FOKUS Revision History Revision $Revision$ $Date: 2008-08-06 12:08:33 +0200 - (Wed, 06 Aug 2008) $ - _________________________________________________________ + (Mi, 06 Aug 2008) $ + __________________________________________________________ Table of Contents @@ -35,7 +34,7 @@ Jan Janak 1.4. Exported Functions 1.5. Exported MI Functions - 1.5.1. flat_rotate + 1.5.1. flat_rotate 2. Developer Guide @@ -48,34 +47,34 @@ Chapter 1. Admin Guide 1.1. Overview Flatstore is one of so-called Kamailio database modules. It - does not export any functions executable from the - configuration scripts, but it exports a subset of functions - from the database API and thus other module can use it instead - of, for example, mysql module. + does not export any functions executable from the configuration + scripts, but it exports a subset of functions from the database + API and thus other module can use it instead of, for example, + mysql module. The module does not export all functions of the database API, it supports only one function, insert. The module is limited - but very fast. It is especially suitable for storing - accounting information on sites with extremely high traffic. - If MySQL is too slow or if you get a huge amount of accounting - data then you can consider using this module. Note that the - acc module is the only module that was tested with flastore. + but very fast. It is especially suitable for storing accounting + information on sites with extremely high traffic. If MySQL is + too slow or if you get a huge amount of accounting data then + you can consider using this module. Note that the acc module is + the only module that was tested with flastore. The format of the files produced by this module is plain text. - Each line consists of several fields, fields are separated by - | character. New information is always appended at the end of - the file, searching, deleting and updating of existing data is - not supported by the module. + Each line consists of several fields, fields are separated by | + character. New information is always appended at the end of the + file, searching, deleting and updating of existing data is not + supported by the module. The acc module can be configured to use flatstore module as database backend using the db_url_parameter: modparam("acc", "db_url", "flatstore:/var/log/acc") This configuration options tells acc module that it should use - the flatstore module and the flatstore module should create - all files in /var/log/acc directory. The directory must exist - and Kamailio processes must have permissions to create files - in that directory. + the flatstore module and the flatstore module should create all + files in /var/log/acc directory. The directory must exist and + Kamailio processes must have permissions to create files in + that directory. Name of files in that directory will follow the following pattern: @@ -83,14 +82,14 @@ modparam("acc", "db_url", "flatstore:/var/log/acc") For example, entries writen by Kamailio process 8 into acc table would be written in file acc_8.log. For each table there - will be several files, one file for every Kamailio process - that wrote some data into that table. The main reason why - there are several files for each table is that it is much - faster to have one file per process, because it does not - require any locking and thus Kamailio processes will not block - each other. To get the complete data for a table you can - simply concatenate the contents of files with the same table - name but different process id. + will be several files, one file for every Kamailio process that + wrote some data into that table. The main reason why there are + several files for each table is that it is much faster to have + one file per process, because it does not require any locking + and thus Kamailio processes will not block each other. To get + the complete data for a table you can simply concatenate the + contents of files with the same table name but different + process id. 1.1.1. Rotating Log Files @@ -106,17 +105,18 @@ mv acc_1.log acc_1.log.20050605 mv acc_2.log acc_2.log.20050605 mv acc_4.log acc_3.log.20050605 ... - Note that at this point Kamailio - will still be writing all data into the renamed files. + + Note that at this point Kamailio will still be writing all + data into the renamed files. * Send Kamailio the MI command to close and reopen the renamed files. For example, using FIFO: kamctl fifo flat_rotate - This will force Kamailio to close - the renamed files and open new ones with original names, - such as acc_1.log. New files will be open at the point - when Kamailio has some data to write. It is normal that - the files will be not created immediately if there is no - traffic on the proxy server. + + This will force Kamailio to close the renamed files and + open new ones with original names, such as acc_1.log. New + files will be open at the point when Kamailio has some data + to write. It is normal that the files will be not created + immediately if there is no traffic on the proxy server. * Move the renamed files somewhere else and process them. 1.2. Dependencies @@ -138,7 +138,7 @@ kamctl fifo flat_rotate Enable or disable flushing after each write. - Default value is 1. + Default value is 1. Example 1.1. Set "flush" parameter ...

15 years, 7 months

git:janakj/flatstore: - don't link with unnecessary libs, related to bug #1855859

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: da7be356c8a8702505a8c1b9f1592cddac55d820 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da7be35… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 12 13:07:05 2008 +0000 - don't link with unnecessary libs, related to bug #1855859 - don't include unnecessary libxml headers in pua_mi git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4895 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_flatstore/km_Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/km_Makefile b/modules/db_flatstore/km_Makefile index 6b53fdb..6cd413c 100644 --- a/modules/db_flatstore/km_Makefile +++ b/modules/db_flatstore/km_Makefile @@ -5,5 +5,6 @@ include ../../Makefile.defs auto_gen= NAME=db_flatstore.so +LIBS= include ../../Makefile.modules

15 years, 7 months

git:janakj/flatstore: - disable big integer (DB_BIGINT) support for non SQL DB modules for now

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 26dc46eff209d7d53a21e5701fd60c8bae12e08c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26dc46e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Sep 24 11:02:42 2008 +0000 - disable big integer (DB_BIGINT) support for non SQL DB modules for now - if such a value is used, an error will be returned and also logged git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4986 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_flatstore/km_flatstore.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/km_flatstore.c b/modules/db_flatstore/km_flatstore.c index 47725f6..e6e96b9 100644 --- a/modules/db_flatstore/km_flatstore.c +++ b/modules/db_flatstore/km_flatstore.c @@ -174,6 +174,10 @@ int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, fprintf(f, "%d", VAL_INT(v + i)); break; + case DB_BIGINT: + LM_ERR("BIGINT not supported"); + return -1; + case DB_DOUBLE: fprintf(f, "%f", VAL_DOUBLE(v + i)); break;

15 years, 7 months

git:janakj/flatstore: Link also with libsrdb1

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: ad91db5b2c820655eba10de1f8ac0cc671e520ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad91db5… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 23:01:28 2009 +0100 Link also with libsrdb1 --- modules/db_flatstore/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_flatstore/Makefile b/modules/db_flatstore/Makefile index 12e2d5f..6b008b2 100644 --- a/modules/db_flatstore/Makefile +++ b/modules/db_flatstore/Makefile @@ -10,6 +10,6 @@ LIBS= DEFS += -DSER_MOD_INTERFACE SERLIBPATH=../../lib -SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 +SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules

15 years, 7 months

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

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: abae24ebc3d01400a6819c629776d4b37ecdeb48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abae24e… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 14:47:59 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into flatstore * '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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev