sr-dev

sr-dev@lists.kamailio.org

11 participants
42877 discussions

git:janakj/flatstore: - Open files for appending instead of overwriting

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: f76abca257eaa22829bc2f99275d5c0dc5b6156c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f76abca… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Oct 28 11:02:55 2004 +0000 - Open files for appending instead of overwriting --- modules/db_flatstore/flat_con.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_flatstore/flat_con.c b/modules/db_flatstore/flat_con.c index cd5b5c9..8d375ec 100644 --- a/modules/db_flatstore/flat_con.c +++ b/modules/db_flatstore/flat_con.c @@ -98,7 +98,7 @@ struct flat_con* flat_new_connection(struct flat_id* id) fn = get_name(id); - res->file = fopen(fn, "w"); + res->file = fopen(fn, "a"); if (!res->file) { LOG(L_ERR, "flat_new_connection: %s\n", strerror(errno)); pkg_free(res); @@ -140,7 +140,7 @@ int flat_reopen_connection(struct flat_con* con) fn = get_name(con->id); - con->file = fopen(fn, "w"); + con->file = fopen(fn, "a"); if (!con->file) { LOG(L_ERR, "flat_reopen_connection: Invalid parameter value\n"); return -1;

15 years, 3 months

git:janakj/flatstore: - Missing files added

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 49e970a2fa65972f72f4962db3230fb71f9215af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49e970a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sat Oct 9 14:45:03 2004 +0000 - Missing files added - Misleading comment changed --- modules/db_flatstore/flat_fifo.c | 71 ++++++++++++++++++++++++++++++++++ modules/db_flatstore/flat_fifo.h | 40 +++++++++++++++++++ modules/db_flatstore/flatstore_mod.c | 2 +- 3 files changed, 112 insertions(+), 1 deletions(-) diff --git a/modules/db_flatstore/flat_fifo.c b/modules/db_flatstore/flat_fifo.c new file mode 100644 index 0000000..bd273a6 --- /dev/null +++ b/modules/db_flatstore/flat_fifo.c @@ -0,0 +1,71 @@ +/* + * $Id$ + * + * Flatstore module FIFO interface + * + * Copyright (C) 2004 FhG Fokus + * + * This file is part of ser, a free SIP server. + * + * ser is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * For a license to use the ser software under conditions + * other than those described here, or to purchase support for this + * software, please contact iptel.org by e-mail at the following addresses: + * info(a)iptel.org + * + * ser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "../../dprint.h" +#include "../../fifo_server.h" +#include "flatstore_mod.h" +#include "flat_fifo.h" + + +#define FLAT_ROTATE "flat_rotate" +#define FLAT_ROTATE_LEN (sizeof(FLAT_ROTATE) - 1) + + +static int flat_rotate_cmd(FILE* pipe, char* response_file); + + +/* + * Initialize the FIFO interface + */ +int init_flat_fifo(void) +{ + if (register_fifo_cmd(flat_rotate_cmd, FLAT_ROTATE, 0) < 0) { + LOG(L_CRIT, "flatstore: Cannot register flat_rotate\n"); + return -1; + } + + return 0; +} + + +static int flat_rotate_cmd(FILE* pipe, char* response_file) +{ + FILE* reply_file; + + reply_file = open_reply_pipe(response_file); + if (reply_file == 0) { + LOG(L_ERR, "flat_rotate_cmd: File not open\n"); + return -1; + } + + *flat_rotate = time(0); + fputs( "200 OK\n", reply_file); + fclose(reply_file); + return 1; +} diff --git a/modules/db_flatstore/flat_fifo.h b/modules/db_flatstore/flat_fifo.h new file mode 100644 index 0000000..e746574 --- /dev/null +++ b/modules/db_flatstore/flat_fifo.h @@ -0,0 +1,40 @@ +/* + * $Id$ + * + * Flatstore module FIFO interface + * + * Copyright (C) 2004 FhG Fokus + * + * This file is part of ser, a free SIP server. + * + * ser is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * For a license to use the ser software under conditions + * other than those described here, or to purchase support for this + * software, please contact iptel.org by e-mail at the following addresses: + * info(a)iptel.org + * + * ser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _FLAT_FIFO_H +#define _FLAT_FIFO_H + +/* + * Initialize the FIFO interface + */ +int init_flat_fifo(void); + + +#endif /* _FLAT_FIFO_H */ + diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index d281992..68813cb 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -115,7 +115,7 @@ static int mod_init(void) /* Initialize fifo interface */ if (init_flat_fifo() < 0) { - LOG(L_ERR, "usrloc/fifo initialization failed\n"); + LOG(L_ERR, "flatstore: FIFO initialization failed\n"); return -1; }

15 years, 3 months

git:janakj/flatstore: - flatstore: uses now pathmax() + additional buffer checks

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 8f8d2e7a3897a6ee704638d0bb005c3438cce2a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f8d2e7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 1 10:58:23 2004 +0000 - flatstore: uses now pathmax() + additional buffer checks - pike: old gcc warning fix --- modules/db_flatstore/flat_con.c | 32 +++++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 3 deletions(-) diff --git a/modules/db_flatstore/flat_con.c b/modules/db_flatstore/flat_con.c index 8d375ec..d691c22 100644 --- a/modules/db_flatstore/flat_con.c +++ b/modules/db_flatstore/flat_con.c @@ -28,7 +28,6 @@ */ #include <string.h> -#include <linux/limits.h> #include <errno.h> #include "../../mem/mem.h" #include "../../dprint.h" @@ -39,17 +38,33 @@ #define FILE_SUFFIX ".log" #define FILE_SUFFIX_LEN (sizeof(FILE_SUFFIX) - 1) - +/* returns a pkg_malloc'ed file name */ static char* get_name(struct flat_id* id) { - static char buf[PATH_MAX]; + char* buf; + int buf_len; char* num, *ptr; int num_len; + int total_len; + buf_len=pathmax(); if (!id) { LOG(L_ERR, "get_name: Invalid parameter value\n"); return 0; } + total_len=id->dir.len+1 /* / */+id->table.len+1 /* _ */+ + FILE_SUFFIX_LEN+1 /* \0 */; /* without pid*/ + if (buf_len<total_len){ + LOG(L_ERR, "get_name: the path is too long (%d and PATHMAX is %d)\n", + total_len, buf_len); + return 0; + } + + buf=pkg_malloc(buf_len); + if (buf==0){ + LOG(L_ERR, "ERROR: get_name: memory allocation failure\n"); + return 0; + } ptr = buf; @@ -63,6 +78,12 @@ static char* get_name(struct flat_id* id) *ptr++ = '_'; num = int2str(flat_pid, &num_len); + if (buf_len<(total_len+num_len)){ + LOG(L_ERR, "ERROR: get_name: the path is too long (%d and PATHMAX is" + " %d)\n", total_len+num_len, buf_len); + pkg_free(buf); + return 0; + } memcpy(ptr, num, num_len); ptr += num_len; @@ -97,8 +118,13 @@ struct flat_con* flat_new_connection(struct flat_id* id) res->id = id; fn = get_name(id); + if (fn==0){ + LOG(L_ERR, "flat_new_connection: get_name() failed\n"); + return 0; + } res->file = fopen(fn, "a"); + pkg_free(fn); /* we don't need fn anymore */ if (!res->file) { LOG(L_ERR, "flat_new_connection: %s\n", strerror(errno)); pkg_free(res);

15 years, 3 months

git:janakj/flatstore: - fixed memory leak in flat_reopen_connection, reported by

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: e6152f724cbff2a43c76d1f552aa5ee7d2ef03b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6152f7… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue May 31 12:59:30 2005 +0000 - fixed memory leak in flat_reopen_connection, reported by Bayan William Towfiq <william(a)telepacket.com> --- modules/db_flatstore/flat_con.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/flat_con.c b/modules/db_flatstore/flat_con.c index d691c22..e148429 100644 --- a/modules/db_flatstore/flat_con.c +++ b/modules/db_flatstore/flat_con.c @@ -163,10 +163,17 @@ int flat_reopen_connection(struct flat_con* con) if (con->file) { fclose(con->file); + con->file = 0; fn = get_name(con->id); + if (fn == 0) { + LOG(L_ERR, "flat_reopen_connection: get_name() failed\n"); + return -1; + } con->file = fopen(fn, "a"); + pkg_free(fn); + if (!con->file) { LOG(L_ERR, "flat_reopen_connection: Invalid parameter value\n"); return -1;

15 years, 3 months

git:janakj/flatstore: - documents are now valid (apart from xmlns: xi problem which would require

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 745ce951eaf7f1b2c119fcc364551f66a609ff89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=745ce95… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Aug 24 22:24:59 2005 +0000 - documents are now valid (apart from xmlns:xi problem which would require docbook dtd changes) --- modules/db_flatstore/doc/flatstore.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_flatstore/doc/flatstore.xml b/modules/db_flatstore/doc/flatstore.xml index 9e82092..95b5aa1 100644 --- a/modules/db_flatstore/doc/flatstore.xml +++ b/modules/db_flatstore/doc/flatstore.xml @@ -27,7 +27,7 @@ <title>Flatstore Module</title> - <section id="overview"> + <section id="flatstore.overview"> <title>Overview</title> <para> Flatstore is one of so-called SER database modules. It does not

15 years, 3 months

git:janakj/flatstore: - DTDs and stylesheets will be downloaded from the network if they are

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 763dce3c41ed8924a2dc88b7475de808417182ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=763dce3… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Aug 24 13:24:27 2005 +0000 - DTDs and stylesheets will be downloaded from the network if they are not available locally. --- modules/db_flatstore/doc/flatstore.xml | 4 ++-- modules/db_flatstore/doc/functions.xml | 4 ++-- modules/db_flatstore/doc/params.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/db_flatstore/doc/flatstore.xml b/modules/db_flatstore/doc/flatstore.xml index 263f28a..9e82092 100644 --- a/modules/db_flatstore/doc/flatstore.xml +++ b/modules/db_flatstore/doc/flatstore.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4//EN" - "file:///usr/share/sgml/docbook/dtd/xml/4/docbookx.dtd"> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <section id="flatstore" xmlns:xi="http://www.w3.org/2001/XInclude"> <sectioninfo> diff --git a/modules/db_flatstore/doc/functions.xml b/modules/db_flatstore/doc/functions.xml index 29dea48..5cfa5b0 100644 --- a/modules/db_flatstore/doc/functions.xml +++ b/modules/db_flatstore/doc/functions.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4//EN" - "file:///usr/share/sgml/docbook/dtd/xml/4/docbookx.dtd"> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <section id="flatstore.functions" xmlns:xi="http://www.w3.org/2001/XInclude"> <sectioninfo> diff --git a/modules/db_flatstore/doc/params.xml b/modules/db_flatstore/doc/params.xml index a6d838e..deda40a 100644 --- a/modules/db_flatstore/doc/params.xml +++ b/modules/db_flatstore/doc/params.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4//EN" - "file:///usr/share/sgml/docbook/dtd/xml/4/docbookx.dtd"> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <section id="flatstore.functions" xmlns:xi="http://www.w3.org/2001/XInclude"> <sectioninfo>

15 years, 3 months

git:janakj/flatstore: - module interface exended with list of management functions

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: f23bee385c2e3740b918d970438bf98f9fbfddef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f23bee3… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Dec 13 00:19:29 2005 +0000 - module interface exended with list of management functions --- modules/db_flatstore/flatstore_mod.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index 68813cb..e14daaf 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -97,6 +97,7 @@ static param_export_t params[] = { struct module_exports exports = { "flatstore", cmds, + 0, /* RPC methods */ params, /* module parameters */ mod_init, /* module initialization function */ 0, /* response function*/

15 years, 3 months

git:janakj/flatstore: - converted to the new management interface

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 2082c79321a51dff1de6bb64b9b74363f744f6b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2082c79… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Dec 20 11:36:33 2005 +0000 - converted to the new management interface --- modules/db_flatstore/{flat_fifo.c => flat_rpc.c} | 48 ++++++---------------- modules/db_flatstore/{flat_fifo.h => flat_rpc.h} | 17 +++----- modules/db_flatstore/flatstore_mod.c | 12 +---- 3 files changed, 23 insertions(+), 54 deletions(-) diff --git a/modules/db_flatstore/flat_fifo.c b/modules/db_flatstore/flat_rpc.c similarity index 58% rename from modules/db_flatstore/flat_fifo.c rename to modules/db_flatstore/flat_rpc.c index bd273a6..f861ea0 100644 --- a/modules/db_flatstore/flat_fifo.c +++ b/modules/db_flatstore/flat_rpc.c @@ -1,7 +1,7 @@ /* * $Id$ * - * Flatstore module FIFO interface + * Flatstore module interface * * Copyright (C) 2004 FhG Fokus * @@ -27,45 +27,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../../dprint.h" -#include "../../fifo_server.h" #include "flatstore_mod.h" -#include "flat_fifo.h" +#include "flat_rpc.h" -#define FLAT_ROTATE "flat_rotate" -#define FLAT_ROTATE_LEN (sizeof(FLAT_ROTATE) - 1) - - -static int flat_rotate_cmd(FILE* pipe, char* response_file); - - -/* - * Initialize the FIFO interface - */ -int init_flat_fifo(void) +static void rotate(rpc_t* rpc, void* c) { - if (register_fifo_cmd(flat_rotate_cmd, FLAT_ROTATE, 0) < 0) { - LOG(L_CRIT, "flatstore: Cannot register flat_rotate\n"); - return -1; - } - - return 0; + *flat_rotate = time(0); } -static int flat_rotate_cmd(FILE* pipe, char* response_file) -{ - FILE* reply_file; - - reply_file = open_reply_pipe(response_file); - if (reply_file == 0) { - LOG(L_ERR, "flat_rotate_cmd: File not open\n"); - return -1; - } +static const char* flat_rotate_doc[2] = { + "Close and reopen flatrotate files during log rotation.", + 0 +}; - *flat_rotate = time(0); - fputs( "200 OK\n", reply_file); - fclose(reply_file); - return 1; -} + +rpc_export_t flat_rpc[] = { + {"flatstore.rotate", rotate, flat_rotate_doc, 0}, + {0, 0, 0, 0}, +}; diff --git a/modules/db_flatstore/flat_fifo.h b/modules/db_flatstore/flat_rpc.h similarity index 83% rename from modules/db_flatstore/flat_fifo.h rename to modules/db_flatstore/flat_rpc.h index e746574..592da1f 100644 --- a/modules/db_flatstore/flat_fifo.h +++ b/modules/db_flatstore/flat_rpc.h @@ -1,9 +1,9 @@ /* * $Id$ * - * Flatstore module FIFO interface + * Flatstore module interface * - * Copyright (C) 2004 FhG Fokus + * Copyright (C) 2004-2005 FhG FOKUS * * This file is part of ser, a free SIP server. * @@ -27,14 +27,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _FLAT_FIFO_H -#define _FLAT_FIFO_H - -/* - * Initialize the FIFO interface - */ -int init_flat_fifo(void); +#ifndef _FLAT_RPC_H +#define _FLAT_RPC_H +#include "../../rpc.h" -#endif /* _FLAT_FIFO_H */ +extern rpc_export_t flat_rpc[]; +#endif /* _FLAT_RPC_H */ diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index e14daaf..4a2ca2b 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -36,7 +36,7 @@ #include "../../sr_module.h" #include "../../mem/shm_mem.h" #include "flatstore.h" -#include "flat_fifo.h" +#include "flat_rpc.h" #include "flatstore_mod.h" MODULE_VERSION @@ -97,7 +97,7 @@ static param_export_t params[] = { struct module_exports exports = { "flatstore", cmds, - 0, /* RPC methods */ + flat_rpc, /* RPC methods */ params, /* module parameters */ mod_init, /* module initialization function */ 0, /* response function*/ @@ -114,12 +114,6 @@ static int mod_init(void) return -1; } - /* Initialize fifo interface */ - if (init_flat_fifo() < 0) { - LOG(L_ERR, "flatstore: FIFO initialization failed\n"); - return -1; - } - flat_rotate = (time_t*)shm_malloc(sizeof(time_t)); if (!flat_rotate) { LOG(L_ERR, "flatstore: No shared memory left\n"); @@ -144,7 +138,7 @@ static int child_init(int rank) if (rank <= 0) { flat_pid = - rank; } else { - flat_pid = rank - PROC_UNIXSOCK; + flat_pid = rank - PROC_MIN; } return 0; }

15 years, 3 months

git:janakj/flatstore: - added record delimiter and escape char params

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: fd142b4aa5797786db9261b60dea295c6576e7a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd142b4… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Fri Jan 6 23:55:14 2006 +0000 - added record delimiter and escape char params - escaping of delimiters in text - zero delimiter supported via empty string delimiter param --- modules/db_flatstore/flat_con.c | 14 ++-- modules/db_flatstore/flatstore.c | 106 ++++++++++++++++++++++------------ modules/db_flatstore/flatstore_mod.c | 39 ++++++++++--- modules/db_flatstore/flatstore_mod.h | 21 +++++-- 4 files changed, 120 insertions(+), 60 deletions(-) diff --git a/modules/db_flatstore/flat_con.c b/modules/db_flatstore/flat_con.c index e148429..392b9c3 100644 --- a/modules/db_flatstore/flat_con.c +++ b/modules/db_flatstore/flat_con.c @@ -1,4 +1,4 @@ -/* +/* * $Id$ * * Flastore module connection structure @@ -22,8 +22,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -59,7 +59,7 @@ static char* get_name(struct flat_id* id) total_len, buf_len); return 0; } - + buf=pkg_malloc(buf_len); if (buf==0){ LOG(L_ERR, "ERROR: get_name: memory allocation failure\n"); @@ -76,7 +76,7 @@ static char* get_name(struct flat_id* id) ptr += id->table.len; *ptr++ = '_'; - + num = int2str(flat_pid, &num_len); if (buf_len<(total_len+num_len)){ LOG(L_ERR, "ERROR: get_name: the path is too long (%d and PATHMAX is" @@ -114,7 +114,7 @@ struct flat_con* flat_new_connection(struct flat_id* id) memset(res, 0, sizeof(struct flat_con)); res->ref = 1; - + res->id = id; fn = get_name(id); @@ -130,7 +130,7 @@ struct flat_con* flat_new_connection(struct flat_id* id) pkg_free(res); return 0; } - + return res; } diff --git a/modules/db_flatstore/flatstore.c b/modules/db_flatstore/flatstore.c index 8b7bfc2..a69c321 100644 --- a/modules/db_flatstore/flatstore.c +++ b/modules/db_flatstore/flatstore.c @@ -1,5 +1,5 @@ -/* - * $Id$ +/* + * $Id$ * * Flatstore module interface * @@ -22,8 +22,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* @@ -52,7 +52,7 @@ static int parse_flat_url(const char* url, const char** path) } len = strlen(url); - + *path = strchr(url, ':') + 1; return 0; } @@ -121,7 +121,7 @@ int flat_use_table(db_con_t* h, const char* t) return -1; } } - + return 0; } @@ -155,6 +155,8 @@ int flat_db_insert(db_con_t* h, db_key_t* k, db_val_t* v, int n) { FILE* f; int i; + char delims[4], *s; + size_t len; f = CON_FILE(h); if (!f) { @@ -168,42 +170,72 @@ int flat_db_insert(db_con_t* h, db_key_t* k, db_val_t* v, int n) } for(i = 0; i < n; i++) { - switch(VAL_TYPE(v + i)) { - case DB_INT: - fprintf(f, "%d", VAL_INT(v + i)); - break; - - case DB_DOUBLE: - fprintf(f, "%f", VAL_DOUBLE(v + i)); - break; - - case DB_STRING: - fprintf(f, "%s", VAL_STRING(v + i)); - break; - - case DB_STR: - fprintf(f, "%.*s", VAL_STR(v + i).len, VAL_STR(v + i).s); - break; - - case DB_DATETIME: - fprintf(f, "%u", (unsigned int)VAL_TIME(v + i)); - break; - - case DB_BLOB: - LOG(L_ERR, "flastore: Blobs not supported\n"); - break; - - case DB_BITMAP: - fprintf(f, "%u", VAL_BITMAP(v + i)); - break; - } + if (!VAL_NULL(v + i)) { // TODO: how to distinguish NULL from empty + switch(VAL_TYPE(v + i)) { + case DB_INT: + fprintf(f, "%d", VAL_INT(v + i)); + break; + + case DB_DOUBLE: + fprintf(f, "%f", VAL_DOUBLE(v + i)); + break; + + case DB_STRING: { + s = (char*) VAL_STRING(v + i); + delims[0] = flat_delimiter[0]; + delims[1] = flat_record_delimiter[0]; + delims[2] = flat_escape[0]; + delims[3] = '\0'; + while (*s) { + len = strcspn(s, delims); + fprintf(f, "%.*s", len, s); + s+= len; + if (*s) { + fprintf(f, "%c%c", flat_escape[0], *s); + s++; + } + } + break; + } + case DB_STR: + case DB_BLOB: + if (VAL_TYPE(v + i) == DB_STR) { + s = VAL_STR(v + i).s; + len = VAL_STR(v + i).len; + } + else { + s = VAL_BLOB(v + i).s; + len = VAL_BLOB(v + i).len; + } + while (len > 0) { + char *c; + for (c = s; len > 0 && *c != flat_delimiter[0] && *c != flat_record_delimiter[0] && *c != flat_escape[0]; c++, len--); + fprintf(f, "%.*s", c-s, s); + s = c; + if (len > 0) { + fprintf(f, "%c%c", flat_escape[0], *s); + s++; + len--; + } + } + break; + + case DB_DATETIME: + fprintf(f, "%u", (unsigned int)VAL_TIME(v + i)); + break; + + case DB_BITMAP: + fprintf(f, "%u", VAL_BITMAP(v + i)); + break; + } + } if (i < (n - 1)) { - fprintf(f, "%c", *flat_delimiter); + fprintf(f, "%c", flat_delimiter[0]); } } - fprintf(f, "\n"); + fprintf(f, "%c", flat_record_delimiter[0]); if (flat_flush) { fflush(f); diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index 4a2ca2b..54b280a 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -1,5 +1,5 @@ -/* - * $Id$ +/* + * $Id$ * * Flatstore module interface * @@ -22,8 +22,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* @@ -58,18 +58,26 @@ int flat_pid; */ int flat_flush = 1; +/* + * Delimiter delimiting rows + */ +char *flat_record_delimiter = "\n"; /* * Delimiter delimiting columns */ -char* flat_delimiter = "|"; +char *flat_delimiter = "|"; +/* + * Escape char escaping delimiters + */ +char *flat_escape = "\\"; /* * Timestamp of the last log rotation request from * the FIFO interface */ -time_t* flat_rotate; +time_t* flat_rotate; time_t local_timestamp; @@ -90,11 +98,14 @@ static cmd_export_t cmds[] = { */ static param_export_t params[] = { {"flush", INT_PARAM, &flat_flush}, + {"field_delimiter", STR_PARAM, &flat_delimiter}, + {"record_delimiter", STR_PARAM, &flat_record_delimiter}, + {"escape_char", STR_PARAM, &flat_escape}, {0, 0, 0} }; -struct module_exports exports = { +struct module_exports exports = { "flatstore", cmds, flat_rpc, /* RPC methods */ @@ -109,8 +120,18 @@ struct module_exports exports = { static int mod_init(void) { - if (strlen(flat_delimiter) != 1) { - LOG(L_ERR, "flatstore:mod_init: Delimiter has to be exactly one character\n"); + if (strlen(flat_delimiter) > 1) { + LOG(L_ERR, "flatstore:mod_init: Column delimiter has to be max. one character\n"); + return -1; + } + + if (strlen(flat_record_delimiter) > 1) { + LOG(L_ERR, "flatstore:mod_init: Record delimiter has to be max. one character\n"); + return -1; + } + + if (strlen(flat_escape) > 0) { + LOG(L_ERR, "flatstore:mod_init: Escape char has to be max. one character\n"); return -1; } diff --git a/modules/db_flatstore/flatstore_mod.h b/modules/db_flatstore/flatstore_mod.h index 83bc593..3632ecb 100644 --- a/modules/db_flatstore/flatstore_mod.h +++ b/modules/db_flatstore/flatstore_mod.h @@ -1,5 +1,5 @@ -/* - * $Id$ +/* + * $Id$ * * Flatstore module interface * @@ -22,8 +22,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* @@ -43,18 +43,25 @@ */ extern int flat_pid; - /* * Should we flush after each write to the database ? */ extern int flat_flush; +/* + * Delimiter delimiting rows + */ +extern char *flat_record_delimiter; /* - * Delmiter delimiting columns + * Delimiter delimiting columns */ -extern char* flat_delimiter; +extern char *flat_delimiter; +/* + * Escape char escaning delimiters and itself + */ +extern char *flat_escape; /* * The timestamp of log rotation request from

15 years, 3 months

git:janakj/flatstore: - improved documentation system

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 5e3087888e64fc705a64b10aff378fc580a31cf7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e30878… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sat Jul 23 23:21:36 2005 +0000 - improved documentation system - documentation makefiles - proper documentation dependency tracking in makefiles - XML-based dialect of docbook used with xi:include inclusions --- modules/db_flatstore/doc/Makefile | 29 +++++++ modules/db_flatstore/doc/flatstore.xml | 134 ++++++++++++++++++++++++++++++++ modules/db_flatstore/doc/functions.xml | 17 ++++ modules/db_flatstore/doc/params.xml | 26 ++++++ 4 files changed, 206 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/doc/Makefile b/modules/db_flatstore/doc/Makefile new file mode 100644 index 0000000..28b668f --- /dev/null +++ b/modules/db_flatstore/doc/Makefile @@ -0,0 +1,29 @@ +# +# The list of documents to build (without extensions) +# +DOCUMENTS = flatstore + +# +# The root directory containing Makefile.doc +# +ROOT_DIR=../../.. + +# +# Validate docbook documents before generating output +# (may be slow) +# +#VALIDATE=1 + +# +# You can override the stylesheet used to generate +# xhtml documents here +# +#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl + +# +# You can override the stylesheet used to generate +# plain text documents here +# +#TXT_XSL=$(XHTML_XSL) + +include $(ROOT_DIR)/Makefile.doc diff --git a/modules/db_flatstore/doc/flatstore.xml b/modules/db_flatstore/doc/flatstore.xml new file mode 100644 index 0000000..263f28a --- /dev/null +++ b/modules/db_flatstore/doc/flatstore.xml @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4//EN" + "file:///usr/share/sgml/docbook/dtd/xml/4/docbookx.dtd"> + +<section id="flatstore" xmlns:xi="http://www.w3.org/2001/XInclude"> + <sectioninfo> + <authorgroup> + <author> + <firstname>Jan</firstname> + <surname>Janak</surname> + <affiliation><orgname>FhG FOKUS</orgname></affiliation> + <email>jan(a)iptel.org</email> + </author> + </authorgroup> + <copyright> + <year>2004</year> + <year>2005</year> + <holder>FhG FOKUS</holder> + </copyright> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </sectioninfo> + + <title>Flatstore Module</title> + + <section id="overview"> + <title>Overview</title> + <para> + Flatstore is one of so-called SER database modules. It does not + export any functions executable from the configuration scripts, but + it exports a subset of functions from the database API and thus + other module can use it instead of, for example, mysql module. + </para> + <para> + The module does not export all functions of the database API, it + supports only one function, insert. The module is limited but very + fast. It is especially suitable for storing accounting information + on sites with extremely high traffic. If MySQL is too slow or if + you get a huge amount of accounting data then you can consider + using this module. Note that the acc module is the only module that + was tested with flastore. + </para> + <para> + The format of the files produced by this module is plain text. Each + line consists of several fields, fields are separated by | + character. New information is always appended at the end of the + file, searching, deleting and updating of existing data is not + supported by the module. + </para> + <para> + The acc module can be configured to use flatstore module as + database backend using the db_url_parameter: + </para> + <programlisting> +modparam("acc", "db_url", "flatstore:/var/log/acc") + </programlisting> + <para> + This configuration options tells acc module that it should use the + flatstore module and the flatstore module should create all files + in /var/log/acc directory. The directory must exist and SER + processes must have permissions to create files in that directory. + </para> + <para> + Name of files in that directory will follow the following pattern: + </para> + <programlisting> +<table_name>_<process_name>.log + </programlisting> + <para> + For example, entries writen by SER process 8 into acc table would + be written in file acc_8.log. For each table there will be several + files, one file for every SER process that wrote some data into + that table. The main reason why there are several files for each + table is that it is much faster to have one file per process, + because it does not require any locking and thus SER processes will + not block each other. To get the complete data for a table you can + simply concatenate the contents of files with the same table name + but different process id. + </para> + <section id="rotating"> + <title>Rotating Log Files</title> + <para> + There is a new SER FIFO interface command called flat_rotate. + When SER receives the command then it will close and reopen all + files used by flatstore module. The rotation itself has to be + done by another application (such as logrotate). Follow these + steps to rotate files generated by flatstore module: + </para> + <itemizedlist> + <listitem> + <para> + Rename the files that you want to rotate: + <screen> +cd /var/log/acc +mv acc_1.log acc_1.log.20050605 +mv acc_2.log acc_2.log.20050605 +mv acc_4.log acc_3.log.20050605 +... + </screen> + Note that at this point SER will still be writing all + data into the renamed files. + </para> + </listitem> + <listitem> + <para> + Send SER the fifo command to close and reopen the + renamed files: + <screen> +serctl fifo flat_rotate + </screen> + This will force SER to close the renamed files and open + new ones with original names, such as + <filename>acc_1.log</filename>. New files will be open + at the point when SER has some data to write. It is + normal that the files will be not created immediately + if there is no traffic on the proxy server. + </para> + </listitem> + <listitem> + <para> + Move the renamed files somewhere else and process them. + </para> + </listitem> + </itemizedlist> + </section> + </section> + + <xi:include href="params.xml"/> + +</section> diff --git a/modules/db_flatstore/doc/functions.xml b/modules/db_flatstore/doc/functions.xml new file mode 100644 index 0000000..29dea48 --- /dev/null +++ b/modules/db_flatstore/doc/functions.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4//EN" + "file:///usr/share/sgml/docbook/dtd/xml/4/docbookx.dtd"> + +<section id="flatstore.functions" xmlns:xi="http://www.w3.org/2001/XInclude"> + <sectioninfo> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </sectioninfo> + + <title>Functions</title> + +</section> diff --git a/modules/db_flatstore/doc/params.xml b/modules/db_flatstore/doc/params.xml new file mode 100644 index 0000000..a6d838e --- /dev/null +++ b/modules/db_flatstore/doc/params.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4//EN" + "file:///usr/share/sgml/docbook/dtd/xml/4/docbookx.dtd"> + +<section id="flatstore.functions" xmlns:xi="http://www.w3.org/2001/XInclude"> + <sectioninfo> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </sectioninfo> + + <title>Parameters</title> + + <section id="flush"> + <title><varname>flush</varname> (integer)</title> + <para> + Enable or disable flushing after each write. + </para> + <para> + Default value is 1. + </para> + </section> +</section>

15 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev