sr-dev

sr-dev@lists.kamailio.org

13 participants
43416 discussions

git:janakj/ldap: Merge branches 'janakj/ldap' and 'master' of ssh://janakj@ git.sip-router.org/sip-router into ldap

by Jan Janak

Module: sip-router Branch: janakj/ldap Commit: e0948f9696158d1a7a8bf9255db701e150eaba0a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e0948f9… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 01:05:39 2009 +0100 Merge branches 'janakj/ldap' and 'master' of ssh://janakj@git.sip-router.org/sip-router into ldap * 'janakj/ldap' of ssh://janakj@git.sip-router.org/sip-router: * 'master' of ssh://janakj@git.sip-router.org/sip-router: Database flags renamed from DB_* to SRDB_* to avoid conflicts. libsrdb1: futex warning fix - port from kamailio trunk, r5607 - sync transformations add/lookup with kamailio init_mi_core() exported via mi.h mi include file MI: core part script parsing: while support script engine: while() support script engine: switch() and break execution script engine: switch() fixup and optimizations script parsing: C style switch() & case support expr engine: minor additions ---

15 years, 7 months

git:janakj/flatstore: - export param types adjusted to PARAM_STR/ STRING & PARAM_INT

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 73ebd9245377bbdb0b12930120796f0f80a81092 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73ebd92… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Sun Jan 8 22:43:14 2006 +0000 - export param types adjusted to PARAM_STR/STRING & PARAM_INT - removed corresponding obsolete strlen(str_param) in init --- modules/db_flatstore/flatstore_mod.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index 54b280a..d4576e3 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -97,10 +97,10 @@ static cmd_export_t cmds[] = { * Exported parameters */ 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}, + {"flush", PARAM_INT, &flat_flush}, + {"field_delimiter", PARAM_STRING, &flat_delimiter}, + {"record_delimiter", PARAM_STRING, &flat_record_delimiter}, + {"escape_char", PARAM_STRING, &flat_escape}, {0, 0, 0} };

15 years, 7 months

git:janakj/flatstore: - DB_FLOAT support

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 55cb27d3868e20eb7b8a2d3d86a1e33e23dd03e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55cb27d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Jan 10 22:16:07 2006 +0000 - DB_FLOAT support - fixed error in params_add in postgres module --- modules/db_flatstore/flatstore.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/flatstore.c b/modules/db_flatstore/flatstore.c index a69c321..1e77989 100644 --- a/modules/db_flatstore/flatstore.c +++ b/modules/db_flatstore/flatstore.c @@ -177,6 +177,10 @@ int flat_db_insert(db_con_t* h, db_key_t* k, db_val_t* v, int n) fprintf(f, "%d", VAL_INT(v + i)); break; + case DB_FLOAT: + fprintf(f, "%f", VAL_FLOAT(v + i)); + break; + case DB_DOUBLE: fprintf(f, "%f", VAL_DOUBLE(v + i)); break;

15 years, 7 months

