sr-dev

sr-dev@lists.kamailio.org

12 participants
44199 discussions

git:janakj/flatstore: Make km_ sources compile:

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: a35e28152a68a49490029ed37150f05f881fb654 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a35e281… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 23:10:33 2009 +0100 Make km_ sources compile: List of changes: * Rename flat_pid variable to km_flat_pid to avoid conflict with sources originating from ser * Rename db_con_t to db1_con_t * Rename db type names DB_* to DB1_* * Rename flat_delimiter variable to km_flat_delimiter * Fix paths to headers in lib/srdb1 * Rename cmd_export_t to kam_cmd_export_t * Rename module_exports to kam_module_exports * Rename exports structure to kam_exports --- modules/db_flatstore/km_flat_con.c | 2 +- modules/db_flatstore/km_flatstore.c | 35 ++++++++++++++++--------------- modules/db_flatstore/km_flatstore.h | 14 ++++++------ modules/db_flatstore/km_flatstore_mod.c | 25 ++++++++------------- modules/db_flatstore/km_flatstore_mod.h | 10 +------- 5 files changed, 38 insertions(+), 48 deletions(-) diff --git a/modules/db_flatstore/km_flat_con.c b/modules/db_flatstore/km_flat_con.c index 7321b65..c4f38bb 100644 --- a/modules/db_flatstore/km_flat_con.c +++ b/modules/db_flatstore/km_flat_con.c @@ -72,7 +72,7 @@ static char* get_name(struct flat_id* id) *ptr++ = '_'; - num = int2str(flat_pid, &num_len); + num = int2str(km_flat_pid, &num_len); if (buf_len<(total_len+num_len)){ LM_ERR("the path is too long (%d and PATHMAX is" " %d)\n", total_len+num_len, buf_len); diff --git a/modules/db_flatstore/km_flatstore.c b/modules/db_flatstore/km_flatstore.c index 1f85482..499a98e 100644 --- a/modules/db_flatstore/km_flatstore.c +++ b/modules/db_flatstore/km_flatstore.c @@ -35,6 +35,7 @@ #include "km_flat_con.h" #include "km_flatstore_mod.h" #include "km_flatstore.h" +#include "flatstore_mod.h" static int parse_flat_url(const str* url, str* path) @@ -54,9 +55,9 @@ static int parse_flat_url(const str* url, str* path) * Initialize database module * No function should be called before this */ -db_con_t* flat_db_init(const str* url) +db1_con_t* flat_db_init(const str* url) { - db_con_t* res; + db1_con_t* res; str* path; if (!url || !url->s) { @@ -72,13 +73,13 @@ db_con_t* flat_db_init(const str* url) /* as the table (path) is a substring of the received str, we need to * allocate a separate str struct for it -bogdan */ - res = pkg_malloc(sizeof(db_con_t)+sizeof(struct flat_con*)+sizeof(str)); + res = pkg_malloc(sizeof(db1_con_t)+sizeof(struct flat_con*)+sizeof(str)); if (!res) { LM_ERR("no pkg memory left\n"); return 0; } - memset(res, 0, sizeof(db_con_t) + sizeof(struct flat_con*) + sizeof(str)); - path = (str*)(((char*)res) + sizeof(db_con_t) + sizeof(struct flat_con*)); + memset(res, 0, sizeof(db1_con_t) + sizeof(struct flat_con*) + sizeof(str)); + path = (str*)(((char*)res) + sizeof(db1_con_t) + sizeof(struct flat_con*)); if (parse_flat_url(url, path) < 0) { pkg_free(res); @@ -94,7 +95,7 @@ db_con_t* flat_db_init(const str* url) * Store name of table that will be used by * subsequent database functions */ -int flat_use_table(db_con_t* h, const str* t) +int flat_use_table(db1_con_t* h, const str* t) { struct flat_con* con; @@ -124,7 +125,7 @@ int flat_use_table(db_con_t* h, const str* t) } -void flat_db_close(db_con_t* h) +void flat_db_close(db1_con_t* h) { struct flat_con* con; @@ -149,7 +150,7 @@ void flat_db_close(db_con_t* h) * v: values of the keys * n: number of key=value pairs */ -int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, +int flat_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, const int n) { FILE* f; @@ -170,31 +171,31 @@ int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, for(i = 0; i < n; i++) { switch(VAL_TYPE(v + i)) { - case DB_INT: + case DB1_INT: fprintf(f, "%d", VAL_INT(v + i)); break; - case DB_BIGINT: + case DB1_BIGINT: LM_ERR("BIGINT not supported"); return -1; - case DB_DOUBLE: + case DB1_DOUBLE: fprintf(f, "%f", VAL_DOUBLE(v + i)); break; - case DB_STRING: + case DB1_STRING: fprintf(f, "%s", VAL_STRING(v + i)); break; - case DB_STR: + case DB1_STR: fprintf(f, "%.*s", VAL_STR(v + i).len, VAL_STR(v + i).s); break; - case DB_DATETIME: + case DB1_DATETIME: fprintf(f, "%u", (unsigned int)VAL_TIME(v + i)); break; - case DB_BLOB: + case DB1_BLOB: l = VAL_BLOB(v+i).len; s = p = VAL_BLOB(v+i).s; while (l--) { @@ -208,13 +209,13 @@ int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, fprintf(f,"%.*s",(int)(s-p),p); break; - case DB_BITMAP: + case DB1_BITMAP: fprintf(f, "%u", VAL_BITMAP(v + i)); break; } if (i < (n - 1)) { - fprintf(f, "%c", *flat_delimiter); + fprintf(f, "%c", *km_flat_delimiter); } } diff --git a/modules/db_flatstore/km_flatstore.h b/modules/db_flatstore/km_flatstore.h index fa79a34..c6e82f9 100644 --- a/modules/db_flatstore/km_flatstore.h +++ b/modules/db_flatstore/km_flatstore.h @@ -31,26 +31,26 @@ #ifndef _KM_FLATSTORE_H #define _KM_FLATSTORE_H -#include "../../db/db_val.h" -#include "../../db/db_key.h" -#include "../../db/db_con.h" +#include "../../lib/srdb1/db_val.h" +#include "../../lib/srdb1/db_key.h" +#include "../../lib/srdb1/db_con.h" /* * Initialize database module * No function should be called before this */ -db_con_t* flat_db_init(const str* _url); +db1_con_t* flat_db_init(const str* _url); /* * Store name of table that will be used by * subsequent database functions */ -int flat_use_table(db_con_t* h, const str* t); +int flat_use_table(db1_con_t* h, const str* t); -void flat_db_close(db_con_t* h); +void flat_db_close(db1_con_t* h); /* @@ -60,7 +60,7 @@ void flat_db_close(db_con_t* h); * v: values of the keys * n: number of key=value pairs */ -int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, +int flat_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, const int n); diff --git a/modules/db_flatstore/km_flatstore_mod.c b/modules/db_flatstore/km_flatstore_mod.c index c24343a..d968594 100644 --- a/modules/db_flatstore/km_flatstore_mod.c +++ b/modules/db_flatstore/km_flatstore_mod.c @@ -29,12 +29,13 @@ #include "../../sr_module.h" #include "../../mem/shm_mem.h" -#include "../../db/db.h" +#include "../../lib/srdb1/db.h" #include "km_flatstore.h" #include "km_flat_mi.h" #include "km_flatstore_mod.h" +#include "flatstore_mod.h" -MODULE_VERSION +/*MODULE_VERSION*/ static int child_init(int rank); @@ -47,18 +48,13 @@ int db_flat_bind_api(db_func_t *dbb); /* * Process number used in filenames */ -int flat_pid; - -/* - * Should we flush after each write to the database ? - */ -int flat_flush = 1; +int km_flat_pid; /* * Delimiter delimiting columns */ -char* flat_delimiter = "|"; +char* km_flat_delimiter = "|"; /* @@ -72,7 +68,7 @@ time_t local_timestamp; /* * Flatstore database module interface */ -static cmd_export_t cmds[] = { +static kam_cmd_export_t cmds[] = { {"db_bind_api", (cmd_function)db_flat_bind_api, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -81,7 +77,6 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"flush", INT_PARAM, &flat_flush}, {0, 0, 0} }; @@ -94,7 +89,7 @@ static mi_export_t mi_cmds[] = { { 0, 0, 0, 0, 0} }; -struct module_exports exports = { +struct kam_module_exports km_exports = { "db_flatstore", DEFAULT_DLFLAGS, /* dlopen flags */ cmds, @@ -112,7 +107,7 @@ struct module_exports exports = { static int mod_init(void) { - if (strlen(flat_delimiter) != 1) { + if (strlen(km_flat_delimiter) != 1) { LM_ERR("delimiter has to be exactly one character\n"); return -1; } @@ -139,9 +134,9 @@ static void mod_destroy(void) static int child_init(int rank) { if (rank <= 0) { - flat_pid = - rank; + km_flat_pid = - rank; } else { - flat_pid = rank - PROC_TCP_MAIN; + km_flat_pid = rank - PROC_TCP_MAIN; } return 0; } diff --git a/modules/db_flatstore/km_flatstore_mod.h b/modules/db_flatstore/km_flatstore_mod.h index 7a71406..b605c11 100644 --- a/modules/db_flatstore/km_flatstore_mod.h +++ b/modules/db_flatstore/km_flatstore_mod.h @@ -35,19 +35,13 @@ /* * Process number used in filenames */ -extern int flat_pid; - - -/* - * Should we flush after each write to the database ? - */ -extern int flat_flush; +extern int km_flat_pid; /* * Delmiter delimiting columns */ -extern char* flat_delimiter; +extern char* km_flat_delimiter; /*

15 years, 10 months

git:janakj/flatstore: - rename database modules to use the 'db_' prefix

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 4a4cc74c10604a67fc9637a81edf308961d1d901 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a4cc74… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 13:10:03 2008 +0000 - rename database modules to use the 'db_' prefix git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3638 689a6050-402a-0410-94f2-e92a70836424 ---

15 years, 10 months

git:janakj/flatstore: further changes after the db name change

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 553cc2471208ec6e4e396eab1822ccd5c27543f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=553cc24… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: 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 --- modules/db_flatstore/km_Makefile | 2 +- modules/db_flatstore/km_flatstore_mod.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_flatstore/km_Makefile b/modules/db_flatstore/km_Makefile index 0953806..6b53fdb 100644 --- a/modules/db_flatstore/km_Makefile +++ b/modules/db_flatstore/km_Makefile @@ -4,6 +4,6 @@ include ../../Makefile.defs auto_gen= -NAME=flatstore.so +NAME=db_flatstore.so include ../../Makefile.modules diff --git a/modules/db_flatstore/km_flatstore_mod.c b/modules/db_flatstore/km_flatstore_mod.c index 66db6f6..68d8d20 100644 --- a/modules/db_flatstore/km_flatstore_mod.c +++ b/modules/db_flatstore/km_flatstore_mod.c @@ -97,7 +97,7 @@ static mi_export_t mi_cmds[] = { }; struct module_exports exports = { - "flatstore", + "db_flatstore", DEFAULT_DLFLAGS, /* dlopen flags */ cmds, params, /* module parameters */

15 years, 10 months

git:janakj/flatstore: - first round of cleanups for documentation

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 5269c8d891516498d10ea630ad872bb5d306cf60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5269c8d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 27 13:53:33 2008 +0000 - first round of cleanups for documentation - remove all FAQ and DEVEL files considered empty in content (no content at all or just the default lines) - remove of the <RevHistory>/</RevHistory> tag (and of course anything between them) - remove the comments at the end of the file that begins with " diff --git a/modules/db_flatstore/km_doc/db_flatstore_faq.sgml b/modules/db_flatstore/km_doc/db_flatstore_faq.sgml deleted file mode 100644 index bc8e5b9..0000000 --- a/modules/db_flatstore/km_doc/db_flatstore_faq.sgml +++ /dev/null @@ -1,70 +0,0 @@ - - -<chapter> - <chapterinfo> - <revhistory> - <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> - </revision> - </revhistory> - </chapterinfo> - <title>Frequently Asked Questions</title> - <qandaset defaultlabel="number"> - <qandaentry> - <question> - <para>Where can I find more about OpenSER?</para> - </question> - <answer> - <para> - Take a look at &serhomelink;. - </para> - </answer> - </qandaentry> - <qandaentry> - <question> - <para>Where can I post a question about this module?</para> - </question> - <answer> - <para> - First at all check if your question was already answered on one of - our mailing lists: - </para> - <itemizedlist> - <listitem> - <para>User Mailing List - &seruserslink;</para> - </listitem> - <listitem> - <para>Developer Mailing List - &serdevlink;</para> - </listitem> - </itemizedlist> - <para> - E-mails regarding any stable &ser; release should be sent to - &serusersmail; and e-mails regarding development versions - should be sent to &serdevmail;. - </para> - <para> - If you want to keep the mail private, send it to - &serhelpmail;. - </para> - </answer> - </qandaentry> - <qandaentry> - <question> - <para>How can I report a bug?</para> - </question> - <answer> - <para> - Please follow the guidelines provided at: - &serbugslink;. - </para> - </answer> - </qandaentry> - </qandaset> -</chapter> - - diff --git a/modules/db_flatstore/km_doc/db_flatstore_user.sgml b/modules/db_flatstore/km_doc/db_flatstore_user.sgml index 6043f35..a72a07a 100644 --- a/modules/db_flatstore/km_doc/db_flatstore_user.sgml +++ b/modules/db_flatstore/km_doc/db_flatstore_user.sgml @@ -2,12 +2,6 @@ <chapter> <chapterinfo> - <revhistory> - <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> - </revision> - </revhistory> </chapterinfo> <title>User's Guide</title> @@ -199,8 +193,3 @@ modparam("db_flatstore", "flush", 0) </section> </chapter> -

15 years, 10 months

git:janakj/flatstore: - change module docs FAQ link to a common one in the doc dir

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: bbf39b7f2fe6e73373d08b24359ed617bc4852cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bbf39b7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Mar 4 13:15:47 2008 +0000 - change module docs FAQ link to a common one in the doc dir - remove module specific FAQ content from the file in doc, this way no FAQ content will be created - credits for the patch/ the change scripts goes to Edson Gellert Schubert, 4lists at gmail dot com - update all READMEs, for most module docs the FAQ and devel information were now removed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3839 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_flatstore/km_README | 34 -------------------- modules/db_flatstore/km_doc/db_flatstore.sgml | 2 +- .../db_flatstore/km_doc/db_flatstore_devel.sgml | 3 +- modules/db_flatstore/km_doc/db_flatstore_user.sgml | 3 +- 4 files changed, 3 insertions(+), 39 deletions(-) diff --git a/modules/db_flatstore/km_README b/modules/db_flatstore/km_README index c8e11b3..b319acb 100644 --- a/modules/db_flatstore/km_README +++ b/modules/db_flatstore/km_README @@ -33,7 +33,6 @@ Jan Janak 1.5.1. flat_rotate 2. Developer's Guide - 3. Frequently Asked Questions List of Examples 1-1. Set "flush" parameter @@ -173,36 +172,3 @@ modparam("db_flatstore", "flush", 0) Chapter 2. Developer's Guide The module implements the DB API. - __________________________________________________________ - -Chapter 3. Frequently Asked Questions - - 3.1. Where can I find more about OpenSER? - 3.2. Where can I post a question about this module? - 3.3. How can I report a bug? - - 3.1. Where can I find more about OpenSER? - - Take a look at http://openser.org/. - - 3.2. Where can I post a question about this module? - - First at all check if your question was already answered on one - of our mailing lists: - - * User Mailing List - - http://openser.org/cgi-bin/mailman/listinfo/users - * Developer Mailing List - - http://openser.org/cgi-bin/mailman/listinfo/devel - - E-mails regarding any stable OpenSER release should be sent to - <users(a)openser.org> and e-mails regarding development versions - should be sent to <devel(a)openser.org>. - - If you want to keep the mail private, send it to - <team(a)openser.org>. - - 3.3. How can I report a bug? - - Please follow the guidelines provided at: - http://sourceforge.net/tracker/?group_id=139143. diff --git a/modules/db_flatstore/km_doc/db_flatstore.sgml b/modules/db_flatstore/km_doc/db_flatstore.sgml index ba6c6b7..7ab9128 100644 --- a/modules/db_flatstore/km_doc/db_flatstore.sgml +++ b/modules/db_flatstore/km_doc/db_flatstore.sgml @@ -3,7 +3,7 @@ <!ENTITY user SYSTEM "db_flatstore_user.sgml"> <!ENTITY devel SYSTEM "db_flatstore_devel.sgml"> -<!ENTITY faq SYSTEM "db_flatstore_faq.sgml"> +<!ENTITY faq SYSTEM "../../../doc/module_faq.sgml">  <!ENTITY % docentities SYSTEM "../../../doc/entities.sgml"> diff --git a/modules/db_flatstore/km_doc/db_flatstore_devel.sgml b/modules/db_flatstore/km_doc/db_flatstore_devel.sgml index cf299a2..201da09 100644 --- a/modules/db_flatstore/km_doc/db_flatstore_devel.sgml +++ b/modules/db_flatstore/km_doc/db_flatstore_devel.sgml @@ -1,8 +1,7 @@  <chapter> - <chapterinfo> - </chapterinfo> + <title>Developer's Guide</title> <para> The module implements the DB <acronym>API</acronym>. diff --git a/modules/db_flatstore/km_doc/db_flatstore_user.sgml b/modules/db_flatstore/km_doc/db_flatstore_user.sgml index a72a07a..60d872e 100644 --- a/modules/db_flatstore/km_doc/db_flatstore_user.sgml +++ b/modules/db_flatstore/km_doc/db_flatstore_user.sgml @@ -1,8 +1,7 @@  <chapter> - <chapterinfo> - </chapterinfo> + <title>User's Guide</title> <section>

15 years, 10 months

git:janakj/flatstore: - fix user documentation and rename all sgml file after the name change

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 07a74150f71a7e9664165d24b439aceb1a63da72 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07a7415… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 13:32:59 2008 +0000 - fix user documentation and rename all sgml file after the name change of the database modules git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3639 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_flatstore/km_README | 2 +- .../km_doc/{flatstore.sgml => db_flatstore.sgml} | 6 +++--- ...latstore_devel.sgml => db_flatstore_devel.sgml} | 2 +- .../{flatstore_faq.sgml => db_flatstore_faq.sgml} | 2 +- ...{flatstore_user.sgml => db_flatstore_user.sgml} | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/db_flatstore/km_README b/modules/db_flatstore/km_README index ebd3457..c8e11b3 100644 --- a/modules/db_flatstore/km_README +++ b/modules/db_flatstore/km_README @@ -146,7 +146,7 @@ openserctl fifo flat_rotate Example 1-1. Set "flush" parameter ... -modparam("flatstore", "flush", 0) +modparam("db_flatstore", "flush", 0) ... __________________________________________________________ diff --git a/modules/db_flatstore/km_doc/flatstore.sgml b/modules/db_flatstore/km_doc/db_flatstore.sgml similarity index 86% rename from modules/db_flatstore/km_doc/flatstore.sgml rename to modules/db_flatstore/km_doc/db_flatstore.sgml index 6d88a85..ba6c6b7 100644 --- a/modules/db_flatstore/km_doc/flatstore.sgml +++ b/modules/db_flatstore/km_doc/db_flatstore.sgml @@ -1,9 +1,9 @@ <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [ -<!ENTITY user SYSTEM "flatstore_user.sgml"> -<!ENTITY devel SYSTEM "flatstore_devel.sgml"> -<!ENTITY faq SYSTEM "flatstore_faq.sgml"> +<!ENTITY user SYSTEM "db_flatstore_user.sgml"> +<!ENTITY devel SYSTEM "db_flatstore_devel.sgml"> +<!ENTITY faq SYSTEM "db_flatstore_faq.sgml">  <!ENTITY % docentities SYSTEM "../../../doc/entities.sgml"> diff --git a/modules/db_flatstore/km_doc/flatstore_devel.sgml b/modules/db_flatstore/km_doc/db_flatstore_devel.sgml similarity index 86% rename from modules/db_flatstore/km_doc/flatstore_devel.sgml rename to modules/db_flatstore/km_doc/db_flatstore_devel.sgml index ef269fb..f1afc53 100644 --- a/modules/db_flatstore/km_doc/flatstore_devel.sgml +++ b/modules/db_flatstore/km_doc/db_flatstore_devel.sgml @@ -17,6 +17,6 @@  diff --git a/modules/db_flatstore/km_doc/flatstore_faq.sgml b/modules/db_flatstore/km_doc/db_flatstore_faq.sgml similarity index 95% rename from modules/db_flatstore/km_doc/flatstore_faq.sgml rename to modules/db_flatstore/km_doc/db_flatstore_faq.sgml index 505c96f..bc8e5b9 100644 --- a/modules/db_flatstore/km_doc/flatstore_faq.sgml +++ b/modules/db_flatstore/km_doc/db_flatstore_faq.sgml @@ -65,6 +65,6 @@  diff --git a/modules/db_flatstore/km_doc/flatstore_user.sgml b/modules/db_flatstore/km_doc/db_flatstore_user.sgml similarity index 98% rename from modules/db_flatstore/km_doc/flatstore_user.sgml rename to modules/db_flatstore/km_doc/db_flatstore_user.sgml index 18d0ccc..6043f35 100644 --- a/modules/db_flatstore/km_doc/flatstore_user.sgml +++ b/modules/db_flatstore/km_doc/db_flatstore_user.sgml @@ -161,7 +161,7 @@ openserctl fifo flat_rotate <title>Set <quote>flush</quote> parameter</title> <programlisting format="linespecific"> ... -modparam("flatstore", "flush", 0) +modparam("db_flatstore", "flush", 0) ... </programlisting> </example> @@ -201,6 +201,6 @@ modparam("flatstore", "flush", 0)

15 years, 10 months

git:janakj/flatstore: - step 1 for the rest of modules to re-link history from sgml to xml files

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 8a3de600c56e6c720a01215a78ac7393ce3734ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a3de60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 7 19:41:22 2008 +0000 - step 1 for the rest of modules to re-link history from sgml to xml files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3890 689a6050-402a-0410-94f2-e92a70836424 --- .../km_doc/{db_flatstore.xml => db_flatstore.sgml} | 4 ++-- ...flatstore_devel.xml => db_flatstore_devel.sgml} | 0 ..._flatstore_admin.xml => db_flatstore_user.sgml} | 0 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_flatstore/km_doc/db_flatstore.xml b/modules/db_flatstore/km_doc/db_flatstore.sgml similarity index 90% rename from modules/db_flatstore/km_doc/db_flatstore.xml rename to modules/db_flatstore/km_doc/db_flatstore.sgml index 5474aa6..355d6d5 100644 --- a/modules/db_flatstore/km_doc/db_flatstore.xml +++ b/modules/db_flatstore/km_doc/db_flatstore.sgml @@ -41,8 +41,8 @@ </copyright> <revhistory> <revision> - <revnumber>$Revision: 3839 $</revnumber> - <date>$Date: 2008-03-04 15:15:47 +0200 (Tue, 04 Mar 2008) $</date> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> </revision> </revhistory> </bookinfo> diff --git a/modules/db_flatstore/km_doc/db_flatstore_devel.xml b/modules/db_flatstore/km_doc/db_flatstore_devel.sgml similarity index 100% rename from modules/db_flatstore/km_doc/db_flatstore_devel.xml rename to modules/db_flatstore/km_doc/db_flatstore_devel.sgml diff --git a/modules/db_flatstore/km_doc/db_flatstore_admin.xml b/modules/db_flatstore/km_doc/db_flatstore_user.sgml similarity index 100% rename from modules/db_flatstore/km_doc/db_flatstore_admin.xml rename to modules/db_flatstore/km_doc/db_flatstore_user.sgml

15 years, 10 months

git:janakj/flatstore: - migrated to db_bind_api()

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: bd3618d9778f0a20423f818b58079eb08663ebd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd3618d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 5 18:33:15 2008 +0000 - migrated to db_bind_api() git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3859 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_flatstore/km_flatstore.c | 3 ++- modules/db_flatstore/km_flatstore.h | 3 ++- modules/db_flatstore/km_flatstore_mod.c | 24 +++++++++++++++++++----- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/modules/db_flatstore/km_flatstore.c b/modules/db_flatstore/km_flatstore.c index 3da8118..714ac3b 100644 --- a/modules/db_flatstore/km_flatstore.c +++ b/modules/db_flatstore/km_flatstore.c @@ -143,7 +143,8 @@ void flat_db_close(db_con_t* h) * v: values of the keys * n: number of key=value pairs */ -int flat_db_insert(db_con_t* h, db_key_t* k, db_val_t* v, int n) +int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, + const int n) { FILE* f; int i; diff --git a/modules/db_flatstore/km_flatstore.h b/modules/db_flatstore/km_flatstore.h index 3ce9efd..9e83472 100644 --- a/modules/db_flatstore/km_flatstore.h +++ b/modules/db_flatstore/km_flatstore.h @@ -60,7 +60,8 @@ void flat_db_close(db_con_t* h); * v: values of the keys * n: number of key=value pairs */ -int flat_db_insert(db_con_t* h, db_key_t* k, db_val_t* v, int n); +int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, + const int n); #endif /* _FLATSTORE_H */ diff --git a/modules/db_flatstore/km_flatstore_mod.c b/modules/db_flatstore/km_flatstore_mod.c index 68d8d20..9bd5bde 100644 --- a/modules/db_flatstore/km_flatstore_mod.c +++ b/modules/db_flatstore/km_flatstore_mod.c @@ -29,6 +29,7 @@ #include "../../sr_module.h" #include "../../mem/shm_mem.h" +#include "../../db/db.h" #include "flatstore.h" #include "flat_mi.h" #include "flatstore_mod.h" @@ -41,6 +42,7 @@ static int mod_init(void); static void mod_destroy(void); +int db_flat_bind_api(db_func_t *dbb); /* * Process number used in filenames @@ -71,14 +73,10 @@ time_t local_timestamp; * Flatstore database module interface */ static cmd_export_t cmds[] = { - {"db_use_table", (cmd_function)flat_use_table, 2, 0, 0, 0}, - {"db_init", (cmd_function)flat_db_init, 1, 0, 0, 0}, - {"db_close", (cmd_function)flat_db_close, 2, 0, 0, 0}, - {"db_insert", (cmd_function)flat_db_insert, 2, 0, 0, 0}, + {"db_bind_api", (cmd_function)db_flat_bind_api, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; - /* * Exported parameters */ @@ -147,3 +145,19 @@ static int child_init(int rank) } return 0; } + +int db_flat_bind_api(db_func_t *dbb) +{ + if(dbb==NULL) + return -1; + + memset(dbb, 0, sizeof(db_func_t)); + + dbb->use_table = flat_use_table; + dbb->init = flat_db_init; + dbb->close = flat_db_close; + dbb->insert = flat_db_insert; + + return 0; +} +

