sr-dev

sr-dev@lists.kamailio.org

13 participants
43416 discussions

by New＠sip-router.org

Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 20:28:11 2009 +0100 Header file conditional macros renamed (DB_ -> DB1). All macros protecting header files against multiple inclusions have been renamed to make sure that there are no conflicts with header fields from srdb2 library. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a33b9a8… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 20:23:56 2009 +0100 Doxygen group renamed from db to db1. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d14b03… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 20:23:12 2009 +0100 Updated the value of \file doxygen tags. Since we moved files in lib/srdb1 from another directory we also needed to update the doxygen \file tags. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb5aaf8… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 20:22:10 2009 +0100 Renamed type names (DB_ -> DB1_) in comments and documentation. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70fc66d… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 20:21:15 2009 +0100 Database type enum values (such as DB_INT) renamed to DB1_*. Both database libraries define the same database value type names. We need to rename them in one of the libraries so that both libraries can be used at the same time. Here we chose to rename the enum values in libsrdb1 to DB1_*. The same change needs to be done in SER modules using this version of the database library. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20606ac… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 20:18:57 2009 +0100 Renamed db_res_t to db1_res_t in doxygen documentation. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13f9c1e… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 20:16:40 2009 +0100 Renamed db_res_t to db1_res_t to avoid conflicts with libsrdb2. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3561d31… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 20:15:29 2009 +0100 Rename db_con_t to db1_con_t in doxygen documentation. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5071c5… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 20:14:43 2009 +0100 Rename db_con_t to db1_con_t to avoid conflicts with libsrdb2. Both libraries libsrdb1 and libsrdb2 contain the data structure db_con_t and in one if them the data structure needs to be renamed so that both libraries can be used from one SER module at the same time. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1858085… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 16:34:16 2009 +0100 Added *~ to the list of files ignored by git. Files with *~ suffix are created by emacs to hold a backup copy of the file being edited. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5aad472… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 16:33:31 2009 +0100 Fixing relative paths to SER headers. After moving the database library from SER 2.0 into lib/srdb2 it was necessary to update all the relative paths to SER header fiels. Also adding a new Makefile suitable for building the library. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35ba402… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 16:26:34 2009 +0100 Changed the path to ser include files. After moving the database library into lib/srdb1 subdirectory it is necessary to update the relative paths to ser header files. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3bcff0… Merge: 569bf0016d12bfa3da853e256d6b24e4ab730fa0 86a18a6d68639db7982aeb436d05a9e6903bcaca Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 14:13:51 2009 +0100 Merge commit 'kam/trunk' * commit 'kam/trunk': (219 commits) - add one debug probe for SQL NULL values, like for the other datatypes * Hostname of gateway should default to NULL. - new column to dispatcher table to hold priority * Introduced optional aliveness checking of gateways. Contributed by - partial revert of commit rev5359 for db_mysql module - remove obselete DB example directory, the Makefile don't work and the source - prevent problems when a DB modules (like db_postgres) first calls - small indention fix - revert commit rev5415 - move one DBG probe to the beginning of the free, to catch later problems - add group functionality to read content from specified sections - port from opensips, commit 4977, 4988, credits to Dan Pascu - port from opensips, commit 4889 - port from opensips, commit 4990, credits to Dan Pascu - unify common rows and row allocation functionality in the DB API core - change behaviour of db_str2val, this now copy strings - avoid potential read overflow on non NULL terminated string - move db_mysql and db_unixodbc str2val implementation to the DB core, - fix a bunch of doxygen errors (mostly in modules, some in the core) - finish refactoring of carrierroute module ... URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=569bf00… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 12 14:11:53 2009 +0100 SER 2.0 database api moved to lib/srdb2. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86a18a6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 26 18:07:14 2009 +0000 - add one debug probe for SQL NULL values, like for the other datatypes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5518 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba9b7db… Author: Juha Heinanen <jh(a)tutpro.com> Date: Sat Jan 17 03:26:18 2009 +0000 * Hostname of gateway should default to NULL. * Improved descriptions. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5478 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b4f508… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 14 11:54:41 2009 +0000 - new column to dispatcher table to hold priority - regenerated scripts to create the table git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5457 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d4d829… Author: Juha Heinanen <jh(a)tutpro.com> Date: Tue Jan 6 10:32:43 2009 +0000 * Introduced optional aliveness checking of gateways. Contributed by Alexandr S. Dubovikov. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5424 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8fb93e2… 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=005029d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 15:48:23 2009 +0000 - remove obselete DB example directory, the Makefile don't work and the source won't compile anymore since release 1.2.0 or so git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5419 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fec76e8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 15:42:12 2009 +0000 - prevent problems when a DB modules (like db_postgres) first calls db_free_row (because of some problems in the data processing), and then later db_free_result - this could cause a double free, and also a crash because of null pointer - reported from Bayan Towfiq, bayan at flowroute dot com - fix also a similar problem in the db_free_columns function git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5418 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ccac232… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 15:27:12 2009 +0000 - small indention fix git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5417 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f82012… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 15:22:18 2009 +0000 - revert commit rev5415 - contains one unrelated change git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5416 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=744bed4… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 15:19:36 2009 +0000 - move one DBG probe to the beginning of the free, to catch later problems - extend one DBG probe to also log the number of rows, small indention fix git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5415 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0a18f4… 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=88dc2f0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 17:12:34 2008 +0000 - port from opensips, commit 4977, 4988, credits to Dan Pascu - move variable declaration, remove unneeded variable 'prefix' - test for failure in memory allocation git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5365 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc68e8f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 16:56:10 2008 +0000 - port from opensips, commit 4889 - remove (small) memory leak in DB module bind git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5364 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5721bc… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 16:41:36 2008 +0000 - port from opensips, commit 4990, credits to Dan Pascu - remove unnecessary check during mem free in API bind git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5363 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d7f4c1… 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=f920073… 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=1d7bba5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 10:30:13 2008 +0000 - avoid potential read overflow on non NULL terminated string port from opensips (#4980), credits to Dan Pascu git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5355 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c843980… 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=18557a9… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Dec 4 18:12:33 2008 +0000 - fix a bunch of doxygen errors (mostly in modules, some in the core) - credits belongs to Frederick Bullik, frederick dot bullik at 1und1 dot de git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5299 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d0ae74… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Nov 12 15:53:01 2008 +0000 - finish refactoring of carrierroute module - replace O(n) matching logic for carrier and domain names with a efficient binary search implementation - use qsort and bsearch of glibc in most of the cases, where its possible (basically all carrier/domain searches are O(log n) now, only when dynamic strings for are used in the cfg, it needs to search the whole list) - change carrier and domain names from string to integer, to allow the lookup - instead of storing the carrier/domain name string in the memory structure, a pointer to the name is used to save space - get rid of this internal ID vs. external ID stuff, we use now only one - rename the route_tree table to carrier_name - add a new table domain_name, to hold the domain names (like route_tree tbl) - adapt tests for the new or changed functionality - extend documentation with a paragraph about the used matching logic - Credits for this work belongs to Hardy Kahl, hardy dot kahl at 1und1 dot de - fix a few errors in the postgres cr test, fix a few doxygen statements - move some parts of log messages to DBG log level - update documentation and database schemes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5189 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b53cbd… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 3 17:22:27 2008 +0000 - fix conflicting swap definition during solaris compilation - the _XOPEN_SOURCE causes a definition of swap in unistd.h and stdlib.h - based on opensips change r4622 from Bogdan - thanks to Muhammad Akl for access to a debugging machine git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5159 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6b18a6… Author: Juha Heinanen <jh(a)tutpro.com> Date: Sun Oct 19 09:07:52 2008 +0000 * Added 'hostname' column to 'gw' table. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5096 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a465a4a… 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=8ecee0c… Author: Juha Heinanen <jh(a)tutpro.com> Date: Thu Oct 16 16:58:34 2008 +0000 * New implementation of lcr part of lcr module. * Entries of lcr table are now stored in in-memory cache for high performance (see README for execution times of lcr related functions). * Gateways can now be assigned a weight within their groups. * Support for prefix_mode=1 has been dropped. * lcr_dump MI function has been split into lcr_gw_dump and lcr_lcr_dump functions. * lcr_reload function is now executed under a lock. * Testing is welcomed. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5084 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1212f98… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 10 13:21:23 2008 +0000 - check in db_do_close/ mysql_close also for an invalid tail pointer - normally this should be fine, but as the database is eventual closed in some abnormal situations, its better to be really sure - change in trunk: all databases that uses the core infrastructure, change in 1.3 branch: mysql git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5061 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ba2767… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Tue Oct 7 20:14:32 2008 +0000 - table definition for htable module git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5039 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc6c7a5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Sep 17 14:46:05 2008 +0000 - don't check for LLONG_MAX, LLONG_MIN, as some gcc don't provide this, checking for ERANGE is enough, reported from Klaus git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4941 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13c66bf… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Sep 17 12:49:27 2008 +0000 - partial port from opensips, r4736, credits to Anca (without kamctlrc change) - changed length for rlsubs_did filed in rls_presentity table (512 to 255) - fixes also key length issues with MySQL 1.4.22 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4939 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7746b45… 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=04c0fcf… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Sep 10 17:00:49 2008 +0000 - add small doxygen comment about the usage of fetch_result with db_query git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4878 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f0c167… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Sep 9 15:39:38 2008 +0000 - carrierroute use autogenerated DB infrastructure - adapt configuration, move some descriptions to DB scheme git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4872 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=537075c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 1 09:46:38 2008 +0000 - fixed freeing NULL pointers - in case of error, db_free_columns() may be internally called by other functions or directly by db_free_result(), resulting in double free. Reported by Richard Revels, credits to Bogdan git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4783 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2b44d1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Aug 26 16:29:28 2008 +0000 - store generated DB interface sources and documentation in module dir - fix cleanup target for generated sources and documentation - deactivate module and dbdoc generation and cleanup for now on plain "make", to avoid eventual problems in the modules dirs at the moment git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4745 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0e0049… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Aug 26 15:46:01 2008 +0000 - split xsl in two files, after discussion on list, to generate a seperate header and implementation file - adapt both xsl to create header and implementation source code git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4744 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c71af70… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Aug 25 14:05:13 2008 +0000 - add XSL for generating module table documentation from available XML - add new db/schema Makefile target, "dbdoc" git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4735 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d8f168… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 13 07:24:06 2008 +0000 - also remove module directory, will be created on 'make dbschema' git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4691 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=468c304… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Aug 12 22:51:33 2008 +0000 - fix error in previous commit, i accidently added the wrong file git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4688 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53b1496… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Aug 12 22:44:49 2008 +0000 - initial version of infrastructure for autogenerating DB functions and definitions - use 'make dbschema' to generate - will be refined in the next weeks - change only auth_db module to use this functions for now - add autogenerated header to repository - add new directory to doxygen, fix some small bug in schema makefile git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4687 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6081a48… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Aug 7 08:47:44 2008 +0000 - port from opensips r4528, credits goes to Anca - updated version count for tables presentity and pua (the code already uses the "new" version number) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4628 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3ccd3d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Aug 7 08:37:04 2008 +0000 - port from opensips r4523, credits goes to Anca - fixed some more bugs in BLA - problem at openser restart - phone refresh issue - added one more column in table presentity - added one more column in table pua git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4625 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7fc7c6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Aug 7 08:33:42 2008 +0000 - fix 'make dbschema', rename files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4624 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf4700b… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Tue Aug 5 14:58:52 2008 +0000 - renaming: openser -> kamailio git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4565 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14248f8… Author: Dan Pascu <dan(a)ag-projects.com> Date: Thu Jul 31 15:12:38 2008 +0000 Automatically determine table names git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4525 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d520eaf… 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=e4998f7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jul 25 15:21:56 2008 +0000 - some small doxygen error fixes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4517 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b5a633… 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=4251c54… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jul 10 15:40:14 2008 +0000 - small extension to the location table docs git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4474 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c750c35… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jul 3 15:56:43 2008 +0000 - fix make dbschema-docbook-html generation, closes #2009831 - remove old entities from template git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4447 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=875f5c9… 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=78611c9… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Fri Jun 6 19:01:37 2008 +0000 -fixed swapped values git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4344 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b664ead… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Fri Jun 6 14:36:01 2008 +0000 - uploaded new modules that implements generic string translations based on matching and replacement rules. It can be used to manipulate R-URI or a PV and to translated to a new format/value. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4331 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b332f22… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 21 14:05:14 2008 +0000 - add 'description_len' to entitity.xml - sync description length and type of globalblacklist table to carrierroute - remove description column of userblacklist table, this is not really needed - carrierroute and carrierfailureroute table use the entity, no visible change git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4234 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d162a81… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 21 07:50:05 2008 +0000 - add db_check_table_version funtion to db API - this function includes error logging and also a error message on version mismatch, its require now a exact match of the version numbers - convert most of the modules to use this function, instead of implementing their own error handling again - new modules should use this function - increase trusted table version define for permissions module, it should be the same as the DB version entry - TODO: convert uri_db, domain, domainpolicy and dispatch too git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4232 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8384f5a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 14 15:51:09 2008 +0000 - fix error in userblacklist DB scheme definition, the whitelist colum type should be of TINYINT (or equivalent) size - no DB version update necessary, as the module in question is not released yet git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4184 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65d4ee8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Apr 23 11:58:05 2008 +0000 - use a random name for the temporary file, this is safer git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4073 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c8c88e… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Fri Apr 18 10:26:29 2008 +0000 - removed wrong unique index git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4045 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=507a587… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Apr 16 13:37:47 2008 +0000 - enable oracle SQL generation with XML scheme - add oracle specific DATE default values - improve oracle XSL script, many thanks to Iouri for testing git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4017 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c4ccfa… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 10 16:00:46 2008 +0000 - fix index name for globalblacklist table git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4004 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=494f3bb… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 10 09:11:26 2008 +0000 - improve 'autoincrement' type for postgres, now its not necessary anymore to specify this workaround in the scheme sources git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4000 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5e925d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 3 16:37:35 2008 +0000 - preparations for db_oracle driver merging - rename column names that uses reserved words from oracle - update siptrace code and carrierroute documentation - siptrace table version increased, but this is not checked in code anyway - carrierroute code changed as comment is displayed from setup tools - the other modules don't use the colum in question, its only a comment so no version update is necessary - SQL scheme files and documentation also updated - Patch provided from Iouri Kharon, yjh at styx dot cabel dot net git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3972 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2a9601… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Apr 1 15:46:49 2008 +0000 - fix double null termination of query string - Patch provided from Iouri Kharon, yjh at styx dot cabel dot net git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3970 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd7348a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Mar 21 21:18:16 2008 +0000 - add message flag support for more flexibility in routing - increase table version, as two new colums are introduced - internal refactoring, change routing rule structure - add documentation about this functionality - update database tables after schema extension - credits goes to Hardy Kahl, hardy dot kahl at 1und1 dot de git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3946 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f5ce5c… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Thu Mar 13 10:14:54 2008 +0000 - fixed 64bits compiling: sizeof() returns long type! git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3932 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8250d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 13:05:01 2008 +0000 - don't free dbtext values in core DB api, the module will free along with the internal structure (related to #1891453 reported by Ovidiu Sas) - formatted some logs to fit 80char line git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3868 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5b8054… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Mar 6 09:30:33 2008 +0000 - add missing check for errors during val2str - closes #1908392, Patch provided from Iouri Kharon git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3863 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d678930… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 28 20:52:03 2008 +0000 - db_text module exports DB API via bind function - DB core tries to find first the bind function, if not found, old way to link the DB API is used git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3796 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1799926… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Feb 28 16:20:02 2008 +0000 - sync carrierroute and carrierfailureroute table (swap scan_prefix and domain column) - as carrierroute is only usable for SQL based tables because of the raw query dependency, we don't need to increment the version number git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3791 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a8126d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Feb 28 15:47:04 2008 +0000 - add new database table for carrierroute git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3790 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04e87c5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Feb 28 15:45:33 2008 +0000 - major reworking of carrierroute module - make exported, user visible interface much more flexible - add a new table 'carrierfailureroute' for database supported failure routing - credits for this work goes to Hardy Kahl, hardy dot kahl at 1und1 dot de git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3789 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b20e950… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Feb 28 13:45:26 2008 +0000 - remove SERWEB stuff from database scheme and tables git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3787 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b22602f… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Thu Feb 28 09:54:16 2008 +0000 - removed from the subscriber table the following fields: - first_name - last_name - email_address - datetime_created - timezone as these fields are not used by openser itself (but rather by whatever provisioning tools) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3782 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb87dca… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Feb 26 13:51:26 2008 +0000 - add a new module, called 'userblacklist' for handling user and global blacklists - credits for this module goes to Hardy Kahl, hardy dot kahl at 1und1 dot de - add documentation, database scheme and test for this module git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3760 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dda0818… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Feb 11 12:14:21 2008 +0000 - fix wrong type in re_grep group_id column - reported from Giovanni Coriasco, closes #1891097 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3677 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=705bb72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 7 13:02:09 2008 +0000 - added flags column to dispatcher table - dispatcher table version increased git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3660 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72b0651… 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=47c619f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 12:59:01 2008 +0000 further improvements of the database API: - unify postgres, unixodbc and mysql code, error and debug messages - move the column allocating logic into the DB core API - change the all three modules to use this function - change postgres module to use the memory memory management methods of the core - add a flag to the db_val_t type that indicates if the (string) memory must be freed - don't try to free the static NULL values in db_free_row - change core row freeing method to evaluate the memory status flag - change the postgres module to set this flag - add some memsets to the mysql and unixodbc module for more safety and also ensure the correct working of the free flag - fix database TYPE flags in mysql module, they will be removed for 5.2 and are also obselete since 3.X times - change column names allocation logic in postgres to match the unixodbc and mysql behaviour, don't copy the names - some smaller documentation improvements and cleanups - tested only with testsuite so far works that still needs to be done: - modify the db_berkeley, dbtext and flatstore module to use the core API - modify the postgres, db_berkeley driver that they don't copy the values returned from the driver git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3637 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ad41bb… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 12:52:59 2008 +0000 - revert commit in rev 3603, this don't work because xsltproc ouput an exit status != 0 even for warnings.. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3636 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c65db6b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Feb 1 16:17:44 2008 +0000 - remove old api-txt, this was some weeks ago converted to doxygen git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3608 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88a6937… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Feb 1 10:06:32 2008 +0000 - db schema generation should fail early on parser errors git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3603 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dac7077… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 30 13:18:49 2008 +0000 - this belongs to the previous commit.. ;-) - move db_free_result function from DB drivers to core DB API git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3597 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30bde5b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jan 25 10:30:58 2008 +0000 - fix (small) potential buffer overflow conditions in query preperation - this could happen if the size of the query string offset is equal to the SQL_BUF_LEN define length git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3583 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9485c3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jan 24 13:31:18 2008 +0000 - fix doxygen file header git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3568 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a85c8e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jan 24 13:00:49 2008 +0000 - autoincrement route_tree id columns, remove default of '0' git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3566 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25f1798… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jan 22 13:55:43 2008 +0000 - port database interface (almost) complete from 'const char*' to 'str' for more safety (e.g. not null terminated strings) and performance (save strlen calls in core and library code) - adapt existing modules to use the new interface - change bind_dbmod and use_table function to the naming scheme of the other functions of the API - port existing module to use 'str' values for database related parameters - if modules uses already 'str' functions internally, remove the unnecessary temporary variables - make functions and parameter that needs only locally be used static - introduce new column variables needed for the keys for modules that don't have them already, this could be used to make them configurable later on - add 'const' to more db related functions - fix postgres driver, async queries must be finished, otherwise the next one will not complete - smaller whitespace and formatting changes and cleanups all over the place - reviewed and tested with testcases, but probably not error free because of the change size - basic DB operations should work, but no extensive load testing has yet be done, as some work still remains: - remove dead code and superflous comments in postgres driver - clean up memory management, at the moment there exists two flavors: don't copy that much (mysql, unixodbc), don't trust the driver, copy everything (postgres, db_berkeley) - after this is unified, then only one implementation for the memory management of the db API could be used for all modules - Foundations of this change have been created from Frederick Bullik, Frederick.Bullik at 1und1 dot de - Please review and test. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3563 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc4bf26… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 7 14:26:27 2008 +0000 further cleanups in core database API - move use_table and close function for SQL DBs to core - move query, raw_query, insert, update, delete functions for SQL DBs to core - all this functions were almost identical implemented in the three DB, this functions uses now a function pointer based interface to do the work - the use_table functions from dbtext and db_berkeley uses also now the core API - move result management function from db_col to db_res to the other result management functions, they are not useful alone - change postgres module to match more the structure of mysql and unixodbc, remove the 'PARANOID' #define, the other modules don't have this and prefix all functions with db_postgres, make this more consistent to mysql module - prefix all functions in unixodbc module with db_unixodbc, make this consistent to the other modules, cleanup the namespace - prefix val2str function in mysql with db_mysql too - move the SQL_BUF_LENGTH to core API, all modules need this - remove the static SQL char buffer from postgres and unixodbc, uses the one provided from the core API - move documentation from db/doc to API files in doxygen format - improve and extend documentation for the whole API - make database API const correct, to guard against implementation errors and allow better compiler optimizations - change interface free_connection function in SQL DBs to connection structure to allow the usage of core API do_close - fix indention for postgres driver and make logging messages consistent - remove now unneeded system header includes for SQL DBs - remove transaction related code from postgres driver, this is not used at all and according to Klaus also brings no performance benefit if used. - probably some other smaller cleanups Tested with the testcases, so basic functionality should work.. Please test! :-) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3506 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1655fbd… Author: Juha Heinanen <jh(a)tutpro.com> Date: Fri Dec 28 10:55:21 2007 +0000 * Updated schema and scripts due to gw table change. * Improved descriptions. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3494 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b32ef2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Dec 21 15:55:54 2007 +0000 - cleanup in database API - introduce a helper method for db_init, that does the actual work - database modules needs now only a small wrapper function - functionality checked for mysql and postgres with the available tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3481 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=309b1f1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Dec 19 11:56:11 2007 +0000 - move db_func_t to the correct place again, fix compile error git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3440 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=518ed3c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Dec 19 11:49:43 2007 +0000 - move documentation from txt file to db.h file in doxygen format - extend documentation - add a simple start page for the doxygen docs, this needs to be extended.. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3439 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71eafcc… Author: Juha Heinanen <jh(a)tutpro.com> Date: Sat Dec 15 11:04:24 2007 +0000 * Schema changes due to gw/dm to gw/flags change. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3402 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d27bea… Author: Juha Heinanen <jh(a)tutpro.com> Date: Fri Dec 14 16:21:04 2007 +0000 * Removed lcr/gw_grp table because it is not used by OpenSER. If someone needs it, it can be added as an extension. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3395 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27aa4ad… Author: Jesus Rodrigues <jesusr(a)voztele.com> Date: Fri Dec 14 12:10:47 2007 +0000 - Fix typos git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3384 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79c9b78… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 26 19:03:03 2007 +0000 - increase dialog db version - closes #1838888 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3212 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34523d7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 15 14:09:15 2007 +0000 - add support for default values to db_berkeley database source git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3142 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3b8213… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Nov 14 10:09:17 2007 +0000 - fixed DB schema: 1) domain column may be NULL in location and aliases tables (if use_domain=0) 2) prefix column may be NULL in lcr table Closes bug report: 1829179 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3132 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f60e0c… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Fri Nov 9 10:53:32 2007 +0000 - extended xcap table key to include 'doc_uri' as there can be more documents of the same type (suggested by Adrian Georgescu) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3075 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=710bdc2… Author: Dan Pascu <dan(a)ag-projects.com> Date: Wed Nov 7 15:39:13 2007 +0000 Use consistent indentation in xml files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3044 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97841ad… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Nov 7 15:23:23 2007 +0000 - some doxygen documentation for db_ut.h git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3042 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09d410b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Nov 7 15:03:56 2007 +0000 - revert commit in revision 3022 - this commit misses a variable assignment that causes an error - even if this is fixed, then mysql don't like unquoted time values on insertion - prober quoting of the time should be done in val2str, but this requires probably a interface change in time2str - for this changes we're to late in the release process, error should be changed in the db_berkeley module git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3041 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ac299c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Nov 6 08:31:58 2007 +0000 - use 'natural' instead of naturalkey, the primary and unique indexes keywords are 'primary' and 'unique' too git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3025 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f95efa… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 5 15:19:35 2007 +0000 - The function db_time2str() should not include the single-quotes. - Fixes a core dump for db_berkeley module, noticed by Will Quan git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3022 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42d74a5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 5 12:11:48 2007 +0000 - add 'naturalkey' to template file git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3014 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04e7ba6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 5 12:01:15 2007 +0000 - increase openser DTD version after 'naturalkey' addition git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3013 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cd0d62… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 5 11:36:18 2007 +0000 - add 'naturalkey' column to OpenSER tables to fix the db_berkeley index problem Patch provided by Will Quan <wiquan(a)employees.org> git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3011 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11ea23e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 2 09:39:42 2007 +0000 - don't iterate during version table generation over the version table.. - head with negative index is not available on *BSD, use positive instead git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3009 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0cdfaf6… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Tue Oct 30 15:21:37 2007 +0000 - moved variable declaration at the beginning of the function - replaced the c++ like comments with standard C one git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3004 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=612a6f4… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 29 13:09:41 2007 +0000 - extend documentation a little bit, this table vs. dbaliases git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2995 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2899ef3… Author: Dan Pascu <dan(a)ag-projects.com> Date: Fri Oct 26 09:38:57 2007 +0000 Fixed leftover name inconsistencies after the renaming of the xcap_xml table to xcap git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2990 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c53200… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Thu Oct 25 08:45:08 2007 +0000 - applied changes suggested by Adrian Georgescu to maintain consistency with presence database table definition git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2985 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d033a26… Author: Dan Pascu <dan(a)ag-projects.com> Date: Sun Oct 21 04:34:21 2007 +0000 Reverted column id name as it gives an error of being redefined git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2964 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8e6dd4… Author: Dan Pascu <dan(a)ag-projects.com> Date: Sun Oct 21 03:59:23 2007 +0000 Call the db_berkeley_clean rule as well from the generic clean rule of db/schema git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2962 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=890abb5… Author: Dan Pascu <dan(a)ag-projects.com> Date: Sun Oct 21 03:57:33 2007 +0000 ... and another typo in the path of the db_berkeley clean rule git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2961 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5f711f8… Author: Dan Pascu <dan(a)ag-projects.com> Date: Sun Oct 21 03:54:32 2007 +0000 Fixed path in db schema clean rules git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2960 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab9efd1… Author: Dan Pascu <dan(a)ag-projects.com> Date: Sat Oct 20 04:48:18 2007 +0000 Replaced a hardcoded value with a constant from entities git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2949 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b259a8… Author: Dan Pascu <dan(a)ag-projects.com> Date: Sat Oct 20 04:44:55 2007 +0000 Use more consistent names for database indexes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2948 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b58c59… Author: Dan Pascu <dan(a)ag-projects.com> Date: Sat Oct 20 04:17:56 2007 +0000 Some spell checking and repharasing for clarity in column descriptions git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2947 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=307860b… Author: Dan Pascu <dan(a)ag-projects.com> Date: Sat Oct 20 03:49:07 2007 +0000 Fixed inconsistent use of mixed tabs and spaces for indenting db schema files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2946 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d435c0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 18 08:45:18 2007 +0000 - remove bogus comment end from xml spec git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2936 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4869c6… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Tue Oct 16 11:38:54 2007 +0000 - followed the suggestions of Adrian Georgescu to use the same names in equivalent columns from watchers and active_watchers database tables git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2923 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2aea67f… Author: Dan Pascu <dan(a)ag-projects.com> Date: Sun Oct 14 21:49:06 2007 +0000 Remove autogenerated db schema files to make sure the source tree is in the same state as the original after a make proper git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2916 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=100d17b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Oct 10 09:13:38 2007 +0000 - fix IDs of the tables git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2893 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=676afff… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 5 14:32:16 2007 +0000 - move new_result and free_columns function to db directory - remove the implementation of this functions in all database modules - still missing - postgresql and db_berkeley implement different, more thouroughly free methods for colums and such - review if we can use the common functions like the other three modules git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2871 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f812683… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 5 10:53:20 2007 +0000 - first version of (almost) working xsl script for db_berkeley module the index creation don't work for some tables yet git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2863 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cb35b7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 5 10:47:36 2007 +0000 - small formatting changes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2860 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b9d935… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Sep 27 15:53:04 2007 +0000 - fix strip column datatype - fix cr_tree_rewrite function, use the specfified tree instead of the defaul closes Bug #1803444 - add a comment about the difference between internal and external IDs git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2830 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54ef43e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Sep 27 11:07:10 2007 +0000 - fix the confusing mismatch between config and db mode in carrierroute now both modes only use 'domain' in documentation and source - adjust database scripts too git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2827 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=422aa3a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Sep 20 09:16:59 2007 +0000 - fix wrong name in database documentation git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2796 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07dc819… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Wed Sep 12 15:39:44 2007 +0000 - increased table version for presence active_watchers table git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2749 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b1249d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Sep 12 08:59:40 2007 +0000 - extends one comments in sr_module.c - unify db-api documentation - fix one error message in db_ut.c git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2741 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=962bcbc… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Wed Sep 12 08:44:45 2007 +0000 - new module: Resource List Server (implements the specifications in RFC 4662 and RFC 4826) - requires 2 new databse tables - rls_presentity and rls_watchers - works independent from presence server - testing required git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2739 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53d9443… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 10 15:25:12 2007 +0000 - port mysql driver and db API to new logging system git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2733 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a441792… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Fri Sep 7 16:23:17 2007 +0000 - improved xcap_client module: - added conditional queries - possibility to configure a periodical query update method (works with any xcap server) - modified xcap table , added new columns and changed default name (version increased) - improved presence_xml - xcap_client interface - updated documentation git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2723 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71110ce… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Sep 4 14:40:17 2007 +0000 - improve diplayed doc name of uri-db - spelling fix in auth* modules git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2711 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=edfe696… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Tue Sep 4 08:30:20 2007 +0000 - added a new column in presence xcap_table - etag, needed by an integrated xcap server (version increased) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2709 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=196e364… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Aug 31 13:16:26 2007 +0000 - unifiy URLs in database docs, use an entity to make this configurable git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2688 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5886d29… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Aug 30 13:17:44 2007 +0000 - documentation fixes correct name of dispatcher module index links are now properly followed, instead of the output the link name git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2683 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f001ee7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 29 16:01:01 2007 +0000 - add error handling for strptime and strftime in str2time and time2str - return an error if the time conversation fails - port to new logging system git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2671 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1157360… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Tue Aug 28 16:28:35 2007 +0000 - updated presence watchers table sql definition git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2659 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02967b8… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Mon Aug 27 14:44:23 2007 +0000 - fixed some bugs in presence modules (reported by Juha Heinanen) - added a new column to active_watchers database table (version increased ) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2643 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a9134e… Author: Juha Heinanen <jh(a)tutpro.com> Date: Mon Aug 27 11:26:50 2007 +0000 * Added a gateway attribute that can be used to indicate if a gateway supports directed media (RFC 4145). git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2638 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da396e9… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Wed Aug 22 13:32:55 2007 +0000 - modified presence and presence_xml to allow using external XCAP servers with the possibility to configure the mode of operation through presence_xml module parameter 'integrated_xcap_server' git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2628 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d6c48e… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Mon Aug 20 09:15:30 2007 +0000 - fixed a bug in index definition git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2620 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b28dfe… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Mon Aug 20 08:47:47 2007 +0000 - made changes in watchers table ( version increased ) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2619 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11856be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 17 11:28:20 2007 +0000 - add space in front of "order by" (reported by Ben Smithurst and Anca Vamanu) - dev version increased git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2614 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ffed94… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Thu Aug 16 07:35:58 2007 +0000 - included memory caching storage with the possibility to configure a fallback to database mode git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2604 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7e6beb… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Mon Aug 13 17:07:01 2007 +0000 - added 2 more columns to pua_table (increased table version) - enabled refresh possiblity after server restart - included event type in record identification git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2597 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ea504c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 1 18:19:59 2007 +0000 - add carrierroute tables to Makefile in db/schema - add actual SQL code for this tables - update SQL with the last changes in schema files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2563 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10cbbdd… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 1 18:18:08 2007 +0000 - add carrierroute module - Credits go to Jonas Appel, <jonas dot appel at schlund dot de> - add module to exclude_modules var in Makefile - add database schemas for two necessary tables - add database tables to extra tables definition in openserdbctl git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2562 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a1b84d… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Mon Jul 30 12:14:55 2007 +0000 - added a new column to pua table - contact (increased version) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2547 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f947675… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Mon Jul 30 10:06:19 2007 +0000 - removed unecessary ude_presentity index (reported by Juha Heinanen<jh(a)tutpro.com>) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2543 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab7b2ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 27 11:41:08 2007 +0000 - table definition for dispatcher module - credits to Ancuta Onofrei for DB support in dispatcher git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2533 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=089fe36… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jul 26 15:14:43 2007 +0000 - fix small error in template.xml git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2527 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8211f0e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 25 11:52:20 2007 +0000 - add '-f' to rm, to prevent errors if the file does not exist git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2518 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef4fb71… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 25 08:57:44 2007 +0000 - add index names to serweb server monitoring and domainpolicy table git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2516 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7340e62… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 25 08:48:02 2007 +0000 - add index names to two serweb tables git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2515 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b62aa67… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Fri Jul 20 10:45:46 2007 +0000 - corrected syntax errors when adding new index git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2490 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc07a52… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Thu Jul 19 14:34:45 2007 +0000 - added some KEYs to presence tables to improve db query performance (table version increased) - did some cleanup (corrected some log messages, a bit of restructuring ) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2485 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=004accc… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 18 16:28:47 2007 +0000 - implement 'insert on duplicate key update' SQL directive in database API and mysql driver - this is similar to the replace SQL command, but the old row in case of an update is not deleted - closes #1665077 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2477 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9db225d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 18 16:03:34 2007 +0000 - adapt mysql fetch_result function to the postgresql behavior, only fetches a partial result set, if the number of wanted rows is zero return nothing - this matches more closely the user expectations of the db api - add a comment to the api documentation about this behavior git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2476 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65571b6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 18 10:37:27 2007 +0000 - add template sgml file for database documentation - change Makefile to use this template, add entities link git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2471 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2f3c93… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jul 17 11:18:09 2007 +0000 - more meaningful table ('database') names for doc generation git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2466 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48cb6cc… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jul 17 11:16:31 2007 +0000 - dbschema doc generation create now only one document for all tables - change stylesheets to a little bit newer docbook version git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2465 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8604131… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Jul 11 09:43:51 2007 +0000 - updated the dialog table format (according to the extention of the dialog structure). git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2438 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0929d7f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 4 14:04:45 2007 +0000 - fix dbtext stylesheet to generate version data for tables - add small hack to db/schema Makefile to copy the version number to the version file - remove version number insertion from openserdbctl.dbtext - there is now all table version data present in this table, even if some tables are not used git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2405 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68d40bc… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 4 12:55:15 2007 +0000 - change dbschema-docbook-clean, use a own target, this is much more efficient - suppress the output of the 'rm' in root and db/schema Makefile git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2402 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81e739a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 4 11:33:34 2007 +0000 - add dbschema-docbook target and subtargets for txt, html and pdf documentation generation from the xml db schema - add cleanup for this files to docbook-clean target - activate docbook generation in db/schema Makefile - at the moment for each group of tables "eg. presence" a own document will be created, this is needs to changed, and is on my TODO list.. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2399 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=298a808… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 4 11:23:06 2007 +0000 - make chars in db schema documentation compatible with docbook - add some documentation git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2397 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f4fa3a… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Jul 4 09:05:30 2007 +0000 - updated the DOCTYPE url to a working location. DTD file now present at http://openser.org/pub/openser/dbschema/dtd/1.0/dbschema.dtd git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2395 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54d4905… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Jul 4 08:19:01 2007 +0000 - dialog table added to the openser schema git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2394 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6947d05… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 18 10:41:24 2007 +0000 - fix wrong column names in presentity and active_watchers table - reported from Dave Waiting git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2366 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ede27bf… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jun 13 13:15:37 2007 +0000 - change dir for dbtext to 'openser', more consistent with other DBs - integrate textdb.sh into the common infrastructure, use the generated tables - the version data is missing, this needs an update for the dbtext XSL scripts - add serweb table creation, admin data generation is missing - add reinit support for dbtext - backup, restore and copy not implemented and blocked for dbtext - you can specify now a optional dbname for operations, needed for dbtext - fix db SQL installation, install as non-executable in Makefile - change Makefile to install openserdbctl.dbtext - fix INSTALL_TOUCH in Makefile for postgresql and mysql git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2361 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1657ebd… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jun 13 10:48:35 2007 +0000 - fix wrong pua column name, s/pres_user/pres_uri git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2360 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14b1237… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 12 13:33:11 2007 +0000 fix error in usrloc and registrar table, s/useragent/user_agent git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2359 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d69520… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 12 08:06:18 2007 +0000 - address table belongs to the permissions module, not to lrc - Reported from Juha Heinanen git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2355 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14541dc… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 11 14:08:06 2007 +0000 -unify logging messages in db/db_ut.h, use 'db_' prefix in all cases git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2354 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29ec814… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 11 13:57:32 2007 +0000 - move customized print_* functions from db-modules to db core - use a function pointer for the customized val2str function from the modules that gets used in the common function in db core - Thanks to Victor Gamov for the patch git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2353 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c250b82… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 11 13:50:08 2007 +0000 - move extension point to openser-extensions.xml file - add this file to Makefile - remove extra.xml include from openser-standard.xml git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2352 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0438d14… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 30 12:14:08 2007 +0000 - update xml database table sources - use SERIAL PRIMARY KEY for postgresql unique ids - use binary for xcap_xml and presentity body column - move primary key definition for mysql to column definition - update template - add some missing index names, fix misspellings and double names for indexes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2318 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e47829f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 29 15:41:48 2007 +0000 - add missing pdt table to schema definitions git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2312 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78ac3c3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 29 09:02:31 2007 +0000 use bytea instead of text for postgres xcap_xml table, bug 1684821 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2310 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9397efc… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri May 25 15:00:34 2007 +0000 unify all database id field to unsigned int git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2298 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0c43d2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri May 25 12:08:24 2007 +0000 update build system: - do not stops with a error anymore if some files are present in the modules dir - move textdb.sh installation to install-bin to prevent inclusion of dbtext stuff into every debian package - add define for '/usr/share/openser' for architecure independent data files data-prefix, data-dir - add make dbschema, make dbschema-clean for dbschema generation and cleaning - add mkdir target for data-dir - install mysql and postgres sql code with mysqldb.sh and postgresdb.sh, so that this get included into the right debian packages - fix wrong ROOT variable in make clean task in db/schema Makefile git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2291 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=665516a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 22 08:38:48 2007 +0000 fix documentation and mask type size in address table git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2257 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f956d5c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 21 13:37:14 2007 +0000 - small docu update - change uri size in pua tables git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2253 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8961f72… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 21 12:19:18 2007 +0000 - fix variable type in phonebook table - fix variable name in subscriber table git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2252 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ef74cb… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 21 12:01:50 2007 +0000 - add missing path size to usrloc table - fix usage of 'NULL' default values - update example file git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2251 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67686f3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 21 11:31:55 2007 +0000 add missing path size to registrar table git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2250 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3d1c46… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 21 10:44:16 2007 +0000 add the last tables, finish serweb git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2249 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1fab40… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri May 18 13:55:45 2007 +0000 - add usr_preferences, subscriber, xcap_xml, watchers, pua, pending, presentity, active_sessions and active_watchers tables - some cleanups in xml files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2248 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d62f76… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri May 18 09:51:34 2007 +0000 - add silo, speed_dial, re_grp and dbaliases table definitions - some cleanups in other xml files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2245 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2aa8865… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 16 16:14:25 2007 +0000 - add template.xml file as example for a xml database specification - add usrloc definition - fix wrong xpointer call in openser-standard file git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2237 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfed16e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 16 15:35:26 2007 +0000 - add DATETIME default entity to entity.xml - add group, permissions, registrar and domainpolicy definitions git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2236 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1768a79… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 16 13:37:12 2007 +0000 - add siptrace and cpl module xml file - add address and missed_calls xml definition - update lcr and acc include files - some docu fixes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2234 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56590fa… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 16 12:57:31 2007 +0000 - finish lrc module related tables - fix DTD definition - remove core and extra xml files - rework and cleanup Makefile git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2232 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c48e042… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 15 16:18:29 2007 +0000 - cleanup of xml references - add definition for acc module git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2227 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=975b070… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 15 13:56:30 2007 +0000 - complete 'extra' tables - add verbose case to makefile - add two more entities git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2225 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54f96fd… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 15 10:48:05 2007 +0000 - add entities from database setup script - add xml files for core, presence, serweb and extra tables - update xml after extensions in xsl scripts - update Makefile git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2223 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71498e2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 14 15:51:41 2007 +0000 - change dtd reference to local fs, update gw definition - add definitions for pdt, cpl and uri tables git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2218 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0200e6d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 14 14:21:32 2007 +0000 - add a directory for xml definition for database schemas - add Makefile and first xml definition for gw table - xsl schemas needed for this and other stuff still missing, not ready yet git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2217 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c52783f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri May 11 08:01:24 2007 +0000 add 'db_' prefix to fetch_rows and fetch_row function to prevent name clash with mysql library function git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2196 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0eece1d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 10 12:37:19 2007 +0000 - more database interface cleanup - move the free_rows function to db/db_res.c - move the free_row function to db/db_row.c - change mysql and unixodbc to use this implementation - the postgresql uses a different implementation, this still needs some investigation - move common used print_columns function to db_ut.c - change the mysql, postgresql and unixodbc modules to use this implementation - use the right mysql and postgresql escape function for BLOBs instead of the deprecated function which could produce errors in certain corner cases - extends comments in db dir and database modules git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2185 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94b24ee… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 7 12:01:18 2007 +0000 - move most of the time and date handling functions for databases to db_ut.h - delete the implementations in unixodbc, mysql and partly in postgresql - fix header includes for these modules - postgresql saves the time and date with the timezone attached, so this module can not use the common db_time2str - change the _XOPEN_SOURCE define to 600 use the SuSv3 definition for strptime, the old define conflicts with some string handling functions - delete the unneded time related defines in postgresql module - add undefs after the defines to avoid changes for subsequent includes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2157 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cda1e99… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 3 12:03:14 2007 +0000 * move commonly used char* converter function for DBs into db dir * remove these functions from unixodbc, postgresql and mysql * change these modules to use the implementation from db_ut.c * fix wrong indention in ut.h git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2126 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=516b44c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Apr 23 12:44:16 2007 +0000 Add documentation for fetch_result function to db api docs, extends comments for this function. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2049 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e8a664… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Apr 4 15:53:50 2007 +0000 - added extension for OpenSER-Database-API and the mySQL-Module for "last_inserted_id" method. This method returns the last inserted ID of an INSERT-statement, in case the table has an auto-increment field. Contributed by Carsten Bock, BASIS AudioNet GmbH The first module to use this functionality will be the usrloc module for update and delete operations (used the record ID instead of costly AOR and contact maching) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@1970 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=130215b… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Fri Mar 9 13:04:51 2007 +0000 - fixed several warnings regarding signed/unsigned ops, incomplet initializers for static data. Based on a patch send by Eliot Gable <egable(a)broadvox.net> for increasing the level of warning messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@1782 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf01159… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Thu Feb 22 15:16:38 2007 +0000 More cleanup applied : Delete the crc32file function from crc.c. This is a test function, that is not exported and thus not used anywhere. It also deletes the main function there that is commented out. Remove the "/bin/sh" shebang in the sourced scripts in the ./scripts directory. These files are not meant for direct execution and are installed in /usr/lib/ anyway. This fix comes from the debian package dir (see next patch). Remove the now unnecessary patch in the debian packaging directories. Adds some documentation for the replace callback in the api.txt documentation in the db dir. It also extends the comment for this function in db.h. Credits go to Henning Westerholt <henning.westerholt(a)1und1.de> git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@1687 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d957e6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 15 10:10:34 2007 +0000 - free alocated memory when binding DB. Not a really a leak now since it is done only at startup, but better free than unused and avoid future turning in leak (reported by Henning Westerholt) - closes 1660410 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@1645 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e180d9c… Author: Bastian Friedrich <bastian.friedrich(a)collax.com> Date: Mon Feb 12 16:24:59 2007 +0000 Fixing minor typo ("quries" -> "queries") during an error logging git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@1616 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=501d9d5… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Mon Jan 15 11:06:45 2007 +0000 - removed obsolete files related to old FIFO impl git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@1510 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3076ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 4 08:23:25 2006 +0000 - db_res_t* variables initialized to NULL (patch by Norman Brandinger) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@1063 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8351011… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 14 14:13:00 2006 +0000 - added support for fetch_result() in DB API - drivers supporting fetch_result() will advertise DB_CAP_FETCH as capability - added support for fetch_result() in mysql module - usrloc modules uses fetch_result() if available when loads location records - this removes the issue with loading huge numbers of location records which required increase of PGK memory size and recompilation of OpenSER - from the tests, with 1MB memory (default) the out of memory occured approximately around row 4300 - usrloc has a new parameter 'fetch_rows' for tunning the number of the rows to be fetched at once, default is 2000 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@1012 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0a8bae… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Jul 5 08:52:15 2006 +0000 - more validity checks for table_version() - check if returned field has INT type and if it's not null git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@966 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5887fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 2 18:01:08 2006 +0000 - check the type of table_version result (reported by Ryan (Matty <matty91(a)gmail.com>)) - free mysql connection from pool only when found git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@950 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=850c6f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 6 18:29:36 2006 +0000 - check for null passwords (on some OS strcmp crashes) - reported by Edgar Barbosa - tbd: the other attributes in db url has to be investigated if they are optional or not git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@902 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfcf771… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Mon Jun 5 15:07:10 2006 +0000 - code formating beautification git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@898 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6173986… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 30 12:03:11 2006 +0000 - added reminder features (patch subbmited by Andrea Giordana) - added OP_NEQ (!=) to database operators - doc updated - dev version increased - mysql script updated git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@573 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=857b95e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jun 16 12:07:08 2005 +0000 - mergin with ser cvs head git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@29 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9405692… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Mon Jun 13 16:47:24 2005 +0000 Initial revision git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2 689a6050-402a-0410-94f2-e92a70836424

15 years, 7 months

git:daniel/pv: init_mi_core() exported via mi.h

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/pv Commit: 4e6f8d23f4afbf76a69196e4789be85742e8a56e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e6f8d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 13 00:16:27 2009 +0200 init_mi_core() exported via mi.h - mi_core.h no longer needed, probably mi_core.c should get into a module --- lib/kmi/mi.h | 2 ++ lib/kmi/mi_core.h | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lib/kmi/mi.h b/lib/kmi/mi.h index 0a14452..5c0ac19 100644 --- a/lib/kmi/mi.h +++ b/lib/kmi/mi.h @@ -91,5 +91,7 @@ static inline struct mi_root* run_mi_cmd(struct mi_cmd *cmd, struct mi_root *t) void get_mi_cmds( struct mi_cmd** cmds, int *size); +int init_mi_core(void); + #endif diff --git a/lib/kmi/mi_core.h b/lib/kmi/mi_core.h index bc58392..481aeed 100644 --- a/lib/kmi/mi_core.h +++ b/lib/kmi/mi_core.h @@ -36,6 +36,6 @@ #ifndef _MI_MI_CORE_H_ #define _MI_MI_CORE_H_ -int init_mi_core(void); +// int init_mi_core(void); #endif

15 years, 7 months

git:daniel/pv: - sync transformations add/lookup with kamailio

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/pv Commit: 46ab082aab5971e8511460df0107709bd6aedb0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=46ab082… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 13 00:21:44 2009 +0200 - sync transformations add/lookup with kamailio --- pvapi.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/pvapi.c b/pvapi.c index 2e34412..fa304a5 100644 --- a/pvapi.c +++ b/pvapi.c @@ -1362,15 +1362,9 @@ int tr_table_add(tr_export_t *e) tri = _tr_table[trid%TR_TABLE_SIZE]; while(tri) { - if(tri->trid > trid) - break; - if(tri->tre.tclass.len > e->tclass.len) - break; if(tri->tre.tclass.len==e->tclass.len) { found = strncmp(tri->tre.tclass.s, e->tclass.s, e->tclass.len); - if(found>0) - break; if(found==0) { LM_ERR("TR class [%.*s] already exists\n", e->tclass.len, @@ -1470,11 +1464,6 @@ tr_export_t* tr_lookup_class(str *tclass) tri = _tr_table[trid%TR_TABLE_SIZE]; while(tri) { - if(tri->trid > trid) - break; - if(tri->tre.tclass.len > tclass->len) - break; - if(tri->trid==trid && tri->tre.tclass.len==tclass->len && memcmp(tri->tre.tclass.s, tclass->s, tclass->len)==0) return &(tri->tre);

15 years, 7 months

git:daniel/pv: MI: core part

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/pv Commit: 697e05f3421efa7e614783e8497a743d792fa9cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=697e05f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Feb 10 23:52:07 2009 +0200 MI: core part - code from kamailio MI --- lib/kmi/Makefile | 9 ++ lib/kmi/attr.c | 176 +++++++++++++++++++++++++ lib/kmi/attr.h | 61 +++++++++ lib/kmi/fmt.c | 54 ++++++++ lib/kmi/fmt.h | 71 ++++++++++ lib/kmi/mi.c | 180 +++++++++++++++++++++++++ lib/kmi/mi.h | 95 +++++++++++++ lib/kmi/mi_core.c | 378 +++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/kmi/mi_core.h | 41 ++++++ lib/kmi/tree.c | 286 ++++++++++++++++++++++++++++++++++++++++ lib/kmi/tree.h | 103 +++++++++++++++ 11 files changed, 1454 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=697…

15 years, 7 months

git:daniel/pv: mi include file

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/pv Commit: 7f8bc741b9ee35df5c77ed199299a62ce1444dca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f8bc74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Feb 10 23:54:09 2009 +0200 mi include file - just include the lib/kmi/mi.h --- mi/mi.h | 66 +-------------------------------------------------------------- 1 files changed, 1 insertions(+), 65 deletions(-) diff --git a/mi/mi.h b/mi/mi.h index d01d94b..b3c106f 100644 --- a/mi/mi.h +++ b/mi/mi.h @@ -28,71 +28,7 @@ #ifndef _mi_h_ #define _mi_h_ -#include "../str.h" - -#define MI_DUP_NAME (1<<0) -#define MI_DUP_VALUE (1<<1) - -#define MI_OK_S "OK" -#define MI_OK_LEN (sizeof(MI_OK_S)-1) -#define MI_INTERNAL_ERR_S "Server Internal Error" -#define MI_INTERNAL_ERR_LEN (sizeof(MI_INTERNAL_ERR_S)-1) -#define MI_MISSING_PARM_S "Too few or too many arguments" -#define MI_MISSING_PARM_LEN (sizeof(MI_MISSING_PARM_S)-1) -#define MI_BAD_PARM_S "Bad parameter" -#define MI_BAD_PARM_LEN (sizeof(MI_BAD_PARM_S)-1) - -#define MI_SSTR(_s) _s,(sizeof(_s)-1) -#define MI_OK MI_OK_S -#define MI_INTERNAL_ERR MI_INTERNAL_ERR_S -#define MI_MISSING_PARM MI_MISSING_PARM_S -#define MI_BAD_PARM MI_BAD_PARM_S - - - -struct mi_attr{ - str name; - str value; - struct mi_attr *next; -}; - - -struct mi_node { - str value; - str name; - struct mi_node *kids; - struct mi_node *next; - struct mi_node *last; - struct mi_attr *attributes; -}; - - -struct mi_root { - unsigned int code; - str reason; - struct mi_handler *async_hdl; - struct mi_node node; -}; - -typedef struct mi_root* (mi_cmd_f)(struct mi_root*, void *param); -typedef int (mi_child_init_f)(void); - - -typedef struct mi_export_ { - char *name; - mi_cmd_f *cmd; - unsigned int flags; - void *param; - mi_child_init_f *init_f; -}mi_export_t; - - -#define init_mi_tree(code, reason, reason_len) 0 -#define free_mi_tree(parent) -#define add_mi_node_sibling(node, flags, name, name_len, val, val_len) 0 -#define add_mi_node_child(node, flags, name, name_len, val, val_len) 0 -#define addf_mi_node_child(node, flags, name, name_len, fmt, ...) 0 - +#include "../lib/kmi/mi.h" #endif /* _mi_h_ */

15 years, 7 months

git:andrei/switch: script engine: while() support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/switch Commit: dfda974cfb1c073fb751f74fab18a66f4bb341ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfda974… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 10 22:21:12 2009 +0100 script engine: while() support - support the same while() loops as kamailio (the only difference being that max_while_loops can be changed at runtime): while(<int expr>) { .... } with break exiting the while. --- action.c | 27 +++++++++++++++++++++++++- cfg_core.c | 3 ++ cfg_core.h | 1 + config.h | 3 ++ route.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- route_struct.h | 2 +- 6 files changed, 89 insertions(+), 4 deletions(-) diff --git a/action.c b/action.c index 82e187c..079bbfe 100644 --- a/action.c +++ b/action.c @@ -112,9 +112,10 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct sip_uri *u; unsigned short port; str* dst_host; - int i; + int i, flags; struct switch_cond_table* sct; struct switch_jmp_table* sjt; + struct rval_expr* rve; /* reset the value of error to E_UNSPEC so avoid unknowledgable @@ -906,6 +907,30 @@ sw_jt_def: returns passthrough */ } break; + case WHILE_T: + i=0; + flags=0; + rve=(struct rval_expr*)a->val[0].u.data; + ret=1; + while(!(flags & BREAK_R_F) && + (rval_expr_eval_int(h, msg, &v, rve) == 0) && v){ + i++; + if (unlikely(i > cfg_get(core, core_cfg, max_while_loops))){ + LOG(L_ERR, "ERROR: runaway while (%d, %d): more then" + " %d loops\n", + rve->fpos.s_line, rve->fpos.s_col, + cfg_get(core, core_cfg, max_while_loops)); + ret=-1; + break; + } + if (likely(a->val[1].u.data)){ + ret=run_actions(h, (struct action*)a->val[1].u.data, msg); + flags|=h->run_flags; + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + } + break; case FORCE_RPORT_T: msg->msg_flags|=FL_FORCE_RPORT; ret=1; /* continue processing */ diff --git a/cfg_core.c b/cfg_core.c index f3c511e..9a2b0b2 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -88,6 +88,7 @@ struct cfg_group_core default_core_cfg = { #ifdef SHM_MEM 0, /* mem_dump_shm */ #endif + DEFAULT_MAX_WHILE_LOOPS, /* max_while_loops */ }; void *core_cfg = &default_core_cfg; @@ -177,5 +178,7 @@ cfg_def_t core_cfg_def[] = { {"mem_dump_shm", CFG_VAR_INT, 0, 0, mem_dump_shm_fixup, 0, "dump shared memory status"}, #endif + {"max_while_loops", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, + "maximum iterations allowed for a while loop" }, {0, 0, 0, 0, 0, 0} }; diff --git a/cfg_core.h b/cfg_core.h index d916563..8e5457a 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -85,6 +85,7 @@ struct cfg_group_core { #ifdef SHM_MEM int mem_dump_shm; #endif + int max_while_loops; }; extern struct cfg_group_core default_core_cfg; diff --git a/config.h b/config.h index 393d1f3..0832eb0 100644 --- a/config.h +++ b/config.h @@ -208,4 +208,7 @@ #define DEFAULT_DID "_default" +/* maximum allowed iterations for a while (to catch runaways) */ +#define DEFAULT_MAX_WHILE_LOOPS 100 + #endif diff --git a/route.c b/route.c index 5587f12..54e3236 100644 --- a/route.c +++ b/route.c @@ -623,6 +623,10 @@ int fix_actions(struct action* a) struct ip_addr ip; struct socket_info* si; struct lvalue* lval; + struct rval_expr* rve; + struct rval_expr* err_rve; + enum rval_type rve_type, err_type, expected_type; + char buf[30]; /* tmp buffer needed for module param fixups */ @@ -701,12 +705,12 @@ int fix_actions(struct action* a) case SWITCH_T: if (t->val[0].type!=RVE_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" - "%d for if (should be expr)\n", + "%d for switch() (should be expr)\n", t->val[0].type); return E_BUG; }else if (t->val[1].type!=CASE_ST){ LOG(L_CRIT, "BUG: fix_actions: invalid subtype" - "%d for switch(...){...}(should be action)\n", + "%d for switch(...){...}(should be case)\n", t->val[1].type); return E_BUG; } @@ -721,6 +725,55 @@ int fix_actions(struct action* a) if ((ret=fix_switch(t))<0) return ret; break; + case WHILE_T: + if (t->val[0].type!=RVE_ST){ + LOG(L_CRIT, "BUG: fix_actions: invalid subtype" + "%d for while() (should be expr)\n", + t->val[0].type); + return E_BUG; + }else if (t->val[1].type!=ACTIONS_ST){ + LOG(L_CRIT, "BUG: fix_actions: invalid subtype" + "%d for while(...){...}(should be action)\n", + t->val[1].type); + return E_BUG; + } + rve=(struct rval_expr*)t->val[0].u.data; + if (rve){ + err_rve=0; + if (!rve_check_type(&rve_type, rve, &err_rve, + &err_type, &expected_type)){ + if (err_rve) + LOG(L_ERR, "fix_actions: invalid expression " + "(%d,%d): subexpression (%d,%d) has type" + " %s, but %s is expected\n", + rve->fpos.s_line, rve->fpos.s_col, + err_rve->fpos.s_line, err_rve->fpos.s_col, + rval_type_name(err_type), + rval_type_name(expected_type) ); + else + LOG(L_ERR, "fix_actions: invalid expression " + "(%d,%d): type mismatch?", + rve->fpos.s_line, rve->fpos.s_col); + return E_UNSPEC; + } + if (rve_type!=RV_INT && rve_type!=RV_NONE){ + LOG(L_ERR, "fix_actions: invalid expression (%d,%d):" + " bad type, integer expected\n", + rve->fpos.s_line, rve->fpos.s_col); + return E_UNSPEC; + } + if ((ret=fix_rval_expr((void**)&rve))<0) + return ret; + }else{ + LOG(L_CRIT, "BUG: fix_actions: null while()" + " expression\n"); + return E_BUG; + } + if ( t->val[1].u.data && + ((ret= fix_actions((struct action*)t->val[1].u.data))<0)){ + return ret; + } + break; case ASSIGN_T: case ADD_T: if (t->val[0].type !=LVAL_ST) { diff --git a/route_struct.h b/route_struct.h index a8cfe8f..85242af 100644 --- a/route_struct.h +++ b/route_struct.h @@ -71,7 +71,7 @@ enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, IF_T, SWITCH_T /* only until fixup*/, - BLOCK_T, EVAL_T, SWITCH_JT_T, SWITCH_COND_T, + BLOCK_T, EVAL_T, SWITCH_JT_T, SWITCH_COND_T, WHILE_T, MODULE_T, MODULE3_T, MODULE4_T, MODULE5_T, MODULE6_T, MODULEX_T, SETFLAG_T, RESETFLAG_T, ISFLAGSET_T , AVPFLAG_OPER_T,

15 years, 7 months

git:andrei/switch: script parsing: while support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/switch Commit: d14a718fbaf2f737ea9206dc1d63ea8b3bdba294 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d14a718… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 10 22:39:01 2009 +0100 script parsing: while support - while() support - improved config warning functions --- NEWS | 4 ++++ cfg.lex | 6 +++++- cfg.y | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 61 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 03852ee..bede08a 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,10 @@ config script changes: #!MAXCOMPAT where #!KAMAILIO is equivalent with #!OPENSER and #!ALL with #!MAXCOMPAT - support for kamailio style pvars + - C-like switch()/case (integer only) + - while() + - max_while_loops - maximum iterations allowed for a while, can be changed + at runtime. Default 100. diff --git a/cfg.lex b/cfg.lex index 13767b1..1323303 100644 --- a/cfg.lex +++ b/cfg.lex @@ -190,6 +190,7 @@ FORCE_SEND_SOCKET "force_send_socket" SWITCH "switch" CASE "case" DEFAULT "default" +WHILE "while" /*ACTION LVALUES*/ URIHOST "uri:host" @@ -375,6 +376,7 @@ MCAST_TTL "mcast_ttl" TOS "tos" PMTU_DISCOVERY "pmtu_discovery" KILL_TIMEOUT "exit_timeout"|"ser_kill_timeout" +MAX_WLOOPS "max_while_loops" /* stun config variables */ STUN_REFRESH_INTERVAL "stun_refresh_interval" @@ -501,7 +503,7 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{SWITCH} { count(); yylval.strval=yytext; return SWITCH; } <INITIAL>{CASE} { count(); yylval.strval=yytext; return CASE; } <INITIAL>{DEFAULT} { count(); yylval.strval=yytext; return DEFAULT; } - +<INITIAL>{WHILE} { count(); yylval.strval=yytext; return WHILE; } <INITIAL>{URIHOST} { count(); yylval.strval=yytext; return URIHOST; } <INITIAL>{URIPORT} { count(); yylval.strval=yytext; return URIPORT; } @@ -717,6 +719,8 @@ EAT_ABLE [\ \t\b\r] return PMTU_DISCOVERY; } <INITIAL>{KILL_TIMEOUT} { count(); yylval.strval=yytext; return KILL_TIMEOUT; } +<INITIAL>{MAX_WLOOPS} { count(); yylval.strval=yytext; + return MAX_WLOOPS; } <INITIAL>{SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} <INITIAL>{CFG_DESCRIPTION} { count(); yylval.strval=yytext; return CFG_DESCRIPTION; } <INITIAL>{LOADMODULE} { count(); yylval.strval=yytext; return LOADMODULE; } diff --git a/cfg.y b/cfg.y index 42f068a..e1758bf 100644 --- a/cfg.y +++ b/cfg.y @@ -184,6 +184,7 @@ extern int yylex(); static void yyerror(char* s, ...); +static void yyerror_at(struct cfg_pos* pos, char* s, ...); static char* tmp; static int i_tmp; static unsigned u_tmp; @@ -201,7 +202,8 @@ static struct action *mod_func_action; static struct lvalue* lval_tmp; static struct rvalue* rval_tmp; -static void warn(char* s); +static void warn(char* s, ...); +static void warn_at(struct cfg_pos* pos, char* s, ...); static void get_cpos(struct cfg_pos* pos); static struct rval_expr* mk_rve_rval(enum rval_type, void* v); static struct rval_expr* mk_rve1(enum rval_expr_op op, struct rval_expr* rve1); @@ -280,6 +282,7 @@ static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a); %token SWITCH %token CASE %token DEFAULT +%token WHILE %token URIHOST %token URIPORT %token MAX_LEN @@ -436,6 +439,7 @@ static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a); %token TOS %token PMTU_DISCOVERY %token KILL_TIMEOUT +%token MAX_WLOOPS %token CFG_DESCRIPTION %token SERVER_ID @@ -501,7 +505,7 @@ static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a); %type <intval> intno eint_op eint_op_onsend %type <intval> eip_op eip_op_onsend %type <action> action actions cmd fcmd if_cmd stm /*exp_stm*/ assign_action -%type <action> switch_cmd +%type <action> switch_cmd while_cmd %type <case_stms> single_case case_stms %type <ipaddr> ipv4 ipv6 ipv6addr ip %type <ipnet> ipnet @@ -1283,6 +1287,8 @@ assign_stm: | PMTU_DISCOVERY error { yyerror("number expected"); } | KILL_TIMEOUT EQUAL NUMBER { ser_kill_timeout=$3; } | KILL_TIMEOUT EQUAL error { yyerror("number expected"); } + | MAX_WLOOPS EQUAL NUMBER { default_core_cfg.max_while_loops=$3; } + | MAX_WLOOPS EQUAL error { yyerror("number expected"); } | STUN_REFRESH_INTERVAL EQUAL NUMBER { IF_STUN(stun_refresh_interval=$3); } | STUN_REFRESH_INTERVAL EQUAL error{ yyerror("number expected"); } | STUN_ALLOW_STUN EQUAL NUMBER { IF_STUN(stun_allow_stun=$3); } @@ -1773,6 +1779,7 @@ action: fcmd SEMICOLON {$$=$1;} | if_cmd {$$=$1;} | switch_cmd {$$=$1;} + | while_cmd { $$=$1; } | assign_action SEMICOLON {$$=$1;} | SEMICOLON /* null action */ {$$=0;} | fcmd error { $$=0; yyerror("bad command: missing ';'?"); } @@ -1873,6 +1880,17 @@ switch_cmd: {$$=0; yyerror ("bad switch body"); } ; +while_cmd: + WHILE rval_expr stm { + if ($2){ + if (rve_is_constant($2)) + warn_at(&$2->fpos, "constant value in while(...)"); + }else + yyerror_at(&$2->fpos, "bad while(...) expression"); + $$=mk_action( WHILE_T, 2, RVE_ST, $2, ACTIONS_ST, $3); + } +; + /* class_id: LBRACK ATTR_USER RBRACK { $$ = AVP_CLASS_USER; } | LBRACK ATTR_DOMAIN RBRACK { $$ = AVP_CLASS_DOMAIN; } @@ -2665,19 +2683,28 @@ static void get_cpos(struct cfg_pos* pos) } -static void warn(char* s) +static void warn_at(struct cfg_pos* p, char* format, ...) { - if (line!=startline) + va_list ap; + char s[256]; + + va_start(ap, format); + vsnprintf(s, sizeof(s), format, ap); + va_end(ap); + if (p->e_line!=p->s_line) LOG(L_WARN, "cfg. warning: (%d,%d-%d,%d): %s\n", - startline, startcolumn, line, column-1, s); - else if (startcolumn!=(column-1)) - LOG(L_WARN, "cfg. warning: (%d,%d-%d): %s\n", startline, startcolumn, - column-1, s); + p->s_line, p->s_col, p->e_line, p->e_col, s); + else if (p->s_col!=p->e_col) + LOG(L_WARN, "cfg. warning: (%d,%d-%d): %s\n", + p->s_line, p->s_col, p->e_col, s); else - LOG(L_WARN, "cfg. warning: (%d,%d): %s\n", startline, startcolumn, s); + LOG(L_WARN, "cfg. warning: (%d,%d): %s\n", + p->s_line, p->s_col, s); cfg_warnings++; } + + static void yyerror_at(struct cfg_pos* p, char* format, ...) { va_list ap; @@ -2699,6 +2726,22 @@ static void yyerror_at(struct cfg_pos* p, char* format, ...) } + +static void warn(char* format, ...) +{ + va_list ap; + char s[256]; + struct cfg_pos pos; + + get_cpos(&pos); + va_start(ap, format); + vsnprintf(s, sizeof(s), format, ap); + va_end(ap); + warn_at(&pos, s); +} + + + static void yyerror(char* format, ...) { va_list ap;

15 years, 7 months

git:andrei/switch: script engine: switch() and break execution

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/switch Commit: 955535a4f039a3782ef84d4f15bf807ee61af69d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=955535a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 9 19:01:35 2009 +0100 script engine: switch() and break execution - support for executing optimized switch()ed (by fix_switch()) - proper break handling: - exit a switch() on break (even if the break is inside an if() block) - if the break is outside a switch, exit the route block (compatibility with older versions, for new scripts using exit or drop instead of break is recommended) --- action.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- cfg.y | 2 +- route_struct.h | 1 + switch.h | 1 + 4 files changed, 107 insertions(+), 5 deletions(-) diff --git a/action.c b/action.c index 26edcca..82e187c 100644 --- a/action.c +++ b/action.c @@ -77,6 +77,7 @@ #ifdef USE_SCTP #include "sctp_server.h" #endif +#include "switch.h" #include <sys/types.h> #include <sys/socket.h> @@ -111,6 +112,10 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct sip_uri *u; unsigned short port; str* dst_host; + int i; + struct switch_cond_table* sct; + struct switch_jmp_table* sjt; + /* reset the value of error to E_UNSPEC so avoid unknowledgable functions to return with error (status<0) and not setting it @@ -448,7 +453,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) /*ret=((ret=run_actions(rlist[a->val[0].u.number], msg))<0)?ret:1;*/ ret=run_actions(h, main_rt.rlist[a->val[0].u.number], msg); h->last_retcode=ret; - h->run_flags&=~RETURN_R_F; /* absorb returns */ + h->run_flags&=~(RETURN_R_F|BREAK_R_F); /* absorb return & break */ break; case EXEC_T: if (a->val[0].type!=STRING_ST){ @@ -704,7 +709,8 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=0; break; } - h->run_flags &= ~RETURN_R_F; /* catch returns in expr */ + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ ret=1; /*default is continue */ if (v>0) { if ((a->val[1].type==ACTIONS_ST)&&a->val[1].u.data){ @@ -808,6 +814,98 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) LOG(L_CRIT,"BUG: do_action: bad module call\n"); } break; + case EVAL_T: + /* only eval the expression to account for possible + side-effect */ + rval_expr_eval_int(h, msg, &v, + (struct rval_expr*)a->val[0].u.data); + if (h->run_flags & EXIT_R_F){ + ret=0; + break; + } + h->run_flags &= ~RETURN_R_F|BREAK_R_F; /* catch return & break in + expr */ + ret=1; /* default is continue */ + break; + case SWITCH_COND_T: + sct=(struct switch_cond_table*)a->val[1].u.data; + if (unlikely( rval_expr_eval_int(h, msg, &v, + (struct rval_expr*)a->val[0].u.data) <0)){ + /* handle error in expression => use default */ + ret=-1; + goto sw_cond_def; + } + if (h->run_flags & EXIT_R_F){ + ret=0; + break; + } + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & break + in expr */ + ret=1; /* default is continue */ + for(i=0; i<sct->n; i++) + if (sct->cond[i]==v){ + if (likely(sct->jump[i])){ + ret=run_actions(h, sct->jump[i], msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + goto skip; + } +sw_cond_def: + if (sct->def){ + ret=run_actions(h, sct->def, msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + break; + case SWITCH_JT_T: + sjt=(struct switch_jmp_table*)a->val[1].u.data; + if (unlikely( rval_expr_eval_int(h, msg, &v, + (struct rval_expr*)a->val[0].u.data) <0)){ + /* handle error in expression => use default */ + ret=-1; + goto sw_jt_def; + } + if (h->run_flags & EXIT_R_F){ + ret=0; + break; + } + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & break + in expr */ + ret=1; /* default is continue */ + if (likely(v >= sjt->first && v <= sjt->last)){ + if (likely(sjt->tbl[v - sjt->first])){ + ret=run_actions(h, sjt->tbl[v - sjt->first], msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + break; + }else{ + for(i=0; i<sjt->rest.n; i++) + if (sjt->rest.cond[i]==v){ + if (likely(sjt->rest.jump[i])){ + ret=run_actions(h, sjt->rest.jump[i], msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but + let returns pass */ + } + goto skip; + } + } + /* not found => try default */ +sw_jt_def: + if (sjt->rest.def){ + ret=run_actions(h, sjt->rest.def, msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + break; + case BLOCK_T: + if (likely(a->val[0].u.data)){ + ret=run_actions(h, (struct action*)a->val[0].u.data, msg); + h->run_flags &= ~BREAK_R_F; /* catch breaks, but let + returns passthrough */ + } + break; case FORCE_RPORT_T: msg->msg_flags|=FL_FORCE_RPORT; ret=1; /* continue processing */ @@ -885,7 +983,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) default: LOG(L_CRIT, "BUG: do_action: unknown type %d\n", a->type); } -/*skip:*/ +skip: return ret; error_uri: @@ -935,7 +1033,9 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) for (t=a; t!=0; t=t->next){ ret=do_action(h, t, msg); - if (h->run_flags & (RETURN_R_F|EXIT_R_F)){ + /* break, return or drop/exit stop execution of the current + block */ + if (h->run_flags & (BREAK_R_F|RETURN_R_F|EXIT_R_F)){ if (h->run_flags & EXIT_R_F){ #ifdef USE_LONGJMP h->last_retcode=ret; diff --git a/cfg.y b/cfg.y index 431054d..42f068a 100644 --- a/cfg.y +++ b/cfg.y @@ -2410,7 +2410,7 @@ cmd: | RETURN {$$=mk_action(DROP_T, 2, NUMBER_ST, (void*)1, NUMBER_ST, (void*)RETURN_R_F); } | RETURN NUMBER {$$=mk_action(DROP_T, 2, NUMBER_ST, (void*)$2, NUMBER_ST, (void*)RETURN_R_F);} | RETURN RETCODE {$$=mk_action(DROP_T, 2, RETCODE_ST, 0, NUMBER_ST, (void*)RETURN_R_F);} - | BREAK {$$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)RETURN_R_F); } + | BREAK {$$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)BREAK_R_F); } | LOG_TOK LPAREN STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)4, STRING_ST, $3); } | LOG_TOK LPAREN NUMBER COMMA STRING RPAREN {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)$3, STRING_ST, $5); } | LOG_TOK error { $$=0; yyerror("missing '(' or ')' ?"); } diff --git a/route_struct.h b/route_struct.h index e87b2d0..a8cfe8f 100644 --- a/route_struct.h +++ b/route_struct.h @@ -105,6 +105,7 @@ enum { NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, /* run flags */ #define EXIT_R_F 1 #define RETURN_R_F 2 +#define BREAK_R_F 4 struct cfg_pos{ diff --git a/switch.h b/switch.h index 4c9f78b..e92cbad 100644 --- a/switch.h +++ b/switch.h @@ -54,6 +54,7 @@ struct switch_jmp_table{ struct switch_cond_table rest; /**< normal cond. table for the rest */ }; +int fix_switch(struct action* t); #endif /*__switch_h*/

15 years, 7 months

git:andrei/switch: script parsing: C style switch() & case support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/switch Commit: a29a8b6ddba24b8e71faaf78e7426aa7f85c19b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a29a8b6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 4 20:44:26 2009 +0100 script parsing: C style switch() & case support - support for parsing C style switch() & case, e.g.: switch($var){ case 1: log(1, "1\n"); break; case 2: case 3: default: log(1, "default\n"); } (note: this is different from kamailio/openser switch()) --- cfg.lex | 7 +++ cfg.y | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- route_struct.h | 8 +++- switch.h | 60 +++++++++++++++++++++++++++ 4 files changed, 194 insertions(+), 3 deletions(-) diff --git a/cfg.lex b/cfg.lex index fc9eecb..13767b1 100644 --- a/cfg.lex +++ b/cfg.lex @@ -187,6 +187,9 @@ ELSE "else" SET_ADV_ADDRESS "set_advertised_address" SET_ADV_PORT "set_advertised_port" FORCE_SEND_SOCKET "force_send_socket" +SWITCH "switch" +CASE "case" +DEFAULT "default" /*ACTION LVALUES*/ URIHOST "uri:host" @@ -495,6 +498,10 @@ EAT_ABLE [\ \t\b\r] return SET_ADV_PORT; } <INITIAL>{FORCE_SEND_SOCKET} { count(); yylval.strval=yytext; return FORCE_SEND_SOCKET; } +<INITIAL>{SWITCH} { count(); yylval.strval=yytext; return SWITCH; } +<INITIAL>{CASE} { count(); yylval.strval=yytext; return CASE; } +<INITIAL>{DEFAULT} { count(); yylval.strval=yytext; return DEFAULT; } + <INITIAL>{URIHOST} { count(); yylval.strval=yytext; return URIHOST; } <INITIAL>{URIPORT} { count(); yylval.strval=yytext; return URIPORT; } diff --git a/cfg.y b/cfg.y index 63c9eb4..431054d 100644 --- a/cfg.y +++ b/cfg.y @@ -93,6 +93,7 @@ * lval=rval_expr, where lval=avp|pvar (andrei) * 2007-12-06 expression are now evaluated in terms of rvalues; * NUMBER is now always positive; cleanup (andrei) + * 2009-01-26 case/switch() support (andrei) */ %{ @@ -109,6 +110,7 @@ #include "route_struct.h" #include "globals.h" #include "route.h" +#include "switch.h" #include "dprint.h" #include "sr_module.h" #include "modparam.h" @@ -211,6 +213,8 @@ static struct socket_id* mk_listen_id2(struct name_lst*, int, int); static void free_name_lst(struct name_lst* lst); static void free_socket_id_lst(struct socket_id* i); +static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a); + %} %union { @@ -219,6 +223,7 @@ static void free_socket_id_lst(struct socket_id* i); char* strval; struct expr* expr; struct action* action; + struct case_stms* case_stms; struct net* ipnet; struct ip_addr* ipaddr; struct socket_id* sockid; @@ -272,6 +277,9 @@ static void free_socket_id_lst(struct socket_id* i); %token SET_ADV_ADDRESS %token SET_ADV_PORT %token FORCE_SEND_SOCKET +%token SWITCH +%token CASE +%token DEFAULT %token URIHOST %token URIPORT %token MAX_LEN @@ -493,6 +501,8 @@ static void free_socket_id_lst(struct socket_id* i); %type <intval> intno eint_op eint_op_onsend %type <intval> eip_op eip_op_onsend %type <action> action actions cmd fcmd if_cmd stm /*exp_stm*/ assign_action +%type <action> switch_cmd +%type <case_stms> single_case case_stms %type <ipaddr> ipv4 ipv6 ipv6addr ip %type <ipnet> ipnet %type <strval> host @@ -514,7 +524,7 @@ static void free_socket_id_lst(struct socket_id* i); %type <attr> attr_id_any_str %type <pvar> pvar %type <lval> lval -%type <rv_expr> rval rval_expr +%type <rv_expr> rval rval_expr ct_rval %type <lval> avp_pvar /* %type <intval> class_id */ %type <intval> assign_op @@ -1762,6 +1772,7 @@ actions: action: fcmd SEMICOLON {$$=$1;} | if_cmd {$$=$1;} + | switch_cmd {$$=$1;} | assign_action SEMICOLON {$$=$1;} | SEMICOLON /* null action */ {$$=0;} | fcmd error { $$=0; yyerror("bad command: missing ';'?"); } @@ -1770,6 +1781,98 @@ if_cmd: IF exp stm { $$=mk_action( IF_T, 3, EXPR_ST, $2, ACTIONS_ST, $3, NOSUBTYPE, 0); } | IF exp stm ELSE stm { $$=mk_action( IF_T, 3, EXPR_ST, $2, ACTIONS_ST, $3, ACTIONS_ST, $5); } ; + +ct_rval: rval_expr { + $$=0; + if (!rve_is_constant($1)){ + yyerror("constant expected"); + }else if (!rve_check_type((enum rval_type*)&i_tmp, $1, 0, 0 ,0)){ + yyerror("invalid expression (bad type)"); + }else if (i_tmp!=RV_INT){ + yyerror("invalid expression type, int expected\n"); + }else + $$=$1; + } +; +single_case: + CASE ct_rval COLON actions { + $$=0; + if ($2==0) yyerror ("bad case label"); + else if (($$=mk_case_stm($2, $4))==0){ + yyerror("internal error: memory allocation failure"); + YYABORT; + } + } + | CASE ct_rval COLON { + $$=0; + if ($2==0) yyerror ("bad case label"); + else if (($$=mk_case_stm($2, 0))==0){ + yyerror("internal error: memory allocation failure"); + YYABORT; + } + } + | DEFAULT COLON actions { + if (($$=mk_case_stm(0, $3))==0){ + yyerror("internal error: memory allocation failure"); + YYABORT; + } + } + | DEFAULT COLON { + if (($$=mk_case_stm(0, 0))==0){ + yyerror("internal error: memory allocation failure"); + YYABORT; + } + } + | CASE error { $$=0; yyerror("bad case label"); } + | CASE ct_rval COLON error { $$=0; yyerror ("bad case body"); } +; +case_stms: + case_stms single_case { + $$=$1; + if ($2==0) yyerror ("bad case"); + if ($$){ + *($$->append)=$2; + if (*($$->append)!=0) + $$->append=&((*($$->append))->next); + } + } + | single_case { + $$=$1; + if ($1==0) yyerror ("bad case"); + else $$->append=&($$->next); + } +; +switch_cmd: + SWITCH rval_expr LBRACE case_stms RBRACE { + $$=0; + if ($2==0) yyerror("bad expression in switch(...)"); + else if ($4==0) yyerror ("bad switch body"); + else{ + $$=mk_action(SWITCH_T, 2, RVE_ST, $2, CASE_ST, $4); + if ($$==0) { + yyerror("internal error"); + YYABORT; + } + } + } + | SWITCH rval_expr LBRACE RBRACE { + $$=0; + warn("empty switch()"); + if ($2==0) yyerror("bad expression in switch(...)"); + else{ + /* it might have sideffects, so leave it for the optimizer */ + $$=mk_action(SWITCH_T, 2, RVE_ST, $2, CASE_ST, 0); + if ($$==0) { + yyerror("internal error"); + YYABORT; + } + } + } + | SWITCH error { $$=0; yyerror ("bad expression in switch(...)"); } + | SWITCH rval_expr LBRACE error RBRACE + {$$=0; yyerror ("bad switch body"); } +; + /* class_id: LBRACK ATTR_USER RBRACK { $$ = AVP_CLASS_USER; } | LBRACK ATTR_DOMAIN RBRACK { $$ = AVP_CLASS_DOMAIN; } @@ -2763,6 +2866,23 @@ static void free_socket_id_lst(struct socket_id* lst) } } + +static struct case_stms* mk_case_stm(struct rval_expr* ct, struct action* a) +{ + struct case_stms* s; + s=pkg_malloc(sizeof(*s)); + if (s==0) { + LOG(L_CRIT,"ERROR: cfg. parser: out of memory.\n"); + } else { + memset(s, 0, sizeof(*s)); + s->ct_rve=ct; + s->actions=a; + s->next=0; + s->append=0; + } + return s; +} + /* int main(int argc, char ** argv) { diff --git a/route_struct.h b/route_struct.h index 76aac25..e87b2d0 100644 --- a/route_struct.h +++ b/route_struct.h @@ -70,7 +70,9 @@ enum { METHOD_O=1, URI_O, FROM_URI_O, TO_URI_O, SRCIP_O, SRCPORT_O, enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, - IF_T, MODULE_T, MODULE3_T, MODULE4_T, MODULE5_T, MODULE6_T, MODULEX_T, + IF_T, SWITCH_T /* only until fixup*/, + BLOCK_T, EVAL_T, SWITCH_JT_T, SWITCH_COND_T, + MODULE_T, MODULE3_T, MODULE4_T, MODULE5_T, MODULE6_T, MODULEX_T, SETFLAG_T, RESETFLAG_T, ISFLAGSET_T , AVPFLAG_OPER_T, LEN_GT_T, PREFIX_T, STRIP_T,STRIP_TAIL_T, @@ -96,7 +98,9 @@ enum { NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, MYSELF_ST, STR_ST, SOCKID_ST, SOCKETINFO_ST, ACTION_ST, AVP_ST, SELECT_ST, PVAR_ST, LVAL_ST, RVE_ST, - RETCODE_ST}; + RETCODE_ST, CASE_ST, + BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST +}; /* run flags */ #define EXIT_R_F 1 diff --git a/switch.h b/switch.h new file mode 100644 index 0000000..4c9f78b --- /dev/null +++ b/switch.h @@ -0,0 +1,60 @@ +/* + * $Id$ + * + * Copyright (C) 2009 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * /home/andrei/sr.git/switch.h + */ +/* + * History: + * -------- + * 2009-02-02 initial version (andrei) +*/ + +#ifndef __switch_h +#define __switch_h + +#include "route_struct.h" + +struct case_stms{ + struct rval_expr* ct_rve; + struct action* actions; + struct case_stms* next; + struct case_stms** append; + int int_label; + int is_default; +}; + + +struct switch_cond_table{ + int n; /**< size */ + int* cond; /**< int labels array */ + struct action** jump; /**< jump points array */ + struct action* def; /**< default jump */ +}; + + +struct switch_jmp_table{ + int first; /**< first int label in the jump table */ + int last; /**< last int label in the jump table */ + struct action** tbl; /**< jmp table [v-first] iff first<=v<=last */ + struct switch_cond_table rest; /**< normal cond. table for the rest */ +}; + + +#endif /*__switch_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */

15 years, 7 months

git:andrei/switch: expr engine: minor additions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/switch Commit: 2d6686519542ee12bedbe085500ed3cd6f87f280 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d66865… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 4 19:20:53 2009 +0100 expr engine: minor additions - added rve_has_side_effects(), preliminary version (for now is equivalent with !rve_is_constant()) - exported rve_destroy() --- rvalue.c | 11 +++++++++++ rvalue.h | 4 ++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/rvalue.c b/rvalue.c index 9e020ef..4c7472d 100644 --- a/rvalue.c +++ b/rvalue.c @@ -452,6 +452,17 @@ int rve_is_constant(struct rval_expr* rve) +/** returns true if the expression has side-effects. + * @return 1 for possible side-effects, 0 for no side-effects + * TODO: add better checks + */ +int rve_has_side_effects(struct rval_expr* rve) +{ + return !rve_is_constant(rve); +} + + + /** returns true if operator is unary (takes only 1 arg). * @return 0 or 1 on */ diff --git a/rvalue.h b/rvalue.h index a694c0d..88fd6f2 100644 --- a/rvalue.h +++ b/rvalue.h @@ -188,6 +188,8 @@ int rval_expr_eval_rvint( struct run_act_ctx* h, struct sip_msg* msg, enum rval_type rve_guess_type(struct rval_expr* rve); /** returns true if expression is constant. */ int rve_is_constant(struct rval_expr* rve); +/** returns true if the expression can have side-effect */ +int rve_has_side_effects(struct rval_expr* rve); /** returns 1 if expression is valid (type-wise).*/ int rve_check_type(enum rval_type* type, struct rval_expr* rve, struct rval_expr** bad_rve, enum rval_type* bad_type, @@ -206,6 +208,8 @@ struct rval_expr* mk_rval_expr1(enum rval_expr_op op, struct rval_expr* rve1, struct rval_expr* mk_rval_expr2(enum rval_expr_op op, struct rval_expr* rve1, struct rval_expr* rve2, struct cfg_pos* pos); +/** destroys a pkg_malloc'ed rve. */ +void rve_destroy(struct rval_expr* rve); /** fix a rval_expr. */ int fix_rval_expr(void** p);

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