sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:janakj/postgres: - fixed daylight saving bug previously found in mysql module

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: d79af6c63a8386f8d50b5dc41e045e754a70a587 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d79af6c… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Apr 14 18:52:47 2003 +0000 - fixed daylight saving bug previously found in mysql module - struct tm structure properly initialized - gmtime changed to localtime because mktime expects local time later --- modules/db_postgres/db_val.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/db_val.c b/modules/db_postgres/db_val.c index 6c91a7d..9af7d9e 100644 --- a/modules/db_postgres/db_val.c +++ b/modules/db_postgres/db_val.c @@ -33,6 +33,9 @@ * History * ------- * 2003-04-06 initial code written (Greg Fausak/Andy Fullford) + * 2003-04-14 gmtime changed to localtime because mktime later + * expects localtime, changed daylight saving bug + * previously found in mysql module (janakj) * */ @@ -94,7 +97,15 @@ static inline int str2time(const char* _s, time_t* _v) } #endif + memset(&t, '\0', sizeof(struct tm)); strptime(_s,"%Y-%m-%d %H:%M:%S %z",&t); + + /* Daylight saving information got lost in the database + * so let mktime to guess it. This eliminates the bug when + * contacts reloaded from the database have different time + * of expiration by one hour when daylight saving is used + */ + t.tm_isdst = -1; *_v = mktime(&t); return 0; @@ -147,7 +158,7 @@ static inline int time2str(time_t _v, char* _s, int* _l) } #endif - t = gmtime(&_v); + t = localtime(&_v); if((bl=strftime(_s,(size_t)(*_l)-1,"'%Y-%m-%d %H:%M:%S %z'",t))>0) *_l = bl;

15 years, 10 months

git:janakj/postgres: - exec compiles now on freebsd 5.0 (wrong header)

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: f73f6431d3875a73cb2a3d2f2ea762f163fec1da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f73f643… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 18 17:58:34 2003 +0000 - exec compiles now on freebsd 5.0 (wrong header) - lots of Makefile LIBS fixes (use $(LOCALBASE) instead of /usr/local and added -L/usr/pkg/lib where missing, removed old comments) --- modules/db_postgres/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index b4db5dd..50a2133 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -7,6 +7,7 @@ NAME=postgres.so # libpq-fe.h locations DEFS +=-I/usr/local/pgsql/include -LIBS=-L/usr/local/pgsql/lib -lpq +LIBS=-L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -L/usr/pkg/lib \ + -L/usr/pkg/lib/pgsql -lpq include ../../Makefile.modules

15 years, 10 months

git:janakj/postgres: Initial checkin.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 3175f89b8fa3dabb5052a19a02d30f82851f1dbb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3175f89… Author: Greg Fausak <lgfausak(a)august.net> Committer: Greg Fausak <lgfausak(a)august.net> Date: Tue Apr 8 01:25:35 2003 +0000 Initial checkin. ---

15 years, 10 months

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

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 26da7b7420eaf03690e7929095f89d117bfa4366 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26da7b7… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 16:11:14 2009 +0100 Make the module compile in the sip-router source tree. --- modules/db_berkeley/Makefile | 5 ++++- modules/db_berkeley/bdb_cmd.h | 6 +++--- modules/db_berkeley/bdb_con.h | 6 +++--- modules/db_berkeley/bdb_fld.c | 2 +- modules/db_berkeley/bdb_fld.h | 4 ++-- modules/db_berkeley/bdb_lib.h | 4 ++-- modules/db_berkeley/bdb_mod.c | 4 ++-- modules/db_berkeley/bdb_res.c | 2 +- modules/db_berkeley/bdb_res.h | 4 ++-- modules/db_berkeley/bdb_uri.h | 4 ++-- 10 files changed, 22 insertions(+), 19 deletions(-) diff --git a/modules/db_berkeley/Makefile b/modules/db_berkeley/Makefile index 851d961..723bc6f 100644 --- a/modules/db_berkeley/Makefile +++ b/modules/db_berkeley/Makefile @@ -10,10 +10,13 @@ NAME=db_berkeley.so # extra debug messages # -DBDB_EXTRA_DEBUG is optional -DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \ +DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \ -I$(SYSBASE)/include LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb +SERLIBPATH=../../lib +SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 + include ../../Makefile.modules diff --git a/modules/db_berkeley/bdb_cmd.h b/modules/db_berkeley/bdb_cmd.h index 18d7f3c..55e4b60 100644 --- a/modules/db_berkeley/bdb_cmd.h +++ b/modules/db_berkeley/bdb_cmd.h @@ -38,9 +38,9 @@ #include <sys/time.h> #include <db.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 "bdb_con.h" diff --git a/modules/db_berkeley/bdb_con.h b/modules/db_berkeley/bdb_con.h index fbf16e7..91a92e9 100644 --- a/modules/db_berkeley/bdb_con.h +++ b/modules/db_berkeley/bdb_con.h @@ -36,9 +36,9 @@ #include <time.h> #include <db.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 "bdb_lib.h" diff --git a/modules/db_berkeley/bdb_fld.c b/modules/db_berkeley/bdb_fld.c index fb5c440..37ef121 100644 --- a/modules/db_berkeley/bdb_fld.c +++ b/modules/db_berkeley/bdb_fld.c @@ -37,7 +37,7 @@ #include <string.h> #include <time.h> /* strptime, XOPEN issue must be >= 4 */ -#include "../../db/db_drv.h" +#include "../../lib/srdb2/db_drv.h" #include "../../mem/mem.h" #include "../../dprint.h" #include "../../ut.h" diff --git a/modules/db_berkeley/bdb_fld.h b/modules/db_berkeley/bdb_fld.h index 27acd9d..0f529a9 100644 --- a/modules/db_berkeley/bdb_fld.h +++ b/modules/db_berkeley/bdb_fld.h @@ -36,8 +36,8 @@ #include <db.h> -#include "../../db/db_gen.h" -#include "../../db/db_fld.h" +#include "../../lib/srdb2/db_gen.h" +#include "../../lib/srdb2/db_fld.h" typedef struct _bdb_fld { db_drv_t gen; diff --git a/modules/db_berkeley/bdb_lib.h b/modules/db_berkeley/bdb_lib.h index 1f8bb1b..90d0308 100644 --- a/modules/db_berkeley/bdb_lib.h +++ b/modules/db_berkeley/bdb_lib.h @@ -38,8 +38,8 @@ #include <db.h> #include "../../str.h" -#include "../../db/db.h" -#include "../../db/db_fld.h" +#include "../../lib/srdb2/db.h" +#include "../../lib/srdb2/db_fld.h" /*max number of columns in a table*/ #define MAX_NUM_COLS 32 diff --git a/modules/db_berkeley/bdb_mod.c b/modules/db_berkeley/bdb_mod.c index bd7e771..7da25b3 100644 --- a/modules/db_berkeley/bdb_mod.c +++ b/modules/db_berkeley/bdb_mod.c @@ -37,8 +37,8 @@ #include "../../mem/mem.h" #include "../../sr_module.h" -#include "../../db/db_res.h" -#include "../../db/db.h" +#include "../../lib/srdb2/db_res.h" +#include "../../lib/srdb2/db.h" #include "bdb_lib.h" #include "bdb_con.h" diff --git a/modules/db_berkeley/bdb_res.c b/modules/db_berkeley/bdb_res.c index fd5212c..1a64c73 100644 --- a/modules/db_berkeley/bdb_res.c +++ b/modules/db_berkeley/bdb_res.c @@ -33,7 +33,7 @@ #include "../../mem/mem.h" #include "../../dprint.h" -#include "../../db/db_gen.h" +#include "../../lib/srdb2/db_gen.h" void bdb_res_free(db_res_t* res, bdb_res_t *payload) diff --git a/modules/db_berkeley/bdb_res.h b/modules/db_berkeley/bdb_res.h index df4940e..dd0f654 100644 --- a/modules/db_berkeley/bdb_res.h +++ b/modules/db_berkeley/bdb_res.h @@ -29,8 +29,8 @@ #ifndef _BDB_RES_H_ #define _BDB_RES_H_ -#include "../../db/db_drv.h" -#include "../../db/db_res.h" +#include "../../lib/srdb2/db_drv.h" +#include "../../lib/srdb2/db_res.h" typedef struct _bdb_res { db_drv_t gen; diff --git a/modules/db_berkeley/bdb_uri.h b/modules/db_berkeley/bdb_uri.h index d76468a..6b4124d 100644 --- a/modules/db_berkeley/bdb_uri.h +++ b/modules/db_berkeley/bdb_uri.h @@ -33,8 +33,8 @@ * The functions parsing and interpreting bdb: URIs. */ -#include "../../db/db_uri.h" -#include "../../db/db_drv.h" +#include "../../lib/srdb2/db_uri.h" +#include "../../lib/srdb2/db_drv.h" #include <db.h>

15 years, 10 months

git:janakj/bdb: Merge branch 'master' of ssh://git.sip-router.org/ sip-router into bdb

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: cc327694092da23c2b259deb54ad0e104b1a57eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc32769… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 16:03:12 2009 +0100 Merge branch 'master' of ssh://git.sip-router.org/sip-router into bdb * 'master' of ssh://git.sip-router.org/sip-router: Database flags renamed from DB_* to SRDB_* to avoid conflicts. ---

15 years, 10 months

git:janakj/bdb: Database flags renamed from DB_* to SRDB_* to avoid conflicts.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 54c0157e62003e2cef71f505bb55bfb2a07100e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54c0157… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 15:43:44 2009 +0100 Database flags renamed from DB_* to SRDB_* to avoid conflicts. The header files of Berkeley DB define constants whose names clash with the constants defined in lib/srdb/db.h. We renamed our constants to avoid the conflict. --- lib/srdb2/db.h | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/srdb2/db.h b/lib/srdb2/db.h index 80459b8..b93f483 100644 --- a/lib/srdb2/db.h +++ b/lib/srdb2/db.h @@ -52,20 +52,20 @@ extern "C" { /* * Various database flags shared by modules */ -#define DB_LOAD_SER (1 << 0) /* The row should be loaded by SER */ -#define DB_DISABLED (1 << 1) /* The row is disabled */ -#define DB_CANON (1 << 2) /* Canonical entry (domain or uri) */ -#define DB_IS_TO (1 << 3) /* The URI can be used in To */ -#define DB_IS_FROM (1 << 4) /* The URI can be used in From */ -#define DB_FOR_SERWEB (1 << 5) /* Credentials instance can be used by serweb */ -#define DB_PENDING (1 << 6) -#define DB_DELETED (1 << 7) -#define DB_CALLER_DELETED (1 << 8) /* Accounting table */ -#define DB_CALLEE_DELETED (1 << 9) /* Accounting table */ -#define DB_MULTIVALUE (1 << 10) /* Attr_types table */ -#define DB_FILL_ON_REG (1 << 11) /* Attr_types table */ -#define DB_REQUIRED (1 << 12) /* Attr_types table */ -#define DB_DIR (1 << 13) /* Domain_settings table */ +#define SRDB_LOAD_SER (1 << 0) /* The row should be loaded by SER */ +#define SRDB_DISABLED (1 << 1) /* The row is disabled */ +#define SRDB_CANON (1 << 2) /* Canonical entry (domain or uri) */ +#define SRDB_IS_TO (1 << 3) /* The URI can be used in To */ +#define SRDB_IS_FROM (1 << 4) /* The URI can be used in From */ +#define SRDB_FOR_SERWEB (1 << 5) /* Credentials instance can be used by serweb */ +#define SRDB_PENDING (1 << 6) +#define SRDB_DELETED (1 << 7) +#define SRDB_CALLER_DELETED (1 << 8) /* Accounting table */ +#define SRDB_CALLEE_DELETED (1 << 9) /* Accounting table */ +#define SRDB_MULTIVALUE (1 << 10) /* Attr_types table */ +#define SRDB_FILL_ON_REG (1 << 11) /* Attr_types table */ +#define SRDB_REQUIRED (1 << 12) /* Attr_types table */ +#define SRDB_DIR (1 << 13) /* Domain_settings table */ struct db_gen;

15 years, 10 months

git:janakj/bdb: Merge commit 'berkeley/trunk' into bdb

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: f1b7917b954c7d8b34c688212b01d04096ea5cfc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1b7917… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 15:08:43 2009 +0100 Merge commit 'berkeley/trunk' into bdb * commit 'berkeley/trunk': (41 commits) - unify common rows and row allocation functionality in the DB API core - fix compilation on OpenBSD, related to missing includes paths and wrong - disable big integer (DB_BIGINT) support for non SQL DB modules for now - remove not reached return statement at the end of val2str functions - fix link entity names, patch from Carsten Gross - port from opensips r4526, credits goes to bogdan - renamed: bdb_recover -> kambdb_recover - regenerated all READMEs (make modules-readme exclude_modules="") - renaming: changed entities in documentation - renaming: openser -> kamailio - renaming scripts part 1 - fix some FAQ entries, change missing entity, regenerate READMEs - change name in copyright headers - fix unnecessary module library links, related to #1855859 - titles for admin, devel and faq chapters are defined via entities for coherence and easier management - updated some old entity names - content of faq removed (mistakenly added by me after Henning did the cleanup for modules' docs; rev 3839) - entity &user; replaced with &admin; to obey naming structure (entities to be replaced by xinclude); updated obsolete address tags - step 2 for the rest of modules to re-link history from sgml to xml files - step 1 for the rest of modules to re-link history from sgml to xml files ... ---

15 years, 10 months

git:janakj/bdb: Module db_berkeley updated to database api version 2.0.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 894ead1c6e50a3284aeb410842f023e295b953be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=894ead1… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 15:14:45 2009 +0100 Module db_berkeley updated to database api version 2.0. --- modules/db_berkeley/Makefile | 2 +- modules/db_berkeley/bdb_cmd.c | 572 +++++++++++++++++ modules/db_berkeley/bdb_cmd.h | 93 +++ modules/db_berkeley/bdb_con.c | 178 ++++++ modules/db_berkeley/bdb_con.h | 92 +++ modules/db_berkeley/bdb_fld.c | 78 +++ modules/db_berkeley/bdb_fld.h | 64 ++ modules/db_berkeley/bdb_lib.c | 895 +++++++++++++++----------- modules/db_berkeley/bdb_lib.h | 122 +++-- modules/db_berkeley/bdb_mi.c | 63 -- modules/db_berkeley/bdb_mi.h | 36 - modules/db_berkeley/bdb_mod.c | 121 ++++ modules/db_berkeley/bdb_res.c | 555 ++--------------- modules/db_berkeley/bdb_res.h | 54 +-- modules/db_berkeley/bdb_uri.c | 164 +++++ modules/db_berkeley/bdb_uri.h | 65 ++ modules/db_berkeley/bdb_util.c | 55 -- modules/db_berkeley/bdb_util.h | 39 -- modules/db_berkeley/bdb_val.c | 286 --------- modules/db_berkeley/bdb_val.h | 42 -- modules/db_berkeley/db_berkeley.c | 1262 ------------------------------------- modules/db_berkeley/db_berkeley.h | 96 --- 22 files changed, 2085 insertions(+), 2849 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=894…

15 years, 10 months

git:janakj/bdb: Fixed wrong order of directives in modules Makefile.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 986445fbfdfd58dfb21992a9a098adda3be7a396 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=986445f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 15:54:00 2009 +0100 Fixed wrong order of directives in modules Makefile. Some of the directives in the Makefile of the module were listed in a wrong order and as a result they had no effect. --- modules/db_berkeley/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/db_berkeley/Makefile b/modules/db_berkeley/Makefile index 5671867..851d961 100644 --- a/modules/db_berkeley/Makefile +++ b/modules/db_berkeley/Makefile @@ -4,6 +4,9 @@ # # # WARNING: do not run this directly, it should be run by the master Makefile +include ../../Makefile.defs +auto_gen= +NAME=db_berkeley.so # extra debug messages # -DBDB_EXTRA_DEBUG is optional @@ -11,9 +14,6 @@ DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \ -I$(SYSBASE)/include -include ../../Makefile.defs -auto_gen= -NAME=db_berkeley.so LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb include ../../Makefile.modules

15 years, 10 months

git:janakj/bdb: - unify common rows and row allocation functionality in the DB API core

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 423e2078e1fb99c4f5bd2575ba0d739c96d159df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=423e207… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 16:33:22 2008 +0000 - unify common rows and row allocation functionality in the DB API core git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5362 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/bdb_res.c | 31 ++++++------------------------- 1 files changed, 6 insertions(+), 25 deletions(-) diff --git a/modules/db_berkeley/bdb_res.c b/modules/db_berkeley/bdb_res.c index 93a408b..0049d7b 100644 --- a/modules/db_berkeley/bdb_res.c +++ b/modules/db_berkeley/bdb_res.c @@ -120,20 +120,10 @@ int bdb_convert_row(db_res_t* _res, char *bdb_result, int* _lres) /* Save the number of rows in the current fetch */ RES_ROW_N(_res) = 1; - /* Allocate storage to hold the bdb result values */ - len = sizeof(db_val_t) * RES_COL_N(_res); - ROW_VALUES(row) = (db_val_t*)pkg_malloc(len); - - if (!ROW_VALUES(row)) { - LM_ERR("no private memory left\n"); - return -1; + if (db_allocate_row(_res, row) != 0) { + LM_ERR("could not allocate row"); + return -2; } - LM_DBG("allocate %d bytes for row values at %p\n", len, ROW_VALUES(row)); - memset(ROW_VALUES(row), 0, len); - - /* Save the number of columns in the ROW structure */ - ROW_N(row) = RES_COL_N(_res); - /* * Allocate an array of pointers one per column. * It that will be used to hold the address of the string representation of each column. @@ -257,19 +247,10 @@ int bdb_append_row(db_res_t* _res, char *bdb_result, int* _lres, int _rx) row = &(RES_ROWS(_res)[_rx]); - /* Allocate storage to hold the bdb result values */ - len = sizeof(db_val_t) * RES_COL_N(_res); - ROW_VALUES(row) = (db_val_t*)pkg_malloc(len); - - if (!ROW_VALUES(row)) { - LM_ERR("no private memory left\n"); - return -1; + if (db_allocate_row(_res, row) != 0) { + LM_ERR("could not allocate row"); + return -2; } - LM_DBG("allocate %d bytes for row values at %p\n", len, ROW_VALUES(row)); - memset(ROW_VALUES(row), 0, len); - - /* Save the number of columns in the ROW structure */ - ROW_N(row) = RES_COL_N(_res); /* * Allocate an array of pointers one per column.

15 years, 10 months

← Newer
1
...
34
35
36
37
38
39
40
...
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