sr-dev

sr-dev@lists.kamailio.org

12 participants
44193 discussions

git:janakj/flatstore: Merge commit 'cvs/head' into flatstore

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 531b59fc6e9ff1749cd29789a786dd8d328cab66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=531b59f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 18:02:28 2009 +0100 Merge commit 'cvs/head' into flatstore * commit 'cvs/head': (25 commits) - a set of minimalistic config files for testing purposes - adding missing end of doxygen group - missing READMEs added - headers moved within the doxygen section - removed unneeded libs, thanks to Marcus Better <marcus(a)better.se> - support for flatstore uris with relative pathnames (they are - wrong array index fixed - minor bug fixes - new version of flatstore module for new db api in SER 2.1 - various warning fixes - "strlen(flat_escape) > 1" fix - DB_FLOAT support - export param types adjusted to PARAM_STR/STRING & PARAM_INT - added record delimiter and escape char params - converted to the new management interface - module interface exended with list of management functions - documents are now valid (apart from xmlns:xi problem which would require - DTDs and stylesheets will be downloaded from the network if they are - improved documentation system - fixed memory leak in flat_reopen_connection, reported by ... ---

15 years, 10 months

git:janakj/flatstore: - a set of minimalistic config files for testing purposes

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 195f080acfc628fe21995f9386c0bb55e276450c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=195f080… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Jun 26 15:43:26 2008 +0000 - a set of minimalistic config files for testing purposes --- modules/db_flatstore/ser-flatstore.cfg | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/ser-flatstore.cfg b/modules/db_flatstore/ser-flatstore.cfg new file mode 100644 index 0000000..154236a --- /dev/null +++ b/modules/db_flatstore/ser-flatstore.cfg @@ -0,0 +1,22 @@ +# +# Minimalistic configuration file for SER which can be used +# to test the flatstore SER module. +# +debug = 4 +fork = no +children = 1 +log_stderror = yes + +loadpath "./modules" + +loadmodule "flatstore" +loadmodule "sl" +loadmodule "tm" +loadmodule "acc_db" + +modparam("acc_db", "db_url", "flatstore:/tmp") + +route { + acc_db_log(); + break; +}

15 years, 10 months

git:janakj/flatstore: Make the module compile in the sip-router source tree .

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 536ced2783aa223bbabd10682df04c6eff7a47b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=536ced2… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 18:45:58 2009 +0100 Make the module compile in the sip-router source tree. --- modules/db_flatstore/Makefile | 5 +++++ modules/db_flatstore/flat_cmd.h | 4 ++-- modules/db_flatstore/flat_con.h | 6 +++--- modules/db_flatstore/flat_uri.h | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/db_flatstore/Makefile b/modules/db_flatstore/Makefile index 661f1b8..8bbf2e4 100644 --- a/modules/db_flatstore/Makefile +++ b/modules/db_flatstore/Makefile @@ -7,4 +7,9 @@ auto_gen= NAME=flatstore.so LIBS= +DEFS += -DSER_MOD_INTERFACE + +SERLIBPATH=../../lib +SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 + include ../../Makefile.modules diff --git a/modules/db_flatstore/flat_cmd.h b/modules/db_flatstore/flat_cmd.h index e27e344..9ae33cb 100644 --- a/modules/db_flatstore/flat_cmd.h +++ b/modules/db_flatstore/flat_cmd.h @@ -33,8 +33,8 @@ * Inmplementation of flatstore commands. */ -#include "../../db/db_drv.h" -#include "../../db/db_cmd.h" +#include "../../lib/srdb2/db_drv.h" +#include "../../lib/srdb2/db_cmd.h" /** Extension structure of db_cmd adding flatstore specific data. diff --git a/modules/db_flatstore/flat_con.h b/modules/db_flatstore/flat_con.h index f71666c..7826cc7 100644 --- a/modules/db_flatstore/flat_con.h +++ b/modules/db_flatstore/flat_con.h @@ -33,9 +33,9 @@ * Inmplementation of flatstore "connections". */ -#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 <stdio.h> diff --git a/modules/db_flatstore/flat_uri.h b/modules/db_flatstore/flat_uri.h index 2cb251a..d15d417 100644 --- a/modules/db_flatstore/flat_uri.h +++ b/modules/db_flatstore/flat_uri.h @@ -32,8 +32,8 @@ * The functions parsing and interpreting flatstore: URIs. */ -#include "../../db/db_uri.h" -#include "../../db/db_drv.h" +#include "../../lib/srdb2/db_uri.h" +#include "../../lib/srdb2/db_drv.h" /** Flatstore driver specific payload to attach to db_uri structures. * This is the flatstore specific structure that will be attached to generic

15 years, 10 months

git:janakj/flatstore: Renamed to db_flatstore.

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: d3ab43c94940fade1ab805ddb8245d36bd314bbf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3ab43c… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 18:48:50 2009 +0100 Renamed to db_flatstore. --- modules/db_flatstore/Makefile | 2 +- modules/db_flatstore/flatstore_mod.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_flatstore/Makefile b/modules/db_flatstore/Makefile index 8bbf2e4..12e2d5f 100644 --- a/modules/db_flatstore/Makefile +++ b/modules/db_flatstore/Makefile @@ -4,7 +4,7 @@ include ../../Makefile.defs auto_gen= -NAME=flatstore.so +NAME=db_flatstore.so LIBS= DEFS += -DSER_MOD_INTERFACE diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index a64dc73..78c29e8 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -126,7 +126,7 @@ static param_export_t params[] = { struct module_exports exports = { - "flatstore", + "db_flatstore", cmds, flat_rpc, /* RPC methods */ params, /* module parameters */

15 years, 10 months

git:janakj/flatstore: Very simple module that implement very fast inserts. Each process opens

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: ecbabeb09b1a7dd1f8e7fe21d91217d27ba0cefe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecbabeb… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Oct 8 19:18:35 2004 +0000 Very simple module that implement very fast inserts. Each process opens its own file (no locking, distinguished by the number of the ser child), only inserts are supported, the data is stored in plaintext files. The main purpose of the module is to implement very fast accounting without relying on a backend database. ---

15 years, 10 months

git:janakj/flatstore: FIFO interface for log file rotation.

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: faac0ca2434db223299ad8e1271cbaa31bd00004 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=faac0ca… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sat Oct 9 14:30:27 2004 +0000 FIFO interface for log file rotation. --- modules/db_flatstore/flat_con.c | 76 ++++++++++++++++++++++++++------- modules/db_flatstore/flat_con.h | 6 +++ modules/db_flatstore/flat_pool.c | 20 +++++++++ modules/db_flatstore/flat_pool.h | 12 +++++ modules/db_flatstore/flatstore.c | 5 ++ modules/db_flatstore/flatstore_mod.c | 47 ++++++++++++++++++--- modules/db_flatstore/flatstore_mod.h | 15 +++++++ 7 files changed, 159 insertions(+), 22 deletions(-) diff --git a/modules/db_flatstore/flat_con.c b/modules/db_flatstore/flat_con.c index f8db134..cd5b5c9 100644 --- a/modules/db_flatstore/flat_con.c +++ b/modules/db_flatstore/flat_con.c @@ -39,29 +39,18 @@ #define FILE_SUFFIX ".log" #define FILE_SUFFIX_LEN (sizeof(FILE_SUFFIX) - 1) -struct flat_con* flat_new_connection(struct flat_id* id) + +static char* get_name(struct flat_id* id) { - char buf[PATH_MAX]; + static char buf[PATH_MAX]; char* num, *ptr; int num_len; - struct flat_con* res; - if (!id) { - LOG(L_ERR, "flat_new_connection: Invalid parameter value\n"); - return 0; - } - - res = (struct flat_con*)pkg_malloc(sizeof(struct flat_con)); - if (!res) { - LOG(L_ERR, "flat_new_connection: No memory left\n"); + LOG(L_ERR, "get_name: Invalid parameter value\n"); return 0; } - memset(res, 0, sizeof(struct flat_con)); - res->ref = 1; - - res->id = id; ptr = buf; memcpy(ptr, id->dir.s, id->dir.len); @@ -81,8 +70,35 @@ struct flat_con* flat_new_connection(struct flat_id* id) ptr += FILE_SUFFIX_LEN; *ptr = '\0'; + return buf; +} + + +struct flat_con* flat_new_connection(struct flat_id* id) +{ + char* fn; + + struct flat_con* res; + + if (!id) { + LOG(L_ERR, "flat_new_connection: Invalid parameter value\n"); + return 0; + } - res->file = fopen(buf, "w"); + res = (struct flat_con*)pkg_malloc(sizeof(struct flat_con)); + if (!res) { + LOG(L_ERR, "flat_new_connection: No memory left\n"); + return 0; + } + + memset(res, 0, sizeof(struct flat_con)); + res->ref = 1; + + res->id = id; + + fn = get_name(id); + + res->file = fopen(fn, "w"); if (!res->file) { LOG(L_ERR, "flat_new_connection: %s\n", strerror(errno)); pkg_free(res); @@ -105,3 +121,31 @@ void flat_free_connection(struct flat_con* con) } pkg_free(con); } + + +/* + * Reopen a connection + */ +int flat_reopen_connection(struct flat_con* con) +{ + char* fn; + + if (!con) { + LOG(L_ERR, "flat_reopen_connection: Invalid parameter value\n"); + return -1; + } + + if (con->file) { + fclose(con->file); + + fn = get_name(con->id); + + con->file = fopen(fn, "w"); + if (!con->file) { + LOG(L_ERR, "flat_reopen_connection: Invalid parameter value\n"); + return -1; + } + } + + return 0; +} diff --git a/modules/db_flatstore/flat_con.h b/modules/db_flatstore/flat_con.h index c075a07..341b2bd 100644 --- a/modules/db_flatstore/flat_con.h +++ b/modules/db_flatstore/flat_con.h @@ -61,4 +61,10 @@ struct flat_con* flat_new_connection(struct flat_id* id); void flat_free_connection(struct flat_con* con); +/* + * Reopen a connection + */ +int flat_reopen_connection(struct flat_con* con); + + #endif /* _FLAT_CON_H */ diff --git a/modules/db_flatstore/flat_pool.c b/modules/db_flatstore/flat_pool.c index da213cf..fadc472 100644 --- a/modules/db_flatstore/flat_pool.c +++ b/modules/db_flatstore/flat_pool.c @@ -44,6 +44,7 @@ static struct flat_con* pool = 0; static int pool_pid; + /* * Get a connection from the pool, reuse existing * if possible, otherwise create a new one @@ -134,3 +135,22 @@ void flat_release_connection(struct flat_con* con) flat_free_connection(con); } + + +/* + * Close and reopen all opened connections + */ +int flat_rotate_logs(void) +{ + struct flat_con* ptr; + + ptr = pool; + while(ptr) { + if (flat_reopen_connection(ptr)) { + return -1; + } + ptr = ptr->next; + } + + return 0; +} diff --git a/modules/db_flatstore/flat_pool.h b/modules/db_flatstore/flat_pool.h index 955ae8b..3d6fc27 100644 --- a/modules/db_flatstore/flat_pool.h +++ b/modules/db_flatstore/flat_pool.h @@ -47,4 +47,16 @@ struct flat_con* flat_get_connection(char* dir, char* table); void flat_release_connection(struct flat_con* con); +/* + * Close and reopen all opened connections + */ +int flat_rotate_logs(void); + + +/* + * Reopen a connection + */ +int flat_reopen_connection(struct flat_con* con); + + #endif /* _FLAT_POOL_H */ diff --git a/modules/db_flatstore/flatstore.c b/modules/db_flatstore/flatstore.c index ffe8027..8b7bfc2 100644 --- a/modules/db_flatstore/flatstore.c +++ b/modules/db_flatstore/flatstore.c @@ -162,6 +162,11 @@ int flat_db_insert(db_con_t* h, db_key_t* k, db_val_t* v, int n) return -1; } + if (local_timestamp < *flat_rotate) { + flat_rotate_logs(); + local_timestamp = *flat_rotate; + } + for(i = 0; i < n; i++) { switch(VAL_TYPE(v + i)) { case DB_INT: diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index a7106a3..d281992 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -34,7 +34,9 @@ */ #include "../../sr_module.h" +#include "../../mem/shm_mem.h" #include "flatstore.h" +#include "flat_fifo.h" #include "flatstore_mod.h" MODULE_VERSION @@ -43,6 +45,9 @@ static int child_init(int rank); static int mod_init(void); +static void mod_destroy(void); + + /* * Process number used in filenames */ @@ -61,6 +66,14 @@ char* flat_delimiter = "|"; /* + * Timestamp of the last log rotation request from + * the FIFO interface + */ +time_t* flat_rotate; + +time_t local_timestamp; + +/* * Flatstore database module interface */ static cmd_export_t cmds[] = { @@ -84,12 +97,12 @@ static param_export_t params[] = { struct module_exports exports = { "flatstore", cmds, - params, /* module parameters */ - mod_init, /* module initialization function */ - 0, /* response function*/ - 0, /* destroy function */ - 0, /* oncancel function */ - child_init /* per-child init function */ + params, /* module parameters */ + mod_init, /* module initialization function */ + 0, /* response function*/ + mod_destroy, /* destroy function */ + 0, /* oncancel function */ + child_init /* per-child init function */ }; @@ -99,10 +112,32 @@ static int mod_init(void) LOG(L_ERR, "flatstore:mod_init: Delimiter has to be exactly one character\n"); return -1; } + + /* Initialize fifo interface */ + if (init_flat_fifo() < 0) { + LOG(L_ERR, "usrloc/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"); + return -1; + } + + *flat_rotate = time(0); + local_timestamp = *flat_rotate; + return 0; } +static void mod_destroy(void) +{ + if (flat_rotate) shm_free(flat_rotate); +} + + static int child_init(int rank) { if (rank <= 0) { diff --git a/modules/db_flatstore/flatstore_mod.h b/modules/db_flatstore/flatstore_mod.h index 24ea2f5..83bc593 100644 --- a/modules/db_flatstore/flatstore_mod.h +++ b/modules/db_flatstore/flatstore_mod.h @@ -36,6 +36,7 @@ #ifndef FLATSTORE_MOD_H #define FLATSTORE_MOD_H +#include <time.h> /* * Process number used in filenames @@ -55,4 +56,18 @@ extern int flat_flush; extern char* flat_delimiter; +/* + * The timestamp of log rotation request from + * the FIFO interface + */ +extern time_t* flat_rotate; + + +/* + * Local timestamp marking the time of the + * last log rotation in the process + */ +extern time_t local_timestamp; + + #endif /* FLATSTORE_MOD_H */

15 years, 10 months

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, 10 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, 10 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, 10 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, 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