git:janakj/flatstore: - various warning fixes

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: a543b3fe09b5cd5841e635e08cad4df9eb7bf60c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a543b3f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 7 19:52:38 2006 +0000 - various warning fixes --- modules/db_flatstore/flatstore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_flatstore/flatstore.c b/modules/db_flatstore/flatstore.c index 1e77989..4760f8c 100644 --- a/modules/db_flatstore/flatstore.c +++ b/modules/db_flatstore/flatstore.c @@ -193,7 +193,7 @@ int flat_db_insert(db_con_t* h, db_key_t* k, db_val_t* v, int n) delims[3] = '\0'; while (*s) { len = strcspn(s, delims); - fprintf(f, "%.*s", len, s); + fprintf(f, "%.*s", (int)len, s); s+= len; if (*s) { fprintf(f, "%c%c", flat_escape[0], *s); @@ -215,7 +215,7 @@ int flat_db_insert(db_con_t* h, db_key_t* k, db_val_t* v, int n) 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); + fprintf(f, "%.*s", (int)(c-s), s); s = c; if (len > 0) { fprintf(f, "%c%c", flat_escape[0], *s);

15 years, 7 months

git:janakj/flatstore: - "strlen(flat_escape) > 1" fix

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: e212931846b91010d5331a9982eeb49637dd2c5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e212931… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Sun Jan 29 12:31:57 2006 +0000 - "strlen(flat_escape) > 1" fix --- modules/db_flatstore/flatstore_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index d4576e3..462f993 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -130,7 +130,7 @@ static int mod_init(void) return -1; } - if (strlen(flat_escape) > 0) { + if (strlen(flat_escape) > 1) { LOG(L_ERR, "flatstore:mod_init: Escape char has to be max. one character\n"); return -1; }

15 years, 7 months

git:janakj/flatstore: - new version of flatstore module for new db api in SER 2.1

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 3e87a030beddd8b55885bc1c1036e7571391afe7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e87a03… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue May 27 00:22:02 2008 +0000 - new version of flatstore module for new db api in SER 2.1 --- modules/db_flatstore/flat_cmd.c | 216 +++++++++++++++++++ modules/db_flatstore/flat_cmd.h | 75 +++++++ modules/db_flatstore/flat_con.c | 377 ++++++++++++++++++++++------------ modules/db_flatstore/flat_con.h | 108 ++++++---- modules/db_flatstore/flat_id.c | 87 -------- modules/db_flatstore/flat_id.h | 60 ------ modules/db_flatstore/flat_pool.c | 156 -------------- modules/db_flatstore/flat_pool.h | 62 ------ modules/db_flatstore/flat_rpc.c | 58 +++-- modules/db_flatstore/flat_rpc.h | 49 +++-- modules/db_flatstore/flatstore.c | 249 ---------------------- modules/db_flatstore/flatstore.h | 71 ------- modules/db_flatstore/flatstore_mod.c | 189 +++++++++++------- modules/db_flatstore/flatstore_mod.h | 93 +++------ 14 files changed, 812 insertions(+), 1038 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3e8…

15 years, 7 months

git:janakj/flatstore: - wrong array index fixed

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: c42475fa6365df41b62522bd712b627ff2bd5516 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c42475f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sat May 31 17:29:39 2008 +0000 - wrong array index fixed --- modules/db_flatstore/flat_con.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_flatstore/flat_con.c b/modules/db_flatstore/flat_con.c index 450b66b..3697cfd 100644 --- a/modules/db_flatstore/flat_con.c +++ b/modules/db_flatstore/flat_con.c @@ -274,7 +274,7 @@ int flat_open_table(int* idx, db_con_t* con, str* name) return -1; } } else { - new[fcon->n].f = NULL; + new->f = NULL; } *idx = fcon->n - 1;

15 years, 7 months

git:janakj/flatstore: - minor bug fixes

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 4367ae5803d35800f7a7661ae69d99b4f7236367 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4367ae5… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue May 27 11:56:12 2008 +0000 - minor bug fixes --- modules/db_flatstore/flat_con.c | 5 +++-- modules/db_flatstore/flatstore_mod.c | 9 --------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/modules/db_flatstore/flat_con.c b/modules/db_flatstore/flat_con.c index 2e6d1d2..450b66b 100644 --- a/modules/db_flatstore/flat_con.c +++ b/modules/db_flatstore/flat_con.c @@ -211,7 +211,7 @@ static char* get_filename(str* dir, str* name) *p++ = '/'; memcpy(p, name->s, name->len); - *p += name->len; + p += name->len; *p++ = '_'; @@ -281,7 +281,8 @@ int flat_open_table(int* idx, db_con_t* con, str* name) } else { *idx = i; } - + DBG("flatstore: Handle to file '%s' opened successfully\n", + fcon->file[*idx].filename); return 0; no_mem: diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index 7d8a288..8a27740 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -105,18 +105,9 @@ time_t flat_local_timestamp; /* Flatstore database module interface */ static cmd_export_t cmds[] = { - {"db_ctx", (cmd_function)NULL, 0, 0, 0}, {"db_con", (cmd_function)flat_con, 0, 0, 0}, - {"db_uri", (cmd_function)NULL, 0, 0, 0}, {"db_cmd", (cmd_function)flat_cmd, 0, 0, 0}, {"db_put", (cmd_function)flat_put, 0, 0, 0}, - {"db_del", (cmd_function)NULL, 0, 0, 0}, - {"db_get", (cmd_function)NULL, 0, 0, 0}, - {"db_upd", (cmd_function)NULL, 0, 0, 0}, - {"db_sql", (cmd_function)NULL, 0, 0, 0}, - {"db_fld", (cmd_function)NULL, 0, 0, 0}, - {"db_setopt", (cmd_function)NULL, 0, 0, 0}, - {"db_getopt", (cmd_function)NULL, 0, 0, 0}, {0, 0, 0, 0, 0} };

15 years, 7 months

git:janakj/flatstore: - support for flatstore uris with relative pathnames (they are

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 6fe11123ef7ae7f95a62bc0ef20969ba03483d3d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fe1112… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Jun 1 10:00:59 2008 +0000 - support for flatstore uris with relative pathnames (they are converted to absolute with respect to the main ser config file) - todo list added --- modules/db_flatstore/flat_con.c | 5 ++- modules/db_flatstore/flat_uri.c | 80 ++++++++++++++++++++++++++++++++++ modules/db_flatstore/flat_uri.h | 62 ++++++++++++++++++++++++++ modules/db_flatstore/flatstore_mod.c | 8 ++- modules/db_flatstore/todo.txt | 2 + 5 files changed, 153 insertions(+), 4 deletions(-) diff --git a/modules/db_flatstore/flat_con.c b/modules/db_flatstore/flat_con.c index 3697cfd..0b20131 100644 --- a/modules/db_flatstore/flat_con.c +++ b/modules/db_flatstore/flat_con.c @@ -32,6 +32,7 @@ #include "flat_con.h" #include "flatstore_mod.h" +#include "flat_uri.h" #include "../../mem/mem.h" #include "../../dprint.h" @@ -229,6 +230,7 @@ static char* get_filename(str* dir, str* name) int flat_open_table(int* idx, db_con_t* con, str* name) { + struct flat_uri* furi; struct flat_con* fcon; struct flat_file* new; int i; @@ -238,6 +240,7 @@ int flat_open_table(int* idx, db_con_t* con, str* name) filename = NULL; table = NULL; fcon = DB_GET_PAYLOAD(con); + furi = DB_GET_PAYLOAD(con->uri); for(i = 0; i < fcon->n; i++) { if (name->len == fcon->file[i].table.len && @@ -249,7 +252,7 @@ int flat_open_table(int* idx, db_con_t* con, str* name) * fcon->file, so that we can fail gracefully if one of the * operations fail. */ - if ((filename = get_filename(&con->uri->body, name)) == NULL) + if ((filename = get_filename(&furi->path, name)) == NULL) goto no_mem; if ((table = pkg_malloc(name->len)) == NULL) goto no_mem; diff --git a/modules/db_flatstore/flat_uri.c b/modules/db_flatstore/flat_uri.c new file mode 100644 index 0000000..05005f3 --- /dev/null +++ b/modules/db_flatstore/flat_uri.c @@ -0,0 +1,80 @@ +/* + * $Id$ + * + * Copyright (C) 2008 iptelorg GmbH + * Written by Jan Janak <jan(a)iptel.org> + * + * 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. + * + * 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 + */ + +/** \addtogroup flatstore + * @{ + */ + +/** \file + * The implementation of parser parsing flatstore:.. URIs. + */ + +#include "flat_uri.h" + +#include "../../mem/mem.h" +#include "../../ut.h" + +#include <stdlib.h> +#include <string.h> + + +static void flat_uri_free(db_uri_t* uri, struct flat_uri* payload) +{ + if (payload == NULL) return; + if (payload->path.s) free(payload->path.s); + db_drv_free(&payload->drv); + pkg_free(payload); +} + + +int flat_uri(db_uri_t* uri) +{ + struct flat_uri* furi; + + if ((furi = (struct flat_uri*)pkg_malloc(sizeof(*furi))) == NULL) { + ERR("flatstore: No memory left\n"); + return -1; + } + memset(furi, '\0', sizeof(*furi)); + if (db_drv_init(&furi->drv, flat_uri_free) < 0) goto error; + + if ((furi->path.s = get_abs_pathname(NULL, &uri->body)) == NULL) { + ERR("flatstore: Error while obtaining absolute pathname for '%.*s'\n", + STR_FMT(&uri->body)); + goto error; + } + furi->path.len = strlen(furi->path.s); + + DB_SET_PAYLOAD(uri, furi); + return 0; + + error: + if (furi) { + if (furi->path.s) free(furi->path.s); + db_drv_free(&furi->drv); + pkg_free(furi); + } + return -1; +} + +/** @} */ diff --git a/modules/db_flatstore/flat_uri.h b/modules/db_flatstore/flat_uri.h new file mode 100644 index 0000000..2cb251a --- /dev/null +++ b/modules/db_flatstore/flat_uri.h @@ -0,0 +1,62 @@ +/* + * $Id$ + * + * Copyright (C) 2008 iptelorg GmbH + * Written by Jan Janak <jan(a)iptel.org> + * + * 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. + * + * 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_URI_H +#define _FLAT_URI_H + +/** \addtogroup flatstore + * @{ + */ + +/** \file + * The functions parsing and interpreting flatstore: URIs. + */ + +#include "../../db/db_uri.h" +#include "../../db/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 + * db_uri structures in the database API in SER. The structure is used to + * convert relative pathnames in flatstore URIs to absolute. + */ +struct flat_uri { + db_drv_t drv; + /** Absolute pathname to the database directory, zero terminated */ + str path; +}; + + +/** Create a new flat_uri structure and convert the path in parameter. + * This function builds a new flat_uri structure from the body of + * the generic URI given to it in parameter. + * @param uri A generic db_uri structure. + * @retval 0 on success + * @retval A negative number on error. + */ +int flat_uri(db_uri_t* uri); + + +/** @} */ + +#endif /* _FLAT_URI_H */ diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index 8a27740..a64dc73 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -34,6 +34,7 @@ #include "flat_con.h" #include "flat_cmd.h" #include "flat_rpc.h" +#include "flat_uri.h" #include "../../sr_module.h" #include "../../mem/shm_mem.h" @@ -105,9 +106,10 @@ time_t flat_local_timestamp; /* Flatstore database module interface */ static cmd_export_t cmds[] = { - {"db_con", (cmd_function)flat_con, 0, 0, 0}, - {"db_cmd", (cmd_function)flat_cmd, 0, 0, 0}, - {"db_put", (cmd_function)flat_put, 0, 0, 0}, + {"db_uri", (cmd_function)flat_uri, 0, 0, 0}, + {"db_con", (cmd_function)flat_con, 0, 0, 0}, + {"db_cmd", (cmd_function)flat_cmd, 0, 0, 0}, + {"db_put", (cmd_function)flat_put, 0, 0, 0}, {0, 0, 0, 0, 0} }; diff --git a/modules/db_flatstore/todo.txt b/modules/db_flatstore/todo.txt new file mode 100644 index 0000000..aff00cc --- /dev/null +++ b/modules/db_flatstore/todo.txt @@ -0,0 +1,2 @@ +* Create the directory if it does not exist and check permissions +

15 years, 7 months

git:janakj/flatstore: - headers moved within the doxygen section

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: bb1eba6012601d279675a7df998e25d2d691bcb4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb1eba6… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Jun 12 16:05:44 2008 +0000 - headers moved within the doxygen section --- modules/db_flatstore/flat_cmd.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/db_flatstore/flat_cmd.h b/modules/db_flatstore/flat_cmd.h index 05a5cd3..e27e344 100644 --- a/modules/db_flatstore/flat_cmd.h +++ b/modules/db_flatstore/flat_cmd.h @@ -25,9 +25,6 @@ #ifndef _FLAT_CMD_H #define _FLAT_CMD_H -#include "../../db/db_drv.h" -#include "../../db/db_cmd.h" - /** \addtogroup flatstore * @{ */ @@ -36,6 +33,9 @@ * Inmplementation of flatstore commands. */ +#include "../../db/db_drv.h" +#include "../../db/db_cmd.h" + /** Extension structure of db_cmd adding flatstore specific data. * This data structure extends the generic data structure db_cmd in the

15 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev