sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

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: - 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: 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: 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/postgres: Remove compiler warning about uninitialized variable.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e2b6d847e0af1eee4aa77ca42c24fcc439883d5b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2b6d84… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 17:03:28 2009 +0100 Remove compiler warning about uninitialized variable. --- modules/db_postgres/pg_oid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/pg_oid.c b/modules/db_postgres/pg_oid.c index bd2833e..52f3e2a 100644 --- a/modules/db_postgres/pg_oid.c +++ b/modules/db_postgres/pg_oid.c @@ -79,7 +79,7 @@ static int get_index(char* name) pg_type_t* pg_new_oid_table(PGresult* res) { pg_type_t* table = NULL; - int row, n, end, idx, fields; + int row, n = 0, end, idx, fields; str s; if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK) goto error;

15 years, 10 months

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

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: b372a1051efca7c5494b87ac2ea277f9816e5703 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b372a10… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 16:59:15 2009 +0100 Make the module compile in the sip-router tree. --- modules/db_postgres/Makefile | 5 ++++- modules/db_postgres/pg_cmd.h | 6 +++--- modules/db_postgres/pg_con.h | 6 +++--- modules/db_postgres/pg_fld.c | 2 +- modules/db_postgres/pg_fld.h | 4 ++-- modules/db_postgres/pg_res.c | 2 +- modules/db_postgres/pg_res.h | 4 ++-- modules/db_postgres/pg_sql.c | 4 ++-- modules/db_postgres/pg_sql.h | 2 +- modules/db_postgres/pg_uri.c | 2 +- modules/db_postgres/pg_uri.h | 4 ++-- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 3fe13e8..48857cb 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -8,10 +8,13 @@ NAME=postgres.so # libpq-fe.h locations #DEFS += -DPG_TEST -DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include \ +DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include \ -I$(LOCALBASE)/include/postgresql \ -I/usr/include/postgresql -I/usr/include/postgresql/8.0 \ -I/usr/include/pgsql/ LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -L /usr/lib -lpq +SERLIBPATH=../../lib +SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 + include ../../Makefile.modules diff --git a/modules/db_postgres/pg_cmd.h b/modules/db_postgres/pg_cmd.h index 41914e9..1398d16 100644 --- a/modules/db_postgres/pg_cmd.h +++ b/modules/db_postgres/pg_cmd.h @@ -42,9 +42,9 @@ #include "pg_oid.h" -#include "../../db/db_drv.h" -#include "../../db/db_cmd.h" -#include "../../db/db_res.h" +#include "../../lib/srdb2/db_drv.h" +#include "../../lib/srdb2/db_cmd.h" +#include "../../lib/srdb2/db_res.h" #include "../../str.h" #include <stdarg.h> diff --git a/modules/db_postgres/pg_con.h b/modules/db_postgres/pg_con.h index c5d326a..53c36f2 100644 --- a/modules/db_postgres/pg_con.h +++ b/modules/db_postgres/pg_con.h @@ -41,9 +41,9 @@ #include "pg_oid.h" -#include "../../db/db_pool.h" -#include "../../db/db_con.h" -#include "../../db/db_uri.h" +#include "../../lib/srdb2/db_pool.h" +#include "../../lib/srdb2/db_con.h" +#include "../../lib/srdb2/db_uri.h" #include <time.h> #include <libpq-fe.h> diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index fce1bf6..4353e48 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -40,7 +40,7 @@ #include "pg_con.h" /* flags */ #include "pg_mod.h" -#include "../../db/db_drv.h" +#include "../../lib/srdb2/db_drv.h" #include "../../mem/mem.h" #include "../../dprint.h" diff --git a/modules/db_postgres/pg_fld.h b/modules/db_postgres/pg_fld.h index a228cf8..917f22d 100644 --- a/modules/db_postgres/pg_fld.h +++ b/modules/db_postgres/pg_fld.h @@ -43,8 +43,8 @@ #include "pg_oid.h" #include "pg_cmd.h" #include "../../ut.h" -#include "../../db/db_gen.h" -#include "../../db/db_fld.h" +#include "../../lib/srdb2/db_gen.h" +#include "../../lib/srdb2/db_fld.h" #include <libpq-fe.h> struct pg_fld { diff --git a/modules/db_postgres/pg_res.c b/modules/db_postgres/pg_res.c index 7580cfc..11dcb78 100644 --- a/modules/db_postgres/pg_res.c +++ b/modules/db_postgres/pg_res.c @@ -41,7 +41,7 @@ #include "../../mem/mem.h" #include "../../dprint.h" -#include "../../db/db_gen.h" +#include "../../lib/srdb2/db_gen.h" static void pg_res_free(db_res_t* res, struct pg_res* payload) diff --git a/modules/db_postgres/pg_res.h b/modules/db_postgres/pg_res.h index 8b87c79..37ae98a 100644 --- a/modules/db_postgres/pg_res.h +++ b/modules/db_postgres/pg_res.h @@ -40,8 +40,8 @@ * servers. */ -#include "../../db/db_drv.h" -#include "../../db/db_res.h" +#include "../../lib/srdb2/db_drv.h" +#include "../../lib/srdb2/db_res.h" #include <libpq-fe.h> diff --git a/modules/db_postgres/pg_sql.c b/modules/db_postgres/pg_sql.c index 37f9a1a..ab572dd 100644 --- a/modules/db_postgres/pg_sql.c +++ b/modules/db_postgres/pg_sql.c @@ -39,8 +39,8 @@ #include "pg_sql.h" -#include "../../db/db_cmd.h" -#include "../../db/db_fld.h" +#include "../../lib/srdb2/db_cmd.h" +#include "../../lib/srdb2/db_fld.h" #include "../../mem/mem.h" #include "../../dprint.h" #include "../../ut.h" diff --git a/modules/db_postgres/pg_sql.h b/modules/db_postgres/pg_sql.h index 2ac9d96..84288dc 100644 --- a/modules/db_postgres/pg_sql.h +++ b/modules/db_postgres/pg_sql.h @@ -40,7 +40,7 @@ * PostgreSQL. */ -#include "../../db/db_cmd.h" +#include "../../lib/srdb2/db_cmd.h" #include "../../str.h" diff --git a/modules/db_postgres/pg_uri.c b/modules/db_postgres/pg_uri.c index 02fa494..61accdc 100644 --- a/modules/db_postgres/pg_uri.c +++ b/modules/db_postgres/pg_uri.c @@ -41,7 +41,7 @@ #include "../../dprint.h" #include "../../mem/mem.h" #include "../../ut.h" -#include "../../db/db_gen.h" +#include "../../lib/srdb2/db_gen.h" #include <stdlib.h> #include <string.h> diff --git a/modules/db_postgres/pg_uri.h b/modules/db_postgres/pg_uri.h index 324855f..2a7ed45 100644 --- a/modules/db_postgres/pg_uri.h +++ b/modules/db_postgres/pg_uri.h @@ -39,8 +39,8 @@ * The implementation of parser parsing postgres://.. URIs. */ -#include "../../db/db_uri.h" -#include "../../db/db_drv.h" +#include "../../lib/srdb2/db_uri.h" +#include "../../lib/srdb2/db_drv.h" /** PostgreSQL driver specific payload to attach to db_uri structures. * This is the PostgreSQL specific structure that will be attached

15 years, 10 months

git:janakj/postgres: Merge commit 'pg/master' into postgres

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: ca7cc3fe8c2455b2c57b4b1027394e92283298f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca7cc3f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 16:49:02 2009 +0100 Merge commit 'pg/master' into postgres * commit 'pg/master': (46 commits) Fix problem in the previous commit: use ntohl() instead of ntohs() when - support for timestamptz column type - support for conversions from int to str Handle conversion between DB_BITMAP and postgresql int8 type. Put back functionality lost during DB API 2.0 conversion. Allo '/' to be We also need <sys/types.h> and <sys/socket.h> to get AF_INET on FreeBSD. Despite what some people believe there is no such thing - parameter name corrected - fixed wrong parameter value passed to PQexecPrepared - removing forgotten files - New postgres driver for the new db api in ser Pass parmeter types to PQexecParams() explicitly, otherwise PostgreSQL - relax db_init BUG check (allow db init from fixup functions) - fix the yesterday's fix: allow db_init from main if it's done from mod_init - fix: db connections should not be opened from child_init(PROC_MAIN), - more warnings fixes - removed reference to serhelp(a)iptel.org, we will be using serusers(a)iptel.org instead - remove test function - DB_FLOAT support - export param types adjusted to PARAM_STR/STRING & PARAM_INT ... ---

15 years, 10 months

git:janakj/postgres: - support for timestamptz column type

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: c5e7623e00b0c8bbec8f15452f59c4865a47b792 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5e7623… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed May 21 13:05:43 2008 +0000 - support for timestamptz column type --- modules/db_postgres/pg_fld.c | 16 ++++++++--- modules/db_postgres/pg_mod.c | 59 ++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 29 deletions(-) diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index 8d80f56..4bac561 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -301,7 +301,8 @@ int pg_fld2pg(struct pg_params* dst, int off, pg_type_t* types, db_int2pg_int2(dst, off + i, src + i); else if (pfld->oid == types[PG_INT4].oid) db_int2pg_int4(dst, off + i, src + i); - else if (pfld->oid == types[PG_TIMESTAMP].oid) + else if ((pfld->oid == types[PG_TIMESTAMP].oid) || + (pfld->oid == types[PG_TIMESTAMPTZ].oid)) db_int2pg_timestamp(dst, off + i, src + i, flags); else if (pfld->oid == types[PG_INT8].oid) db_int2pg_int8(dst, off + i, src + i); @@ -331,7 +332,8 @@ int pg_fld2pg(struct pg_params* dst, int off, pg_type_t* types, case DB_DATETIME: if (pfld->oid == types[PG_INT4].oid) db_int2pg_int4(dst, off + i, src + i); - else if (pfld->oid == types[PG_TIMESTAMP].oid) + else if ((pfld->oid == types[PG_TIMESTAMP].oid) || + (pfld->oid == types[PG_TIMESTAMPTZ].oid)) db_int2pg_timestamp(dst, off + i, src + i, flags); else if (pfld->oid == types[PG_INT8].oid) db_int2pg_int8(dst, off + i, src + i); @@ -415,6 +417,7 @@ int pg_check_fld2pg(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_BOOL].oid) continue; if (pfld->oid == types[PG_INET].oid) continue; if (pfld->oid == types[PG_TIMESTAMP].oid) continue; + if (pfld->oid == types[PG_TIMESTAMPTZ].oid) continue; if (pfld->oid == types[PG_BIT].oid) continue; if (pfld->oid == types[PG_VARBIT].oid) continue; break; @@ -449,6 +452,7 @@ int pg_check_fld2pg(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_INT4].oid) continue; if (pfld->oid == types[PG_INT8].oid) continue; if (pfld->oid == types[PG_TIMESTAMP].oid) continue; + if (pfld->oid == types[PG_TIMESTAMPTZ].oid) continue; break; default: @@ -535,6 +539,7 @@ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_BOOL].oid) continue; if (pfld->oid == types[PG_INET].oid) continue; if (pfld->oid == types[PG_TIMESTAMP].oid) continue; + if (pfld->oid == types[PG_TIMESTAMPTZ].oid) continue; if (pfld->oid == types[PG_BIT].oid) continue; if (pfld->oid == types[PG_VARBIT].oid) continue; break; @@ -580,6 +585,7 @@ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_INT2].oid) continue; if (pfld->oid == types[PG_INT4].oid) continue; if (pfld->oid == types[PG_TIMESTAMP].oid) continue; + if (pfld->oid == types[PG_TIMESTAMPTZ].oid) continue; break; default: @@ -832,7 +838,8 @@ int pg_pg2fld(db_fld_t* dst, PGresult* src, int row, ret |= pg_bool2db_int(dst + i, val, len); else if (type == types[PG_INET].oid) ret |= pg_inet2db_int(dst + i, val, len); - else if (type == types[PG_TIMESTAMP].oid) + else if ((type == types[PG_TIMESTAMP].oid) || + (type == types[PG_TIMESTAMPTZ].oid)) ret |= pg_timestamp2db_int(dst + i, val, len, flags); else if (type == types[PG_BIT].oid) ret |= pg_bit2db_int(dst + i, val, len); @@ -860,7 +867,8 @@ int pg_pg2fld(db_fld_t* dst, PGresult* src, int row, ret |= pg_int2_2_db_int(dst + i, val, len); else if (type == types[PG_INT4].oid) ret |= pg_int4_2_db_int(dst + i, val, len); - else if (type == types[PG_TIMESTAMP].oid) + else if ((type == types[PG_TIMESTAMP].oid) || + (type == types[PG_TIMESTAMPTZ].oid)) ret |= pg_timestamp2db_int(dst + i, val, len, flags); else goto bug; break; diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index 2316bb3..11aa9a9 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -135,20 +135,22 @@ int pg_test(void) char* times; db_fld_t int_vals[] = { - {.name = "col_bool", .type = DB_INT}, - {.name = "col_int8", .type = DB_INT}, - {.name = "col_int4", .type = DB_INT}, - {.name = "col_inet", .type = DB_INT}, - {.name = "col_timestamp", .type = DB_INT}, - {.name = "col_bit", .type = DB_INT}, - {.name = "col_varbit", .type = DB_INT}, + {.name = "col_bool", .type = DB_INT}, + {.name = "col_int8", .type = DB_INT}, + {.name = "col_int4", .type = DB_INT}, + {.name = "col_inet", .type = DB_INT}, + {.name = "col_timestamp", .type = DB_INT}, + {.name = "col_timestamptz", .type = DB_INT}, + {.name = "col_bit", .type = DB_INT}, + {.name = "col_varbit", .type = DB_INT}, {.name = NULL} }; db_fld_t datetime_vals[] = { - {.name = "col_int8", .type = DB_INT}, - {.name = "col_int4", .type = DB_INT}, - {.name = "col_timestamp", .type = DB_INT}, + {.name = "col_int8", .type = DB_INT}, + {.name = "col_int4", .type = DB_INT}, + {.name = "col_timestamp", .type = DB_INT}, + {.name = "col_timestamptz", .type = DB_INT}, {.name = NULL} }; @@ -197,21 +199,22 @@ int pg_test(void) db_fld_t res[] = { - {.name = "col_bool", .type = DB_INT}, - {.name = "col_bytea", .type = DB_BLOB}, - {.name = "col_char", .type = DB_STR}, - {.name = "col_int8", .type = DB_INT}, - {.name = "col_int4", .type = DB_INT}, - {.name = "col_int2", .type = DB_INT}, - {.name = "col_text", .type = DB_STR}, - {.name = "col_float4", .type = DB_FLOAT}, - {.name = "col_float8", .type = DB_DOUBLE}, - {.name = "col_inet", .type = DB_INT}, - {.name = "col_bpchar", .type = DB_STR}, - {.name = "col_varchar", .type = DB_STR}, - {.name = "col_timestamp", .type = DB_DATETIME}, - {.name = "col_bit", .type = DB_BITMAP}, - {.name = "col_varbit", .type = DB_BITMAP}, + {.name = "col_bool", .type = DB_INT}, + {.name = "col_bytea", .type = DB_BLOB}, + {.name = "col_char", .type = DB_STR}, + {.name = "col_int8", .type = DB_INT}, + {.name = "col_int4", .type = DB_INT}, + {.name = "col_int2", .type = DB_INT}, + {.name = "col_text", .type = DB_STR}, + {.name = "col_float4", .type = DB_FLOAT}, + {.name = "col_float8", .type = DB_DOUBLE}, + {.name = "col_inet", .type = DB_INT}, + {.name = "col_bpchar", .type = DB_STR}, + {.name = "col_varchar", .type = DB_STR}, + {.name = "col_timestamp", .type = DB_DATETIME}, + {.name = "col_timestamptz", .type = DB_DATETIME}, + {.name = "col_bit", .type = DB_BITMAP}, + {.name = "col_varbit", .type = DB_BITMAP}, {.name = NULL} }; @@ -248,6 +251,7 @@ int pg_test(void) put->vals[4].v.int4 = 0xffffffff; put->vals[5].v.int4 = 0xffffffff; put->vals[6].v.int4 = 0xffffffff; + put->vals[7].v.int4 = 0xffffffff; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); @@ -261,6 +265,7 @@ int pg_test(void) put->vals[4].v.int4 = 0; put->vals[5].v.int4 = 0; put->vals[6].v.int4 = 0; + put->vals[7].v.int4 = 0; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); @@ -279,6 +284,7 @@ int pg_test(void) put->vals[1].v.int4 = 0xffffffff; put->vals[2].v.int4 = 0xffffffff; put->vals[3].v.int4 = 0xffffffff; + put->vals[4].v.int4 = 0xffffffff; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); goto error; @@ -288,6 +294,7 @@ int pg_test(void) put->vals[1].v.int4 = 0; put->vals[2].v.int4 = 0; put->vals[3].v.int4 = 0; + put->vals[4].v.int4 = 0; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); goto error; @@ -429,6 +436,7 @@ int pg_test(void) put->vals[0].v.time = 0xffffffff; put->vals[1].v.time = 0xffffffff; put->vals[2].v.time = 0xffffffff; + put->vals[3].v.time = 0xffffffff; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); goto error; @@ -437,6 +445,7 @@ int pg_test(void) put->vals[0].v.time = 0; put->vals[1].v.time = 0; put->vals[2].v.time = 0; + put->vals[3].v.time = 0; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); goto error;

15 years, 10 months

git:janakj/postgres: Fix problem in the previous commit: use ntohl() instead of ntohs() when

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 6b51c9e6267c39b21b766081c2126c0402298c62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b51c9e… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Committer: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Wed May 21 16:30:53 2008 +0000 Fix problem in the previous commit: use ntohl() instead of ntohs() when converting int4 and cast result to int32_t not int16_t. --- modules/db_postgres/pg_fld.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index 4bac561..fce1bf6 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -627,7 +627,7 @@ static inline int pg_int4_2_db_cstr(db_fld_t* fld, char* val, int len) struct pg_fld* pfld = DB_GET_PAYLOAD(fld); int size, v; - v = (int16_t)ntohs(*((int32_t*)val)); + v = (int32_t)ntohl(*((int32_t*)val)); size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); if (len < 0 || size >= INT2STR_MAX_LEN) { @@ -664,7 +664,7 @@ static inline int pg_int4_2_db_str(db_fld_t* fld, char* val, int len) struct pg_fld* pfld = DB_GET_PAYLOAD(fld); int size, v; - v = (int16_t)ntohs(*((int32_t*)val)); + v = (int32_t)ntohl(*((int32_t*)val)); size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); if (size < 0 || size >= INT2STR_MAX_LEN) {

15 years, 10 months

git:janakj/postgres: - support for conversions from int to str

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e28d38dc23a279ca3d2cba6f921dc9bd6b27d5ee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e28d38d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed May 21 12:24:59 2008 +0000 - support for conversions from int to str --- modules/db_postgres/pg_fld.c | 86 ++++++++++++++++++++++++++++++++++++++++++ modules/db_postgres/pg_fld.h | 4 +- modules/db_postgres/pg_mod.c | 2 +- 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index fb1d6fb..8d80f56 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -561,6 +561,8 @@ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_TEXT].oid) continue; if (pfld->oid == types[PG_BPCHAR].oid) continue; if (pfld->oid == types[PG_VARCHAR].oid) continue; + if (pfld->oid == types[PG_INT2].oid) continue; + if (pfld->oid == types[PG_INT4].oid) continue; break; case DB_STR: @@ -570,6 +572,8 @@ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_TEXT].oid) continue; if (pfld->oid == types[PG_BPCHAR].oid) continue; if (pfld->oid == types[PG_VARCHAR].oid) continue; + if (pfld->oid == types[PG_INT2].oid) continue; + if (pfld->oid == types[PG_INT4].oid) continue; break; case DB_DATETIME: @@ -594,6 +598,80 @@ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types) } +static inline int pg_int2_2_db_cstr(db_fld_t* fld, char* val, int len) +{ + struct pg_fld* pfld = DB_GET_PAYLOAD(fld); + int size, v; + + v = (int16_t)ntohs(*((int16_t*)val)); + + size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); + if (size < 0 || size >= INT2STR_MAX_LEN) { + BUG("postgres: Error while converting integer to string\n"); + return -1; + } + + fld->v.cstr = pfld->buf; + return 0; +} + + +static inline int pg_int4_2_db_cstr(db_fld_t* fld, char* val, int len) +{ + struct pg_fld* pfld = DB_GET_PAYLOAD(fld); + int size, v; + + v = (int16_t)ntohs(*((int32_t*)val)); + + size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); + if (len < 0 || size >= INT2STR_MAX_LEN) { + BUG("postgres: Error while converting integer to string\n"); + return -1; + } + + fld->v.cstr = pfld->buf; + return 0; +} + + +static inline int pg_int2_2_db_str(db_fld_t* fld, char* val, int len) +{ + struct pg_fld* pfld = DB_GET_PAYLOAD(fld); + int size, v; + + v = (int16_t)ntohs(*((int16_t*)val)); + + size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); + if (size < 0 || size >= INT2STR_MAX_LEN) { + BUG("postgres: Error while converting integer to string\n"); + return -1; + } + + fld->v.lstr.s = pfld->buf; + fld->v.lstr.len = size; + return 0; +} + + +static inline int pg_int4_2_db_str(db_fld_t* fld, char* val, int len) +{ + struct pg_fld* pfld = DB_GET_PAYLOAD(fld); + int size, v; + + v = (int16_t)ntohs(*((int32_t*)val)); + + size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); + if (size < 0 || size >= INT2STR_MAX_LEN) { + BUG("postgres: Error while converting integer to string\n"); + return -1; + } + + fld->v.lstr.s = pfld->buf; + fld->v.lstr.len = size; + return 0; +} + + static inline int pg_int2_2_db_int(db_fld_t* fld, char* val, int len) { fld->v.int4 = (int16_t)ntohs(*((int16_t*)val)); @@ -793,6 +871,10 @@ int pg_pg2fld(db_fld_t* dst, PGresult* src, int row, (type == types[PG_BPCHAR].oid) || (type == types[PG_VARCHAR].oid)) ret |= pg_string2db_cstr(dst + i, val, len); + else if (type == types[PG_INT2].oid) + ret |= pg_int2_2_db_cstr(dst + i, val, len); + else if (type == types[PG_INT4].oid) + ret |= pg_int4_2_db_cstr(dst + i, val, len); else goto bug; break; @@ -804,6 +886,10 @@ int pg_pg2fld(db_fld_t* dst, PGresult* src, int row, (type == types[PG_BPCHAR].oid) || (type == types[PG_VARCHAR].oid)) ret |= pg_string2db_str(dst + i, val, len); + else if (type == types[PG_INT2].oid) + ret |= pg_int2_2_db_str(dst + i, val, len); + else if (type == types[PG_INT4].oid) + ret |= pg_int4_2_db_str(dst + i, val, len); else goto bug; break; diff --git a/modules/db_postgres/pg_fld.h b/modules/db_postgres/pg_fld.h index a42ee4d..a228cf8 100644 --- a/modules/db_postgres/pg_fld.h +++ b/modules/db_postgres/pg_fld.h @@ -42,6 +42,7 @@ #include "pg_oid.h" #include "pg_cmd.h" +#include "../../ut.h" #include "../../db/db_gen.h" #include "../../db/db_fld.h" #include <libpq-fe.h> @@ -64,7 +65,8 @@ struct pg_fld { long long int8; /**< 8-byte integer value in network byte order */ char byte[8]; } v; - Oid oid; /**< Type of the field on the server */ + char buf[INT2STR_MAX_LEN]; /**< Buffer for int2str conversions */ + Oid oid; /**< Type of the field on the server */ }; diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index 027e4af..2316bb3 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -221,7 +221,7 @@ int pg_test(void) ERR("Error while initializing database layer\n"); goto error; } - if (db_add_db(db, "postgres://janakj:honzacvut@localhost/ser") < 0) goto error; + if (db_add_db(db, "postgres://janakj:heslo@localhost/ser") < 0) goto error; if (db_connect(db) < 0) goto error; del = db_cmd(DB_DEL, db, "test", NULL, NULL, NULL);

15 years, 10 months

← Newer
1
...
29
30
31
32
33
34
35
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009