15 years, 10 months

git:janakj/flatstore: - step 2 for the rest of modules to re-link history from sgml to xml files

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 8cb5d1b3885c54c2a896e0b3dc23e0843f41a0d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cb5d1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 7 19:52:29 2008 +0000 - step 2 for the rest of modules to re-link history from sgml to xml files git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3891 689a6050-402a-0410-94f2-e92a70836424 --- .../km_doc/{db_flatstore.sgml => db_flatstore.xml} | 0 ..._flatstore_user.sgml => db_flatstore_admin.xml} | 0 ...flatstore_devel.sgml => db_flatstore_devel.xml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/km_doc/db_flatstore.sgml b/modules/db_flatstore/km_doc/db_flatstore.xml similarity index 100% rename from modules/db_flatstore/km_doc/db_flatstore.sgml rename to modules/db_flatstore/km_doc/db_flatstore.xml diff --git a/modules/db_flatstore/km_doc/db_flatstore_user.sgml b/modules/db_flatstore/km_doc/db_flatstore_admin.xml similarity index 100% rename from modules/db_flatstore/km_doc/db_flatstore_user.sgml rename to modules/db_flatstore/km_doc/db_flatstore_admin.xml diff --git a/modules/db_flatstore/km_doc/db_flatstore_devel.sgml b/modules/db_flatstore/km_doc/db_flatstore_devel.xml similarity index 100% rename from modules/db_flatstore/km_doc/db_flatstore_devel.sgml rename to modules/db_flatstore/km_doc/db_flatstore_devel.xml

15 years, 10 months

git:janakj/flatstore: - modules documentation migrated from sgml to xml docbook format

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 6ad96b39d4d9fc6bf82b2c5532b330db0730a6d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6ad96b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 7 18:19:45 2008 +0000 - modules documentation migrated from sgml to xml docbook format - many thanks to Edson <4lists (at) gmail (dot) com> for providing script to replace headers and rename files - contact updated - follows re-sync with todays changes and update of Makefile to generate README and html files from XML git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3886 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_flatstore/km_README | 56 +++++++++++++++----- .../km_doc/{db_flatstore.sgml => db_flatstore.xml} | 16 +++--- ..._flatstore_user.sgml => db_flatstore_admin.xml} | 0 ...flatstore_devel.sgml => db_flatstore_devel.xml} | 0 4 files changed, 51 insertions(+), 21 deletions(-) diff --git a/modules/db_flatstore/km_README b/modules/db_flatstore/km_README index b319acb..ac28ae6 100644 --- a/modules/db_flatstore/km_README +++ b/modules/db_flatstore/km_README @@ -9,9 +9,13 @@ Edited by Jan Janak Copyright � 2004, 2005 FhG FOKUS + Revision History + Revision $Revision$ $Date: 2008-03-04 15:15:47 +0200 + (Tue, 04 Mar 2008) $ __________________________________________________________ Table of Contents + 1. User's Guide 1.1. Overview @@ -33,10 +37,11 @@ Jan Janak 1.5.1. flat_rotate 2. Developer's Guide + 3. Frequently Asked Questions List of Examples - 1-1. Set "flush" parameter - __________________________________________________________ + + 1.1. Set "flush" parameter Chapter 1. User's Guide @@ -86,7 +91,6 @@ modparam("acc", "db_url", "flatstore:/var/log/acc") the complete data for a table you can simply concatenate the contents of files with the same table name but different process id. - __________________________________________________________ 1.1.1. Rotating Log Files @@ -96,7 +100,6 @@ modparam("acc", "db_url", "flatstore:/var/log/acc") rotation itself has to be done by another application (such as logrotate). Follow these steps to rotate files generated by flatstore module: - * Rename the files that you want to rotate: cd /var/log/acc mv acc_1.log acc_1.log.20050605 @@ -116,24 +119,19 @@ openserctl fifo flat_rotate write. It is normal that the files will be not created immediately if there is no traffic on the proxy server. * Move the renamed files somewhere else and process them. - __________________________________________________________ 1.2. Dependencies 1.2.1. OpenSER Modules The following modules must be loaded before this module: - * No dependencies on other OpenSER modules. - __________________________________________________________ 1.2.2. External Libraries or Applications The following libraries or applications must be installed before running OpenSER with this module loaded: - * None. - __________________________________________________________ 1.3. Exported Parameters @@ -143,20 +141,18 @@ openserctl fifo flat_rotate Default value is 1. - Example 1-1. Set "flush" parameter + Example 1.1. Set "flush" parameter ... modparam("db_flatstore", "flush", 0) ... - __________________________________________________________ 1.4. Exported Functions There are no function exported to routing script. - __________________________________________________________ 1.5. Exported MI Functions -1.5.1. flat_rotate +1.5.1. flat_rotate It changes the name of the files where it is written. @@ -167,8 +163,40 @@ modparam("db_flatstore", "flush", 0) MI FIFO Command Format: :flat_rotate:_reply_fifo_file_ _empty_line_ - __________________________________________________________ Chapter 2. Developer's Guide The module implements the DB API. + +Chapter 3. Frequently Asked Questions + + 3.1. + + Where can I find more about OpenSER? + + Take a look at http://openser.org/. + + 3.2. + + Where can I post a question about this module? + + First at all check if your question was already answered on one + of our mailing lists: + * User Mailing List - + http://openser.org/cgi-bin/mailman/listinfo/users + * Developer Mailing List - + http://openser.org/cgi-bin/mailman/listinfo/devel + + E-mails regarding any stable OpenSER release should be sent to + <users(a)openser.org> and e-mails regarding development versions + should be sent to <devel(a)openser.org>. + + If you want to keep the mail private, send it to + <team(a)openser.org>. + + 3.3. + + How can I report a bug? + + Please follow the guidelines provided at: + http://sourceforge.net/tracker/?group_id=139143. diff --git a/modules/db_flatstore/km_doc/db_flatstore.sgml b/modules/db_flatstore/km_doc/db_flatstore.xml similarity index 60% rename from modules/db_flatstore/km_doc/db_flatstore.sgml rename to modules/db_flatstore/km_doc/db_flatstore.xml index 7ab9128..5474aa6 100644 --- a/modules/db_flatstore/km_doc/db_flatstore.sgml +++ b/modules/db_flatstore/km_doc/db_flatstore.xml @@ -1,12 +1,14 @@ -<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ -<!ENTITY user SYSTEM "db_flatstore_user.sgml"> -<!ENTITY devel SYSTEM "db_flatstore_devel.sgml"> -<!ENTITY faq SYSTEM "../../../doc/module_faq.sgml"> +<!ENTITY user SYSTEM "db_flatstore_admin.xml"> +<!ENTITY devel SYSTEM "db_flatstore_devel.xml"> +<!ENTITY faq SYSTEM "../../../doc/module_faq.xml">  -<!ENTITY % docentities SYSTEM "../../../doc/entities.sgml"> +<!ENTITY % docentities SYSTEM "../../../doc/entities.xml"> %docentities; ]> @@ -39,8 +41,8 @@ </copyright> <revhistory> <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> + <revnumber>$Revision: 3839 $</revnumber> + <date>$Date: 2008-03-04 15:15:47 +0200 (Tue, 04 Mar 2008) $</date> </revision> </revhistory> </bookinfo> diff --git a/modules/db_flatstore/km_doc/db_flatstore_user.sgml b/modules/db_flatstore/km_doc/db_flatstore_admin.xml similarity index 100% rename from modules/db_flatstore/km_doc/db_flatstore_user.sgml rename to modules/db_flatstore/km_doc/db_flatstore_admin.xml diff --git a/modules/db_flatstore/km_doc/db_flatstore_devel.sgml b/modules/db_flatstore/km_doc/db_flatstore_devel.xml similarity index 100% rename from modules/db_flatstore/km_doc/db_flatstore_devel.sgml rename to modules/db_flatstore/km_doc/db_flatstore_devel.xml

15 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev