sr-dev

sr-dev@lists.kamailio.org

12 participants
43412 discussions

git:sip-router: libsr_dbk: added kamailio db interface as lib

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/dbk_lib Commit: 174881d2ffeb43a06566b57707a398ee8a1bcdf5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=174881d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Nov 21 03:31:32 2008 +0100 libsr_dbk: added kamailio db interface as lib - kamailio db interface tranformed into library (Makefile added, include path changed) --- lib/sr_dbk/Makefile | 14 ++++++++++++++ lib/sr_dbk/README | 14 +++++++++----- lib/sr_dbk/db.c | 8 ++++---- lib/sr_dbk/db_con.h | 2 +- lib/sr_dbk/db_id.c | 6 +++--- lib/sr_dbk/db_id.h | 2 +- lib/sr_dbk/db_key.h | 2 +- lib/sr_dbk/db_pool.c | 2 +- lib/sr_dbk/db_query.c | 2 +- lib/sr_dbk/db_res.c | 4 ++-- lib/sr_dbk/db_row.c | 4 ++-- lib/sr_dbk/db_ut.c | 4 ++-- lib/sr_dbk/db_val.h | 2 +- 13 files changed, 42 insertions(+), 24 deletions(-) diff --git a/lib/sr_dbk/Makefile b/lib/sr_dbk/Makefile new file mode 100644 index 0000000..2c21b96 --- /dev/null +++ b/lib/sr_dbk/Makefile @@ -0,0 +1,14 @@ +# +# example library makefile +# + +include ../../Makefile.defs +auto_gen= +NAME:=sr_dbk +MAJOR_VER=1 +MINOR_VER=0 +BUGFIX_VER=0 +LIBS= + +include ../../Makefile.libs + diff --git a/lib/sr_dbk/README b/lib/sr_dbk/README index bbdc03e..cd4fb44 100644 --- a/lib/sr_dbk/README +++ b/lib/sr_dbk/README @@ -1,7 +1,11 @@ $Id$ -This directory contains generic database support interface. The interface -should be used by all modules willing to communicate with a database. Kamailio -can then switch from one database to another simply by loading a different -database support module. Directory example contains a very simple example -how to use the interface. Directory doc contains the API documentation. +This directory contains the Kamailio generic database support library. +The library should be used by all modules willing to communicate with a +database. Kamailio can then switch from one database to another simply by +loading a different database support module. Directory example contains a +very simple example how to use the interface. Directory doc contains the API +documentation. + +Note that you can use sip-router with 2 different database interfaces: + ser and kamailio. diff --git a/lib/sr_dbk/db.c b/lib/sr_dbk/db.c index f24646a..772bb12 100644 --- a/lib/sr_dbk/db.c +++ b/lib/sr_dbk/db.c @@ -57,10 +57,10 @@ * - \ref db_unixodbc */ -#include "../dprint.h" -#include "../sr_module.h" -#include "../mem/mem.h" -#include "../ut.h" +#include "../../dprint.h" +#include "../../sr_module.h" +#include "../../mem/mem.h" +#include "../../ut.h" #include "db_cap.h" #include "db_id.h" #include "db_pool.h" diff --git a/lib/sr_dbk/db_con.h b/lib/sr_dbk/db_con.h index 08aa0f1..7804f07 100644 --- a/lib/sr_dbk/db_con.h +++ b/lib/sr_dbk/db_con.h @@ -30,7 +30,7 @@ #ifndef DB_CON_H #define DB_CON_H -#include "../str.h" +#include "../../str.h" /*! \brief diff --git a/lib/sr_dbk/db_id.c b/lib/sr_dbk/db_id.c index ad23881..3be3307 100644 --- a/lib/sr_dbk/db_id.c +++ b/lib/sr_dbk/db_id.c @@ -28,9 +28,9 @@ */ #include "db_id.h" -#include "../dprint.h" -#include "../mem/mem.h" -#include "../ut.h" +#include "../../dprint.h" +#include "../../mem/mem.h" +#include "../../ut.h" #include <stdlib.h> #include <string.h> diff --git a/lib/sr_dbk/db_id.h b/lib/sr_dbk/db_id.h index 2650e6e..641417d 100644 --- a/lib/sr_dbk/db_id.h +++ b/lib/sr_dbk/db_id.h @@ -30,7 +30,7 @@ #ifndef _DB_ID_H #define _DB_ID_H -#include "../str.h" +#include "../../str.h" /** Structure representing a database ID */ struct db_id { diff --git a/lib/sr_dbk/db_key.h b/lib/sr_dbk/db_key.h index a03795a..50fd8aa 100644 --- a/lib/sr_dbk/db_key.h +++ b/lib/sr_dbk/db_key.h @@ -30,7 +30,7 @@ #ifndef DB_KEY_H #define DB_KEY_H -#include "../ut.h" +#include "../../ut.h" /** diff --git a/lib/sr_dbk/db_pool.c b/lib/sr_dbk/db_pool.c index a87f7c4..6a1a9fc 100644 --- a/lib/sr_dbk/db_pool.c +++ b/lib/sr_dbk/db_pool.c @@ -27,7 +27,7 @@ * \ingroup db */ -#include "../dprint.h" +#include "../../dprint.h" #include "db_pool.h" diff --git a/lib/sr_dbk/db_query.c b/lib/sr_dbk/db_query.c index eb7a798..609e935 100644 --- a/lib/sr_dbk/db_query.c +++ b/lib/sr_dbk/db_query.c @@ -33,7 +33,7 @@ */ #include <stdio.h> -#include "../dprint.h" +#include "../../dprint.h" #include "db_ut.h" #include "db_query.h" diff --git a/lib/sr_dbk/db_res.c b/lib/sr_dbk/db_res.c index 27d162f..d82fae6 100644 --- a/lib/sr_dbk/db_res.c +++ b/lib/sr_dbk/db_res.c @@ -33,8 +33,8 @@ #include "db_res.h" #include "db_row.h" -#include "../dprint.h" -#include "../mem/mem.h" +#include "../../dprint.h" +#include "../../mem/mem.h" #include <string.h> diff --git a/lib/sr_dbk/db_row.c b/lib/sr_dbk/db_row.c index 090adb7..e690d5b 100644 --- a/lib/sr_dbk/db_row.c +++ b/lib/sr_dbk/db_row.c @@ -33,8 +33,8 @@ #include "db_row.h" #include <string.h> -#include "../dprint.h" -#include "../mem/mem.h" +#include "../../dprint.h" +#include "../../mem/mem.h" /* * Release memory used by row diff --git a/lib/sr_dbk/db_ut.c b/lib/sr_dbk/db_ut.c index 2c86b17..cf7abf3 100644 --- a/lib/sr_dbk/db_ut.c +++ b/lib/sr_dbk/db_ut.c @@ -32,8 +32,8 @@ #include "db_ut.h" -#include "../mem/mem.h" -#include "../dprint.h" +#include "../../mem/mem.h" +#include "../../dprint.h" #include <limits.h> #include </usr/include/limits.h> #include <errno.h> diff --git a/lib/sr_dbk/db_val.h b/lib/sr_dbk/db_val.h index ab9314b..fad0b24 100644 --- a/lib/sr_dbk/db_val.h +++ b/lib/sr_dbk/db_val.h @@ -37,7 +37,7 @@ #define DB_VAL_H #include <time.h> -#include "../str.h" +#include "../../str.h" /**

15 years, 9 months

master updated

by Andrei Pelinescu-Onciul

I've merged into master the following branches: andrei/module_interface andrei/mod_f_params andrei/mod_register daniel/pv andrei/fixups I have not merged yet: andrei/dbk_lib janakj/db They have to be sorted out before: lib/sr_dbk taken from andrei/dbk_lib together with the history (contains entire kamailio db history), then renamed into lib/srdb1 and Jan changes applied, + lib/srdb2 from janakj/db. There is also henning/trie, but I guess that could be merged much later (and I don't know if it's ready anyway). Andrei

15 years, 9 months

git:master: Merge commit 'origin/andrei/mod_f_params'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: bc8bd3d7dbfe7f5ad838fe6afd413f895830c545 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc8bd3d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 24 14:16:52 2008 +0100 Merge commit 'origin/andrei/mod_f_params' * commit 'origin/andrei/mod_f_params': script: variable number of params for functions mod if: more prototypes and defines ---

15 years, 9 months

git:master: Merge commit 'origin/andrei/fixups'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 7e69be0441a98653ea0d94c831f64a2947aa4fff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e69be0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 24 14:18:27 2008 +0100 Merge commit 'origin/andrei/fixups' * commit 'origin/andrei/fixups': fixups: call them even for 0 params. functions str: kamailio str_init compatibility macro fparam_t/gparam_t unification ---

15 years, 9 months

git:master: Merge commit 'origin/daniel/pv'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 89cb5a38ce4c2cdd4c50a873530d69404db43872 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89cb5a3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 24 14:18:03 2008 +0100 Merge commit 'origin/daniel/pv' * commit 'origin/daniel/pv': more PV API integration PV get null helper added updated pvar.h file according to previous commit pseudo-variable engine api ---

15 years, 9 months

git:master: Merge commit 'origin/andrei/module_interface'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8cc09737d9ffbd9f108c541a0aa6bd24530e519d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cc0973… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 24 14:15:50 2008 +0100 Merge commit 'origin/andrei/module_interface' * commit 'origin/andrei/module_interface': tm makefile: declare SER_MOD_INTERFACE kamailio LM_* compatibility macros dual module interface support: ser and kamailio kamailio compatibility header files added .gitignore module interface: minor changes from kamailio ---

15 years, 9 months

git:master: Merge commit 'origin/andrei/mod_register'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 2531ed9dd82b9eed50eb66cc4f9635866505705a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2531ed9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Nov 24 14:17:50 2008 +0100 Merge commit 'origin/andrei/mod_register' * commit 'origin/andrei/mod_register': minor macro additions for kamailio compatibility modules: support for mod_register ---

15 years, 9 months

commit message subject

by Jan Janak

Andrei, did you setup a different commit mailer for sip-router git repository than the one that we had for the ser git repository? If so, do you think you could modify it to include the name of the branch in the subject of the message? Jan.

15 years, 10 months

TLS

by Klaus Darilion

Hi! Congratulations - I wondered the last days why K. lists are so quiet - now I now the party is happening here :-) I have a question regarding TLS. In K TLS is part of core. I think in ser it is a module. So, as K uses the ser core, probably there is also need for the TLS module? klaus

15 years, 10 months

git:sip-router: add SHM_MEM_ERROR and PKG_MEM_ERROR logging macros to mem.h

by Henning Westerholt

Module: sip-router Branch: henning/trie Commit: f34610e3ec970664efab940592dd2cbd0f48260b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f34610e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 21 13:23:02 2008 +0100 add SHM_MEM_ERROR and PKG_MEM_ERROR logging macros to mem.h --- mem/mem.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/mem/mem.h b/mem/mem.h index 8ba35b5..7cb79a8 100644 --- a/mem/mem.h +++ b/mem/mem.h @@ -152,4 +152,13 @@ int init_pkg_mallocs(); int init_shm_mallocs(int force_alloc); +/*! generic logging helper for allocation errors in private memory pool/ system */ +#ifdef SYSTEM_MALLOC +#define PKG_MEM_ERROR LM_ERR("could not allocate private memory from system") +#else +#define PKG_MEM_ERROR LM_ERR("could not allocate private memory from available pool") +#endif +/*! generic logging helper for allocation errors in shared memory pool */ +#define SHM_MEM_ERROR LM_ERR("could not allocate shared memory from available pool") + #endif

15 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev