sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:master: libsrdb1: futex warning fix
by Andrei Pelinescu-Onciul 13 Feb '09

13 Feb '09

Module: sip-router Branch: master Commit: fa825fd0e8fa5c29ded4276a0e021df67a327897 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa825fd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 13 17:28:40 2009 +0100 libsrdb1: futex warning fix - added _BSD_SOURCE define if _XOPEN_SOURCE is manually defined (the _XOPEN_SOURCE define in db_ut.h caused _BSD_SOURCE to be no longer defined in features.h => _USE_MISC not defined => syscall() not declared in unistd.h.) --- lib/srdb1/db_ut.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_ut.h b/lib/srdb1/db_ut.h index 050a75b..9c936df 100644 --- a/lib/srdb1/db_ut.h +++ b/lib/srdb1/db_ut.h @@ -45,6 +45,9 @@ */ #ifndef __OS_solaris #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ + #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect + of the above define on + features.h/unistd.h syscall() */ #else #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif

1 0

git:master: - port from kamailio trunk, r5607
by Henning Westerholt 13 Feb '09

13 Feb '09

Module: sip-router Branch: master Commit: 419a1662194e2b1e51e975d5cc24b83ba910b784 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=419a166… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Feb 13 17:19:11 2009 +0100 - port from kamailio trunk, r5607 - fix a few missing line breaks in debug logs --- lib/trie/dtrie.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 32e6dbd..62e0cc9 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -55,7 +55,7 @@ struct dtrie_node_t *dtrie_init(const unsigned int branches) SHM_MEM_ERROR; return NULL; } - LM_DBG("allocate %lu bytes for root at %p", + LM_DBG("allocate %lu bytes for root at %p\n", (long unsigned)sizeof(struct dtrie_node_t), root); memset(root, 0, sizeof(struct dtrie_node_t)); @@ -65,7 +65,7 @@ struct dtrie_node_t *dtrie_init(const unsigned int branches) SHM_MEM_ERROR; return NULL; } - LM_DBG("allocate %lu bytes for %d root children pointer at %p", + LM_DBG("allocate %lu bytes for %d root children pointer at %p\n", (long unsigned)sizeof(struct dtrie_node_t *) * branches, branches, root->child); memset(root->child, 0, sizeof(struct dtrie_node_t *) * branches); @@ -91,7 +91,7 @@ void dtrie_delete(struct dtrie_node_t *root, struct dtrie_node_t *node, } if (node != root) { - LM_DBG("free node at %p", node); + LM_DBG("free node at %p\n", node); shm_free(node); } } @@ -101,7 +101,7 @@ void dtrie_destroy(struct dtrie_node_t **root, dt_delete_func_t delete_payload, { if ((root!=NULL) && (*root!=NULL)) { dtrie_delete(*root, *root, delete_payload, branches); - LM_DBG("free root at %p", root); + LM_DBG("free root at %p\n", root); shm_free(*root); *root = NULL; } @@ -139,12 +139,12 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i if (node->child[digit] == NULL) { node->child[digit] = shm_malloc(sizeof(struct dtrie_node_t)); assert(node->child[digit] != NULL); - LM_DBG("allocate %lu bytes for node at %p", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); + LM_DBG("allocate %lu bytes for node at %p\n", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); memset(node->child[digit], 0, sizeof(struct dtrie_node_t)); node->child[digit]->child = shm_malloc(sizeof(struct dtrie_node_t *) * branches); assert(node->child[digit]->child != NULL); - LM_DBG("allocate %lu bytes for %d root children pointer at %p", + LM_DBG("allocate %lu bytes for %d root children pointer at %p\n", (long unsigned)sizeof(struct dtrie_node_t *) * branches, branches, node->child[digit]->child); memset(node->child[digit]->child, 0, sizeof(struct dtrie_node_t *) * branches);

1 0

Re: [SR-Dev] sr-dev post from new@sip-router.org requires approval
by Jan Janak 13 Feb '09

13 Feb '09

This was me, there was a bug in the commit mail script which I hopefully fixed. I updated the master branch and added both versions of the database API. The database library of SER 2.0 is in lib/srdb2, the database library of kamailio is in lib/srdb1. There is the full history of the kamailio database library, that's why there is so many commit messages in the previous email. I had to do some changes in the database library taken from kamailio in order to avoid conflicts between the two version, the changes are: 1) db_con_t has been renamed to db1_con_t 2) db_res_t has been renamed to db1_res_t 3) DB_INT, DB_STR,... macros have been renamed to DB1_INT, DB1_STR,... 4) The doxygen group db has been renamed to db1. All the changes have been applied to the kamailio database library synchronized yesterday, here is how you can get patches with the changes that I did if you need them: $ git-format-patch -o patches 18580 I also attached them to this email for your convenience, they should apply to the current kamailio/db after stripping the path prefix off (patch option -p). I will send a script to update other modules later tomorrow and also upload the updated mysql driver which works with both versions of the database library (i.e. that module should work with both ser and kamailio). Jan. On 12-02 23:25, sr-dev-owner(a)lists.sip-router.org wrote: > As list administrator, your authorization is requested for the > following mailing list posting: > > List: sr-dev(a)lists.sip-router.org > From: new(a)sip-router.org > Subject: text/plain; charset=UTF-8 > Reason: Post by non-member to a members-only list > > At your convenience, visit: > > http://lists.sip-router.org/cgi-bin/mailman/admindb/sr-dev > > to approve or deny the request. > Date: Thu, 12 Feb 2009 23:25:34 +0100 (CET) > From: New(a)sip-router.org, commits(a)sip-router.org, on(a)sip-router.org, > branch(a)sip-router.org, master(a)sip-router.org > Subject: text/plain; charset=UTF-8 > To: sr-dev(a)lists.sip-router.org > > From: sr-dev-request(a)lists.sip-router.org > Subject: confirm af3499ce3479bf6be60ee69ed389474e0ddabf1c > > If you reply to this message, keeping the Subject: header intact, > Mailman will discard the held message. Do this if the message is > spam. If you reply to this message and include an Approved: header > with the list password in it, the message will be approved for posting > to the list. The Approved: header can also appear in the first line > of the body of the reply.

3 4

New commits on branch janakj/mysql
by Jan Janak 13 Feb '09

13 Feb '09

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d314ae… Author: Jan Janak <jan(a)iptel.org> Date: Fri Feb 13 01:53:03 2009 +0100 Module name changed to db_mysql. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9bbb835… Author: Jan Janak <jan(a)iptel.org> Date: Fri Feb 13 01:51:33 2009 +0100 Changes necessary to make the module compile in the sip-router tree. This is a set of changes necessary to make the LDAP module compile in the sip-router tree. This includes: * Extra stuff in the Makefile to link with libsrdb2 * Defined SER_MOD_INTERFACE in the makefile * Updated relative paths to srdb2 header files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81e8933… Merge: 2d6bfb46145eb354f0ed22301a8fdeef67eacf2e 0af03a1d6a14ccdf3f0344d30a042060ea85743a Author: Jan Janak <jan(a)iptel.org> Date: Fri Feb 13 01:20:29 2009 +0100 Merge commit 'ser_mysql/master' into mysql * commit 'ser_mysql/master': (138 commits) - fixed a crash in mysql_stmt_fetch when the statement does not exist - mysql versions < 5.0 do not support MYSQL_DATA_TRUNCATED - buffer size increased to 1024 - put doxygen docs in correct group - support for 'last_id' getopt, which retrieves the unique id of the last - Support for fetching all data to the client at once - check_result_columns renamed to check_result - better check of the return value of mysql_stmt_result_metadata - reordered included header files for better detection of missing headers added non equal operator to DB API and mysql module - a couple of minor bug fixes backported from internal verion - dispose driver-specific driver properly on error - re-submit compiled queries to the server upon reconnect added doxygen comment to deal with these files updated update_params() to work with 3 sets of params added common prefix 'mysql:' into INFOs more descriptive comments removed forgotten abort() from error handler. added doxygen comment Preparation for implementation of UPDATE db statement. ... URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0af03a1… Author: Jan Janak <jan(a)iptel.org> Date: Sun Jun 1 19:22:15 2008 +0000 - fixed a crash in mysql_stmt_fetch when the statement does not exist URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bbe2e8… Author: Jan Janak <jan(a)iptel.org> Date: Thu May 22 13:55:24 2008 +0000 - mysql versions < 5.0 do not support MYSQL_DATA_TRUNCATED patch provided by Alfred E. Heggestad closes SER-377 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3c3408… Author: Jan Janak <jan(a)iptel.org> Date: Thu May 15 10:51:19 2008 +0000 - buffer size increased to 1024 - fixed zero termination of truncated fields (reported by Miklos) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95e252d… Author: Jan Janak <jan(a)iptel.org> Date: Tue May 6 12:07:48 2008 +0000 - put doxygen docs in correct group URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3df2afa… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 14 15:40:44 2008 +0000 - support for 'last_id' getopt, which retrieves the unique id of the last inserted row URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=905f205… Author: Jan Janak <jan(a)iptel.org> Date: Sun Feb 3 19:12:05 2008 +0000 - Support for fetching all data to the client at once - Implemented db_setopt and db_getopt support for "fetch_all" command, when set to 1 (default), the client library will fetch all data to client in one step, this behavior can be disabled by setting the parameter to 0. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5694182… Author: Jan Janak <jan(a)iptel.org> Date: Wed Jan 16 15:27:06 2008 +0000 - check_result_columns renamed to check_result - bind_result ignores empty result sets without indicating errors URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03547ce… Author: Jan Janak <jan(a)iptel.org> Date: Wed Jan 16 14:58:46 2008 +0000 - better check of the return value of mysql_stmt_result_metadata URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a201f9a… Author: Jan Janak <jan(a)iptel.org> Date: Wed Jan 16 14:17:28 2008 +0000 - reordered included header files for better detection of missing headers - disable automatic database reconnects, they do not work with pre-compiled statements - error/info/log message cleanup - auto_reconnect module parameter removed - introduced new module parameter retries which controls the number of times queries are tried to execute on server on failures URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9006064… Author: Nils Ohlmeier <nils(a)iptel.org> Date: Fri Jan 11 19:27:11 2008 +0000 added non equal operator to DB API and mysql module URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=356e43f… Author: Jan Janak <jan(a)iptel.org> Date: Thu Nov 15 17:27:06 2007 +0000 - a couple of minor bug fixes backported from internal verion - support for "fake NULL" values (strings or integers that will be written in database if the value is NULL) (compile time option) - proper support for raw SQL statements - the possibility to retrieve fields in the result set and their types from the server added (needed for queries like select *). URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae322c0… Author: Jan Janak <jan(a)iptel.org> Date: Thu Nov 15 15:09:01 2007 +0000 - dispose driver-specific driver properly on error URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea3fd38… Author: Jan Janak <jan(a)iptel.org> Date: Fri Jul 13 08:52:29 2007 +0000 - re-submit compiled queries to the server upon reconnect - removed superfluous INFO statements - removed C++ style comments URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d458b87… Author: Libor Chocholaty <libor(a)iptel.org> Date: Tue Jul 3 15:16:14 2007 +0000 added doxygen comment to deal with these files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ed9aa9… Author: Libor Chocholaty <libor(a)iptel.org> Date: Tue Jul 3 15:13:29 2007 +0000 updated update_params() to work with 3 sets of params URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cfdcbf… Author: Libor Chocholaty <libor(a)iptel.org> Date: Tue Jul 3 15:06:17 2007 +0000 added common prefix 'mysql:' into INFOs URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=904c3cf… Author: Libor Chocholaty <libor(a)iptel.org> Date: Tue Jul 3 14:53:22 2007 +0000 more descriptive comments URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5650c8c… Author: Libor Chocholaty <libor(a)iptel.org> Date: Mon Jul 2 11:04:05 2007 +0000 removed forgotten abort() from error handler. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b263021… Author: Libor Chocholaty <libor(a)iptel.org> Date: Mon Jun 25 17:53:12 2007 +0000 added doxygen comment URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1528972… Author: Libor Chocholaty <libor(a)iptel.org> Date: Mon Jun 25 17:51:27 2007 +0000 Preparation for implementation of UPDATE db statement. First of all we need two sets of params in db_cmd. First for match clause and the second as column-value pairs of changed columns. Currently it uses three sets of parameters: result, match and vals. - result - DB_GET output - match - DB_GET, DB_DEL (and DB_UPD in the future) - vals - DB_PUT (and DB_UPD) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1bc0f4e… Author: Jan Janak <jan(a)iptel.org> Date: Mon Jun 25 15:39:09 2007 +0000 Added the following features from Andrei: - connect_timeout parameter which allows to limit connection timeouts to mysql server - send_timeout parameter which can limit the time the client library spends sending data to the server - receive_timeout parameter which can limit the time the library spends waiting for the data from the server - enable reconnect for mysql >= 5.0.13 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=145a90d… Author: Jan Janak <jan(a)iptel.org> Date: Wed Apr 18 13:08:45 2007 +0000 - db_fld.v.str renamed to db_fld.v.lstr due to problems with g++ URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2cd3e83… Author: Jan Janak <jan(a)iptel.org> Date: Thu Apr 5 13:26:10 2007 +0000 - Support for raw sql queries URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e55ca85… Author: Jan Janak <jan(a)iptel.org> Date: Thu Apr 5 11:14:59 2007 +0000 - wrong comment fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=229049b… Author: Jan Janak <jan(a)iptel.org> Date: Wed Apr 4 13:59:17 2007 +0000 - extra debugging messages removed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25bdcd1… Author: Jan Janak <jan(a)iptel.org> Date: Wed Apr 4 12:33:06 2007 +0000 - fixed a couple of gcc warnings URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4198a3a… Author: Jan Janak <jan(a)iptel.org> Date: Wed Apr 4 11:48:20 2007 +0000 - mysql module updated to new db api URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f2d8d2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 23 21:03:38 2007 +0000 - relax db_init BUG check (allow db init from fixup functions) (SER-227 related) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01e5c3a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 22 15:56:48 2007 +0000 - fix the yesterday's fix: allow db_init from main if it's done from mod_init (but don't allow it and log a BUG if it happens from child_init(PROC_MAIN)). (SER-227 related) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03f6396… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 22 00:24:16 2007 +0000 - fix: db connections should not be opened from child_init(PROC_MAIN), or they will be inherited by all the tcp processes (bad). Bug reported by Jan Andres <jan.andres(a)freenet-ag.de>. closes SER-227 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cba9c4b… Author: Miklos Tirpak <miklos(a)iptel.org> Date: Tue May 30 12:00:57 2006 +0000 bug currected: missing space in query between 'where' and 'order by' keywords URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c2f1d07… Author: Jan Janak <jan(a)iptel.org> Date: Mon Jan 30 16:49:51 2006 +0000 - enable reconnection explicitly Closes: SER-80 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77d5367… Author: Jan Janak <jan(a)iptel.org> Date: Tue Jan 10 22:16:07 2006 +0000 - DB_FLOAT support - fixed error in params_add in postgres module URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c89a6b9… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Sun Jan 8 22:43:14 2006 +0000 - export param types adjusted to PARAM_STR/STRING & PARAM_INT - removed corresponding obsolete strlen(str_param) in init URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd60366… Author: Jan Janak <jan(a)iptel.org> Date: Thu Jan 5 10:52:01 2006 +0000 - support for null values in where statements URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e42549d… Author: Jan Janak <jan(a)iptel.org> Date: Thu Dec 15 23:19:06 2005 +0000 - _timegm removed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aff750c… Author: Jan Janak <jan(a)iptel.org> Date: Tue Dec 13 00:19:29 2005 +0000 - module interface exended with list of management functions URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8508f5a… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Thu Nov 17 03:49:37 2005 +0000 Provide two useful macros for str initialization: STR_STATIC_INIT() and STR_NULL. Adjust all modules to use those macros where appropriate. Verified by: md5(1) (those modules, which actually compile) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b198137… Author: Jan Janak <jan(a)iptel.org> Date: Tue Nov 15 15:29:58 2005 +0000 - Store all date/time values in UTC in database - replacement for timegm (GNU extension) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b59ace5… Author: Jan Janak <jan(a)iptel.org> Date: Thu Oct 13 09:23:07 2005 +0000 - make debug message scheme independent URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f22f076… Author: Andreas Granig <agranig(a)linguin.org> Date: Wed Oct 12 02:57:00 2005 +0000 Mysql result wasn't free'd if converting result had failed. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b8946f… Author: Andreas Granig <agranig(a)linguin.org> Date: Tue Sep 20 13:28:34 2005 +0000 Moved mysql result from the connection to db_res_t to allow nested queries. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60bf49c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 1 22:25:05 2005 +0000 - makefiles cleanups (use $(LOCALBASE) everywhere) -- fixes some include path problems on netbsd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c32e609… Author: Jan Janak <jan(a)iptel.org> Date: Wed May 18 16:30:35 2005 +0000 - fixed misleading debug message URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce4c4dd… Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 28 18:52:51 2005 +0000 - Implemented DB_REPLACE capability URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=581857b… Author: Jan Janak <jan(a)iptel.org> Date: Fri Feb 25 16:31:45 2005 +0000 - All str pointers initialized to an emptry string, this is to prevent crashes when module writers do not check the NULL flag of a value properly. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2550113… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 24 19:37:11 2005 +0000 - previous commit was an older version of the function URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c77453e… Author: Jan Janak <jan(a)iptel.org> Date: Thu Feb 24 17:44:54 2005 +0000 - atoi replaced with strtoul to convert also numbers > INT_MAX. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=942dd87… Author: Jan Janak <jan(a)iptel.org> Date: Mon Feb 7 15:21:08 2005 +0000 - parse_mysql_url not necessary anymore URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48d2c4c… Author: Jan Janak <jan(a)iptel.org> Date: Wed Feb 2 19:10:06 2005 +0000 - dead files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=344f101… Author: Jan Janak <jan(a)iptel.org> Date: Wed Feb 2 19:09:22 2005 +0000 - using improved connection pool URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c802ee8… Author: Jan Janak <jan(a)iptel.org> Date: Tue Feb 1 15:13:04 2005 +0000 - some useful debugging information URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=106f827… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Fri Jan 21 23:20:59 2005 +0000 -revert some dbg messages URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=730bddb… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Fri Jan 21 23:17:07 2005 +0000 -bug fixed in processing DB url without password URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3c7f85… Author: Jan Janak <jan(a)iptel.org> Date: Mon Dec 6 08:51:44 2004 +0000 - fixed typo -- dumplicated snprintf -- reported by Sun Zongjun URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61bd3ce… Author: Jan Janak <jan(a)iptel.org> Date: Sat Dec 4 23:40:28 2004 +0000 - Proper checking of the return value of snprintf Closes: SER-18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c922acc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 2 21:16:02 2004 +0000 - more warnings & signed/unsigned issues fixes (gcc 3.2/solaris) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=738c6a4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 2 15:55:25 2004 +0000 - removed -p port && extended -l to support the same syntax as listen= : -l [proto:]addr[:port] where proto=udp|tcp (default all), and addr=ip_addr|host|interface_name. E.g.: -l localhost, -l tcp:127.0.0.1 -l udp:[::1]:5062, -l eth0, -l tcp:xl1:5090 - mysql: fixed minor warning URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a1080c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 1 16:51:17 2004 +0000 core: - no fork unused sockets fix & cleanups mysql: - strptime XOPEN define URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cacef05… Author: Jan Janak <jan(a)iptel.org> Date: Wed Nov 3 13:16:45 2004 +0000 - All attributes of db_val_t set to 0 when the null attribute is set. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d7c807b… Author: Dan Pascu <dan(a)ag-projects.com> Date: Thu Oct 28 23:36:14 2004 +0000 - added ability to auto reconnect to mysql if a query attempt returns a 'server lost' error. - added auto_reconnect parameter to the mysql module, to allow switching it on/off (acts like a boolean value: 0 disabled, anything else enabled) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9b0c38… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 22 17:17:55 2004 +0000 - minor x86_64 fixes URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=955c461… Author: Jan Janak <jan(a)iptel.org> Date: Wed Sep 15 12:38:26 2004 +0000 - wrong parameter definition fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8193e4a… Author: Jan Janak <jan(a)iptel.org> Date: Thu Sep 9 14:45:48 2004 +0000 mysql_ping returns an error when connection is lost URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d54e993… Author: Jan Janak <jan(a)iptel.org> Date: Tue Aug 24 08:58:23 2004 +0000 - Spelling checked - READMEs updated URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c28c32a… Author: Jan Janak <jan(a)iptel.org> Date: Wed Aug 4 14:38:13 2004 +0000 Fixed a missing function URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6586f69… Author: Jan Janak <jan(a)iptel.org> Date: Wed Aug 4 14:25:06 2004 +0000 free_query changed to more descriptive free_result URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76c72cf… Author: Jan Janak <jan(a)iptel.org> Date: Tue Aug 3 17:43:41 2004 +0000 ping_interval == 0 disables this feature URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a041800… Author: Jan Janak <jan(a)iptel.org> Date: Tue Aug 3 17:22:06 2004 +0000 ping_interval parameter implemented, the module calls mysql_ping if the connection has been inactive for >= ping_interval. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d38a319… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 5 18:27:37 2004 +0000 mysql_real_escape_string called on string parameters URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86fa65f… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Feb 11 16:01:49 2004 +0000 - unwanted DBG message removed (added by me by mistake) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49131c4… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Fri Feb 6 18:56:49 2004 +0000 - basics for users preferences: - script param. "avp_db_url" added - scrit function "load_avp" with 2 or 3 params added - do_action updated - init. of bd connection from core on startup per each proccess - reseting avp list after main route and reply/failure_route execution URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0132ecd… Author: Jan Janak <jan(a)iptel.org> Date: Mon Jan 26 13:10:35 2004 +0000 Shallow copy of db_con->table instead of deep. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf63aa8… Author: Jan Janak <jan(a)iptel.org> Date: Mon Jan 26 12:46:15 2004 +0000 MySQL connection pool. Connections with the same URL are shared among modules within the same process. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95f5493… Author: Jan Janak <jan(a)iptel.org> Date: Mon Nov 17 22:49:50 2003 +0000 - small cleanup URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa1c003… Author: Jan Janak <jan(a)iptel.org> Date: Mon Nov 17 22:19:07 2003 +0000 - mysql parser state diagram URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3a64d8… Author: Jan Janak <jan(a)iptel.org> Date: Mon Nov 17 21:41:56 2003 +0000 - Better mysql URL parser URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd18ec1… Author: Jan Janak <jan(a)iptel.org> Date: Mon Nov 3 13:03:56 2003 +0000 - sql:// changed to mysql:// in all modules URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=555a346… Author: Daniel-Constantin Mierla <daniel(a)voice-system.ro> Date: Wed Oct 29 12:33:21 2003 +0000 - db_raw_query() does not return error when the result parameter is NULL -- usefull for INSERT/UPDATE when there is no result URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a40d3f… Author: Jan Janak <jan(a)iptel.org> Date: Fri Oct 24 20:36:03 2003 +0000 - removed obsolete files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37f120c… Author: Jan Janak <jan(a)iptel.org> Date: Fri Oct 24 20:35:35 2003 +0000 - More sane sources, additional include paths in Makefile URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cdf331… Author: Jan Janak <jan(a)iptel.org> Date: Wed Oct 8 13:07:21 2003 +0000 - Got rid of all the ~ at the beginning of functions that are not supposed to be called from scripts. It's a relict. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=473c6c0… Author: Jan Janak <jan(a)iptel.org> Date: Tue Sep 16 18:55:07 2003 +0000 - another mysql library directory added URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5e5955… Author: Jan Janak <jan(a)iptel.org> Date: Mon Sep 15 22:34:49 2003 +0000 - handling of DB_BITMAP added URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=929ce3c… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Jul 2 20:44:13 2003 +0000 one debug mesage commented out (it was screwing up the terminal when printing BLOBs) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e13713… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Mon May 26 13:05:57 2003 +0000 - in str2val() the 'nul' field is explcitly set to 0 if the value is not null (db_val.c line 154) - in get_columns() a switch brach for detecting BLOB type was added (db_res.c lines 94-99) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=087a1a6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri May 23 15:43:42 2003 +0000 - updated all makefiles (now 'cd modules/foo; make' will link with the proper libraries). Please add an "include ../../Makefile.defs" as first line of the local module Makefile if your module is not on the cvs) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=593f752… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Sun Apr 27 18:17:23 2003 +0000 module version checking introduced URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b4db74… Author: Jan Janak <jan(a)iptel.org> Date: Fri Apr 25 18:19:05 2003 +0000 -lz put back. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb0138d… Author: Nils Ohlmeier <nils(a)iptel.org> Date: Wed Apr 16 00:12:19 2003 +0000 Removed unnecessary zlib from linking libs. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4689590… Author: Jan Janak <jan(a)iptel.org> Date: Mon Apr 14 18:37:43 2003 +0000 - fixed the daylight saving problem. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3865b33… Author: Nils Ohlmeier <nils(a)iptel.org> Date: Fri Apr 11 18:24:55 2003 +0000 Inserted own timegm for non GNU systems. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d8e504… Author: Jan Janak <jan(a)iptel.org> Date: Sun Apr 6 20:25:51 2003 +0000 - child init called in all ser processes (main, timer, fifo, tcp_main, udp_children, tcp_children, tcp_main) - defined macros PROC_MAIN, PROC_TIMER, PROC_FIFO, PROC_TCP_MAIN - they substitute rank for special processes - listening children have rank 1 and higher - modified modules to use rank 1 instead of 0 (modules creating it's own children) - db connections are either not opened in mod_init or are closed immediately when needed (for example preloading data for all children from database) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8d0b22… Author: Nils Ohlmeier <nils(a)iptel.org> Date: Fri Apr 4 15:09:52 2003 +0000 Fixed timezone problem, where the localtime was added to the expires value of all contacts in the database. (Reported by Jiri) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc77617… Author: Jan Janak <jan(a)iptel.org> Date: Sun Mar 16 20:27:23 2003 +0000 flags parameter added to cmd_export_t URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca95bc2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 12 12:54:00 2003 +0000 - sun cc compilation fixes - various typos fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e09df6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 11 13:17:53 2003 +0000 - new module interface URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=452ba32… Author: Jan Janak <jan(a)iptel.org> Date: Mon Mar 3 20:45:45 2003 +0000 parameter checking in use_table fixed. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1902496… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 24 16:46:11 2003 +0000 - applied Maxim Sobolev <sobomax(a)FreeBSD.org> makefile patches (slightly adapted for the cvs version) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=316e41e… Author: Jan Janak <jan(a)iptel.org> Date: Tue Dec 3 12:37:11 2002 +0000 _XOPEN_SOURCE URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7d533a… Author: Jan Janak <jan(a)iptel.org> Date: Mon Dec 2 09:16:58 2002 +0000 Minor beautifications. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f361efc… Author: Jan Janak <jan(a)iptel.org> Date: Thu Nov 28 20:05:08 2002 +0000 Proper result handling for queries returning no result. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f46d75… Author: Jan Janak <jan(a)iptel.org> Date: Thu Nov 28 17:05:16 2002 +0000 An additional parameter to db_query, db_update, db_delete. New function - db_raw_query URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26b3ee5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 25 20:29:44 2002 +0000 - netbsd fixes - 64 bit mini-cleanup URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c2a2e9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Nov 12 12:32:17 2002 +0000 - added the proper libmysqlclient dir for FreeBSD URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ebf876a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 11 21:34:53 2002 +0000 - openbsd (3.2) support [ changes in fastlock.h, ser_module.c, tm/t_hooks.c, Makefiles ] - texops replace/search_append bugs fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ba8683… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 4 17:05:32 2002 +0000 - converted to autoconf compatible format (replaced some os specific ifdefs with HAVE_xxx a.s.o) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7208530… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Nov 2 01:35:08 2002 +0000 - fixed cfg.y for icc (hack) - many other small fixes URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcecf0b… Author: Daniel-Constantin Mierla <daniel(a)voice-system.ro> Date: Wed Oct 16 13:50:28 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0854a9f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 7 16:14:10 2002 +0000 - fixed some bad entries in debian/changelog & rpm spec - added -I & -L in mysql Makefile URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29c1e9a… Author: Jan Janak <jan(a)iptel.org> Date: Thu Sep 19 14:52:11 2002 +0000 Cosmetic change URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e280d3a… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Thu Sep 19 12:23:52 2002 +0000 GPLization banner introduced to *.[hc] files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc46395… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Thu Sep 19 11:51:26 2002 +0000 CVS substitutes introduced URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30b8dfb… Author: Jan Janak <jan(a)iptel.org> Date: Tue Sep 3 13:38:17 2002 +0000 bugs #342 & #343 fixed. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=06a690e… Author: Jan Janak <jan(a)iptel.org> Date: Fri Aug 30 10:16:58 2002 +0000 pkg_malloc result testing fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=deaea49… Author: Jan Janak <jan(a)iptel.org> Date: Wed Aug 21 20:18:11 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56877cd… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Wed Aug 14 16:24:37 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd7ea16… Author: Jan Janak <jan(a)iptel.org> Date: Mon Aug 12 14:36:23 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a2212d… Author: Jan Janak <jan(a)iptel.org> Date: Mon Aug 12 11:34:04 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1d7b80… Author: Jan Janak <jan(a)iptel.org> Date: Mon Aug 12 11:33:17 2002 +0000 db_con internals changed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e34dfe9… Author: Jan Janak <jan(a)iptel.org> Date: Fri Aug 9 15:02:48 2002 +0000 Bug fixed. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc11734… Author: Jan Janak <jan(a)iptel.org> Date: Thu Aug 8 17:26:34 2002 +0000 return values changed, blob support added URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce699f8… Author: Jan Janak <jan(a)iptel.org> Date: Tue Aug 6 11:11:45 2002 +0000 str structure is supported now. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce7679f… Author: Jan Janak <jan(a)iptel.org> Date: Wed Jul 24 14:50:49 2002 +0000 Moved to sip_router/db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5d23c4… Author: Jan Janak <jan(a)iptel.org> Date: Wed Jul 24 14:45:10 2002 +0000 Header files split URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4017cbc… Author: Jan Janak <jan(a)iptel.org> Date: Tue Jul 9 09:08:25 2002 +0000 database module interface moved. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7bc9dd9… Author: Jan Janak <jan(a)iptel.org> Date: Fri May 10 01:00:09 2002 +0000 LOG typos fixed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73b7a1b… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Thu May 9 18:51:50 2002 +0000 added -L URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=817335e… Author: Jan Janak <jan(a)iptel.org> Date: Wed Apr 3 21:54:15 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6b41fd… Author: Jan Janak <jan(a)iptel.org> Date: Tue Mar 5 22:55:31 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bf9d6f… Author: Jan Janak <jan(a)iptel.org> Date: Tue Mar 5 14:36:03 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9799880… Author: Jan Janak <jan(a)iptel.org> Date: Fri Mar 1 10:50:28 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fa0cfe… Author: Jan Janak <jan(a)iptel.org> Date: Sun Feb 24 17:11:42 2002 +0000 Order parameter added to db_query function URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e129165… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Fri Jan 11 19:58:58 2002 +0000 ref_count turned into ref_bitmap; oncancel module handler added URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78aa203… Author: Jiri Kuthan <jiri(a)iptel.org> Date: Mon Jan 7 04:39:49 2002 +0000 performance and bug fixes URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cad239c… Author: Jan Janak <jan(a)iptel.org> Date: Thu Jan 3 22:09:27 2002 +0000 Database documentation added. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4553b3… Author: Jan Janak <jan(a)iptel.org> Date: Thu Jan 3 15:19:40 2002 +0000 *** empty log message *** URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c811180… Author: Jan Janak <jan(a)iptel.org> Date: Tue Dec 18 00:28:45 2001 +0000 Standalone database module

1 0

git:janakj/ldap: support for automatic reconnects added
by Jan Janak 12 Feb '09

12 Feb '09

Module: sip-router Branch: janakj/ldap Commit: 859a44b1377f9486e155af467507d574361a180c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=859a44b… Author: Gergely Kovacs <gergo(a)iptel.org> Committer: Gergely Kovacs <gergo(a)iptel.org> Date: Thu Aug 7 09:57:04 2008 +0000 support for automatic reconnects added --- modules/db_ldap/ld_cfg.c | 6 ++++-- modules/db_ldap/ld_cmd.c | 38 ++++++++++++++++++++++++++++---------- modules/db_ldap/ld_mod.c | 24 +++++++++++++----------- modules/db_ldap/ld_mod.h | 12 +++++++----- 4 files changed, 52 insertions(+), 28 deletions(-) diff --git a/modules/db_ldap/ld_cfg.c b/modules/db_ldap/ld_cfg.c index 996ce95..7ce1752 100644 --- a/modules/db_ldap/ld_cfg.c +++ b/modules/db_ldap/ld_cfg.c @@ -446,7 +446,7 @@ struct ld_con_info* ld_find_conn_info(str* conn_id) } -int ld_cfg_validity_check(struct ld_cfg *cfg) +static int ld_cfg_validity_check(struct ld_cfg *cfg) { struct ld_cfg *pcfg; @@ -488,8 +488,10 @@ int ld_load_cfg(str* filename) } cfg_parser_close(parser); - if (ld_cfg_validity_check(cfg)) + if (ld_cfg_validity_check(cfg)) { + ld_cfg_free(); return -1; + } return 0; } diff --git a/modules/db_ldap/ld_cmd.c b/modules/db_ldap/ld_cmd.c index e628796..163dd54 100644 --- a/modules/db_ldap/ld_cmd.c +++ b/modules/db_ldap/ld_cmd.c @@ -162,6 +162,7 @@ int ld_cmd_exec(db_res_t* res, db_cmd_t* cmd) char* filter, *err_desc; int ret, err; LDAPMessage* msg; + int reconn_cnt = glb_reconn_cnt; filter = NULL; err_desc = NULL; @@ -179,16 +180,33 @@ int ld_cmd_exec(db_res_t* res, db_cmd_t* cmd) goto error; } - ret = ldap_search_ext_s(lcon->con, lcmd->base, lcmd->scope, filter, - lcmd->result, 0, NULL, NULL, - lcmd->timelimit.tv_sec ? &lcmd->timelimit : NULL, - lcmd->sizelimit, - &msg); - - if (ret != LDAP_SUCCESS) { - ERR("ldap: Error in ldap_search: %s\n", ldap_err2string(ret)); - goto error; - } + do { + if (lcon->flags & LD_CONNECTED) { + ret = ldap_search_ext_s(lcon->con, lcmd->base, lcmd->scope, filter, + lcmd->result, 0, NULL, NULL, + lcmd->timelimit.tv_sec ? &lcmd->timelimit : NULL, + lcmd->sizelimit, + &msg); + } else { + ret = LDAP_SERVER_DOWN; + } + if (ret != LDAP_SUCCESS) { + ERR("ldap: Error in ldap_search: %s\n", ldap_err2string(ret)); + if (ret == LDAP_SERVER_DOWN) { + lcon->flags &= ~LD_CONNECTED; + do { + if (!reconn_cnt) { + ERR("ldap: maximum reconnection attempt reached! giving up\n"); + goto error; + } + reconn_cnt--; + err = ld_con_connect(con); + } while (err != 0); + } else { + goto error; + } + } + } while (ret != LDAP_SUCCESS); ret = ldap_parse_result(lcon->con, msg, &err, NULL, &err_desc, NULL, NULL, 0); if (ret != LDAP_SUCCESS) { diff --git a/modules/db_ldap/ld_mod.c b/modules/db_ldap/ld_mod.c index a409964..8a21095 100644 --- a/modules/db_ldap/ld_mod.c +++ b/modules/db_ldap/ld_mod.c @@ -1,5 +1,5 @@ -/* - * $Id$ +/* + * $Id$ * * LDAP Database Driver for SER * @@ -18,15 +18,15 @@ * details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., + * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** \addtogroup ldap - * @{ + * @{ */ -/** \file +/** \file * LDAP module interface. */ @@ -49,6 +49,7 @@ #include <ldap.h> str ld_cfg_file = STR_STATIC_INIT("ldap.cfg"); +int glb_reconn_cnt = 3; static int ld_mod_init(void); static void ld_mod_destroy(void); @@ -82,7 +83,8 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"config", PARAM_STR, &ld_cfg_file}, + {"config", PARAM_STR, &ld_cfg_file}, + {"reconnect_attempt", PARAM_INT, &glb_reconn_cnt}, {0, 0, 0} }; @@ -467,25 +469,25 @@ int ldap_test(void) case DB_BITMAP: ERR("%s: %d\n", rec->fld[i].name, rec->fld[i].v.int4); break; - + case DB_DATETIME: times = ctime(&rec->fld[i].v.time); ERR("%s: %d:%.*s\n", rec->fld[i].name, rec->fld[i].v.time, strlen(times) - 1, times); break; - + case DB_DOUBLE: ERR("%s: %f\n", rec->fld[i].name, rec->fld[i].v.dbl); break; - + case DB_FLOAT: ERR("%s: %f\n", rec->fld[i].name, rec->fld[i].v.flt); break; - + case DB_STR: case DB_BLOB: ERR("%s: %.*s\n", rec->fld[i].name, rec->fld[i].v.lstr.len, rec->fld[i].v.lstr.s); break; - + case DB_CSTR: ERR("%s: %s\n", rec->fld[i].name, rec->fld[i].v.cstr); break; diff --git a/modules/db_ldap/ld_mod.h b/modules/db_ldap/ld_mod.h index 859fabd..c0d656c 100644 --- a/modules/db_ldap/ld_mod.h +++ b/modules/db_ldap/ld_mod.h @@ -1,5 +1,5 @@ -/* - * $Id$ +/* + * $Id$ * * LDAP Database Driver for SER * @@ -18,7 +18,7 @@ * details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., + * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -26,11 +26,13 @@ #define _LD_MOD_H /** @defgroup ldap LDAP Database Driver - * @ingroup DB_API + * @ingroup DB_API */ /** @{ */ -/** \file +extern int glb_reconn_cnt; + +/** \file * LDAP module interface. */

1 0

git:janakj/ldap: Changes necessary to make the module compile in sip-router .
by Jan Janak 12 Feb '09

12 Feb '09

Module: sip-router Branch: janakj/ldap Commit: 3de896c99dfa637f3f169fb20d5d1d399e3335a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3de896c… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Feb 13 00:55:49 2009 +0100 Changes necessary to make the module compile in sip-router. This is a set of changes necessary to make the LDAP module compile in the sip-router tree. This includes: * Extra stuff in the Makefile to link with libsrdb2 * Defined SER_MOD_INTERFACE in the makefile * Updated relative paths to srdb2 header files --- modules/db_ldap/Makefile | 5 ++++- modules/db_ldap/ld_cmd.h | 6 +++--- modules/db_ldap/ld_con.h | 6 +++--- modules/db_ldap/ld_fld.c | 2 +- modules/db_ldap/ld_fld.h | 4 ++-- modules/db_ldap/ld_mod.c | 2 +- modules/db_ldap/ld_res.c | 2 +- modules/db_ldap/ld_res.h | 4 ++-- modules/db_ldap/ld_uri.h | 4 ++-- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/modules/db_ldap/Makefile b/modules/db_ldap/Makefile index e9309e2..dafe3c2 100644 --- a/modules/db_ldap/Makefile +++ b/modules/db_ldap/Makefile @@ -8,7 +8,7 @@ NAME=ldap.so #DEFS += -DLD_TEST -DEFS += -Wall -DOPENLDAP23 +DEFS += -Wall -DOPENLDAP23 -DSER_MOD_INTERFACE # Uncomment this if you have a recent version of libldap with # LD_SCOPE_CHILDREN defined @@ -16,4 +16,7 @@ DEFS += -Wall -DOPENLDAP23 LIBS=-L$(LOCALBASE)/lib -L /usr/lib -lldap +SERLIBPATH=../../lib +SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 + include ../../Makefile.modules diff --git a/modules/db_ldap/ld_cmd.h b/modules/db_ldap/ld_cmd.h index 861da67..d820bc9 100644 --- a/modules/db_ldap/ld_cmd.h +++ b/modules/db_ldap/ld_cmd.h @@ -34,9 +34,9 @@ * stored in db_cmd structures and related functions. */ -#include "../../db/db_drv.h" -#include "../../db/db_cmd.h" -#include "../../db/db_res.h" +#include "../../lib/srdb2/db_drv.h" +#include "../../lib/srdb2/db_cmd.h" +#include "../../lib/srdb2/db_res.h" #include "../../str.h" #include <stdarg.h> diff --git a/modules/db_ldap/ld_con.h b/modules/db_ldap/ld_con.h index 2fdb2d7..b4ca92b 100644 --- a/modules/db_ldap/ld_con.h +++ b/modules/db_ldap/ld_con.h @@ -33,9 +33,9 @@ * Implementation of LDAP per-connection related data structures and functions. */ -#include "../../db/db_pool.h" -#include "../../db/db_con.h" -#include "../../db/db_uri.h" +#include "../../lib/srdb2/db_pool.h" +#include "../../lib/srdb2/db_con.h" +#include "../../lib/srdb2/db_uri.h" #include <time.h> #include <ldap.h> diff --git a/modules/db_ldap/ld_fld.c b/modules/db_ldap/ld_fld.c index 3e599ed..a62da62 100644 --- a/modules/db_ldap/ld_fld.c +++ b/modules/db_ldap/ld_fld.c @@ -40,7 +40,7 @@ #include "ld_fld.h" -#include "../../db/db_drv.h" +#include "../../lib/srdb2/db_drv.h" #include "../../mem/mem.h" #include "../../dprint.h" #include "../../ut.h" diff --git a/modules/db_ldap/ld_fld.h b/modules/db_ldap/ld_fld.h index ebad50f..da295c0 100644 --- a/modules/db_ldap/ld_fld.h +++ b/modules/db_ldap/ld_fld.h @@ -38,8 +38,8 @@ struct ld_cfg; -#include "../../db/db_gen.h" -#include "../../db/db_fld.h" +#include "../../lib/srdb2/db_gen.h" +#include "../../lib/srdb2/db_fld.h" #include <ldap.h> diff --git a/modules/db_ldap/ld_mod.c b/modules/db_ldap/ld_mod.c index 8a21095..0e8ce06 100644 --- a/modules/db_ldap/ld_mod.c +++ b/modules/db_ldap/ld_mod.c @@ -41,7 +41,7 @@ #include "../../sr_module.h" #ifdef LD_TEST -#include "../../db/db_cmd.h" +#include "../../lib/srdb2/db_cmd.h" #include <limits.h> #include <float.h> #endif diff --git a/modules/db_ldap/ld_res.c b/modules/db_ldap/ld_res.c index ba7049e..0f1401d 100644 --- a/modules/db_ldap/ld_res.c +++ b/modules/db_ldap/ld_res.c @@ -37,7 +37,7 @@ #include "../../mem/mem.h" #include "../../dprint.h" -#include "../../db/db_gen.h" +#include "../../lib/srdb2/db_gen.h" static void ld_res_free(db_res_t* res, struct ld_res* payload) diff --git a/modules/db_ldap/ld_res.h b/modules/db_ldap/ld_res.h index 051b009..3c48ace 100644 --- a/modules/db_ldap/ld_res.h +++ b/modules/db_ldap/ld_res.h @@ -34,8 +34,8 @@ * servers. */ -#include "../../db/db_drv.h" -#include "../../db/db_res.h" +#include "../../lib/srdb2/db_drv.h" +#include "../../lib/srdb2/db_res.h" #include <ldap.h> diff --git a/modules/db_ldap/ld_uri.h b/modules/db_ldap/ld_uri.h index 43155f3..5afca46 100644 --- a/modules/db_ldap/ld_uri.h +++ b/modules/db_ldap/ld_uri.h @@ -33,8 +33,8 @@ * The functions parsing and interpreting ldap: URIs. */ -#include "../../db/db_uri.h" -#include "../../db/db_drv.h" +#include "../../lib/srdb2/db_uri.h" +#include "../../lib/srdb2/db_drv.h" #include <ldap.h>

1 0

git:janakj/ldap: Merge commit 'ldap/master' into ldap
by Jan Janak 12 Feb '09

12 Feb '09

Module: sip-router Branch: janakj/ldap Commit: 724f43784b529696015dea334ede11c807004db7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=724f437… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Feb 13 00:45:15 2009 +0100 Merge commit 'ldap/master' into ldap * commit 'ldap/master': (38 commits) support for automatic reconnects added Support for time-limited and size-limited search operations added Support for multi-value attributes added - use cfg_parse_bool_opt tls encryption support added - added an alias for generalized time syntax - ticket numbers added - new items added to the todo list - a set of minimalistic config files for testing purposes authtype connection section attribute example added ldap digest-md5 authentication support added - todo updated - updated with comments received from Victor Pascual - removed trailing line the processing of connection table of ldap configuration added credentials table name fixed, example for connection table added - updated with the last changes in the cfg parser - Use the new configuration file parser - simple authentication is done simple user authentication mechanism added ... ---

1 0

git:janakj/ldap: Support for time-limited and size-limited search operations added
by Jan Janak 12 Feb '09

12 Feb '09

Module: sip-router Branch: janakj/ldap Commit: 6651dcc8ac76e515a49293c9fd0905f7e2e6b3c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6651dcc… Author: Gergely Kovacs <gergo(a)iptel.org> Committer: Gergely Kovacs <gergo(a)iptel.org> Date: Wed Aug 6 08:33:20 2008 +0000 Support for time-limited and size-limited search operations added --- modules/db_ldap/ld_cfg.c | 27 +++++++++++++++++++++++++++ modules/db_ldap/ld_cfg.h | 6 ++++++ modules/db_ldap/ld_cmd.c | 11 ++++++++++- modules/db_ldap/ld_cmd.h | 11 +++++++---- modules/db_ldap/ldap.cfg | 6 ++++++ 5 files changed, 56 insertions(+), 5 deletions(-) diff --git a/modules/db_ldap/ld_cfg.c b/modules/db_ldap/ld_cfg.c index ea3d564..996ce95 100644 --- a/modules/db_ldap/ld_cfg.c +++ b/modules/db_ldap/ld_cfg.c @@ -254,6 +254,8 @@ static cfg_option_t ldap_tab_options[] = { {"field_map", .f = parse_field_map}, {"filter", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, {"base", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, + {"timelimit", .f = cfg_parse_int_opt}, + {"sizelimit", .f = cfg_parse_int_opt}, {0} }; @@ -328,6 +330,8 @@ static int parse_section(void* param, cfg_parser_t* st, unsigned int flags) for(i = 0; scope_values[i].name; i++) { scope_values[i].param = &cfg->scope; } + ldap_tab_options[4].param = &cfg->timelimit; + ldap_tab_options[5].param = &cfg->sizelimit; } else if (type == LDAP_CON_SECTION) { if ((cinfo = pkg_malloc(sizeof(*cinfo))) == NULL) { ERR("ldap:%s:%d: Out of memory\n", st->file, st->line); @@ -442,6 +446,25 @@ struct ld_con_info* ld_find_conn_info(str* conn_id) } +int ld_cfg_validity_check(struct ld_cfg *cfg) +{ + struct ld_cfg *pcfg; + + for (pcfg = cfg; pcfg; pcfg = pcfg->next) { + if (pcfg->sizelimit < 0 || pcfg->sizelimit > LD_MAXINT) { + ERR("ldap: invalid sizelimit (%d) specified\n", pcfg->sizelimit); + return -1; + } + if (pcfg->timelimit < 0 || pcfg->timelimit > LD_MAXINT) { + ERR("ldap: invalid timelimit (%d) specified\n", pcfg->timelimit); + return -1; + } + } + + return 0; +} + + int ld_load_cfg(str* filename) { cfg_parser_t* parser; @@ -464,5 +487,9 @@ int ld_load_cfg(str* filename) return -1; } cfg_parser_close(parser); + + if (ld_cfg_validity_check(cfg)) + return -1; + return 0; } diff --git a/modules/db_ldap/ld_cfg.h b/modules/db_ldap/ld_cfg.h index 43abca0..0acbf68 100644 --- a/modules/db_ldap/ld_cfg.h +++ b/modules/db_ldap/ld_cfg.h @@ -28,6 +28,10 @@ #include "ld_fld.h" #include "../../str.h" +#include <sys/time.h> + +/* RFC 2251: maxInt INTEGER ::= 2147483647 -- (2^^31 - 1) -- */ +#define LD_MAXINT (2147483647) struct ld_cfg { @@ -39,6 +43,8 @@ struct ld_cfg { str* attr; /**< An array of LDAP attribute names, zero terminated */ enum ld_syntax* syntax; /**< An array of configured LDAP syntaxes */ int n; /**< Number of fields in the arrays */ + int sizelimit; /**< retrieve at most sizelimit entries for a search */ + int timelimit; /**< wait at most timelimit seconds for a search to complete */ struct ld_cfg* next; /**< The next table in the list */ }; diff --git a/modules/db_ldap/ld_cmd.c b/modules/db_ldap/ld_cmd.c index 646313c..e628796 100644 --- a/modules/db_ldap/ld_cmd.c +++ b/modules/db_ldap/ld_cmd.c @@ -125,6 +125,12 @@ int ld_cmd(db_cmd_t* cmd) lcmd->base = cfg->base.s; lcmd->scope = cfg->scope; + lcmd->sizelimit = cfg->sizelimit; + if (cfg->timelimit) { + lcmd->timelimit.tv_sec = cfg->timelimit; + lcmd->timelimit.tv_usec = 0; + } + if (cfg->filter.s) { lcmd->filter = cfg->filter; } @@ -174,7 +180,10 @@ int ld_cmd_exec(db_res_t* res, db_cmd_t* cmd) } ret = ldap_search_ext_s(lcon->con, lcmd->base, lcmd->scope, filter, - lcmd->result, 0, NULL, NULL, NULL, 0, &msg); + lcmd->result, 0, NULL, NULL, + lcmd->timelimit.tv_sec ? &lcmd->timelimit : NULL, + lcmd->sizelimit, + &msg); if (ret != LDAP_SUCCESS) { ERR("ldap: Error in ldap_search: %s\n", ldap_err2string(ret)); diff --git a/modules/db_ldap/ld_cmd.h b/modules/db_ldap/ld_cmd.h index 826f4c6..861da67 100644 --- a/modules/db_ldap/ld_cmd.h +++ b/modules/db_ldap/ld_cmd.h @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id$ * * LDAP Database Driver for SER * @@ -18,7 +18,7 @@ * details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., + * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -26,10 +26,10 @@ #define _LD_CMD_H /** \addtogroup ldap - * @{ + * @{ */ -/** \file +/** \file * Declaration of ld_cmd data structure that contains LDAP specific data * stored in db_cmd structures and related functions. */ @@ -40,6 +40,7 @@ #include "../../str.h" #include <stdarg.h> +#include <sys/time.h> /** Extension structure of db_cmd adding LDAP specific data. @@ -52,6 +53,8 @@ struct ld_cmd { int scope; /**< Scope of the search */ str filter; /**< To be added to the search filter */ char** result; /**< An array with result attribute names for ldap_search */ + int sizelimit; /**< retrieve at most sizelimit entries for a search */ + struct timeval timelimit; /**< wait at most timelimit seconds for a search to complete */ }; diff --git a/modules/db_ldap/ldap.cfg b/modules/db_ldap/ldap.cfg index d113bfb..b146ffb 100644 --- a/modules/db_ldap/ldap.cfg +++ b/modules/db_ldap/ldap.cfg @@ -63,6 +63,12 @@ field_map = auth_username : digestUsername field_map = uid : serUID field_map = flags : (BitString) serFlags +# retrieve at most sizelimit entries for a search +#sizelimit = 2147483647 + +# wait at most timelimit seconds for a search to complete +#timelimit = 120 + # # Domain table stores information about virtual domains #

1 0

git:janakj/ldap: Support for multi-value attributes added
by Jan Janak 12 Feb '09

12 Feb '09

Module: sip-router Branch: janakj/ldap Commit: 57d6951fa06f58fe8fe2a0d6c89446d70ee3f1f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=57d6951… Author: Gergely Kovacs <gergo(a)iptel.org> Committer: Gergely Kovacs <gergo(a)iptel.org> Date: Mon Jul 28 12:46:51 2008 +0000 Support for multi-value attributes added --- modules/db_ldap/ld_cmd.c | 80 +++++++++--------- modules/db_ldap/ld_fld.c | 199 ++++++++++++++++++++++++++++------------------ modules/db_ldap/ld_fld.h | 20 ++++- 3 files changed, 175 insertions(+), 124 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=57d…

1 0

git:janakj/ldap: - use cfg_parse_bool_opt
by Jan Janak 12 Feb '09

12 Feb '09

Module: sip-router Branch: janakj/ldap Commit: 1db8e0a7e68c069638c84e0d10f513d59d22e323 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1db8e0a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Jul 22 12:32:13 2008 +0000 - use cfg_parse_bool_opt --- modules/db_ldap/ld_cfg.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/db_ldap/ld_cfg.c b/modules/db_ldap/ld_cfg.c index d3758ab..ea3d564 100644 --- a/modules/db_ldap/ld_cfg.c +++ b/modules/db_ldap/ld_cfg.c @@ -268,13 +268,13 @@ static cfg_option_t auth_values[] = { static cfg_option_t ldap_con_options[] = { - {"host", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, - {"port", .f = cfg_parse_int_opt}, - {"username", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, - {"password", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, - {"authtype", .param = auth_values, .f = cfg_parse_enum_opt}, - {"tls", .param = cfg_bool_values, .f = cfg_parse_enum_opt}, - {"ca_list", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, + {"host", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, + {"port", .f = cfg_parse_int_opt}, + {"username", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, + {"password", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, + {"authtype", .param = auth_values, .f = cfg_parse_enum_opt}, + {"tls", .f = cfg_parse_bool_opt}, + {"ca_list", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, {"require_certificate", .f = cfg_parse_str_opt, .flags = CFG_STR_PKGMEM}, {0} }; @@ -345,9 +345,7 @@ static int parse_section(void* param, cfg_parser_t* st, unsigned int flags) for(i = 0; auth_values[i].name; i++) { auth_values[i].param = &con->authmech; } - for(i = 0; cfg_bool_values[i].name; i++) { - cfg_bool_values[i].param = &con->tls; - } + ldap_con_options[5].param = &con->tls; ldap_con_options[6].param = &con->ca_list; ldap_con_options[7].param = &con->req_cert; } else {

1 0

← Newer
1
...
40
41
42
43
44
45
46
47
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009