sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

[PATCH 3/3] Neither compile nor install sercmd.

by Jan Janak

We need to disable sercmd compilation and installation for now, because it depends on some header files from ctl module which are not in the sip-router repository yet. Signed-off-by: Jan Janak <jan(a)iptel.org> --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ba4f79e..7fefc0a 100644 --- a/Makefile +++ b/Makefile @@ -268,8 +268,8 @@ modules_basenames=$(shell echo $(modules)| \ # which utils need compilation (directory path) and which to install # (full path including file name) -utils_compile= utils/gen_ha1 utils/sercmd -utils_bin_install= utils/gen_ha1/gen_ha1 utils/sercmd/sercmd +utils_compile= utils/gen_ha1 #utils/sercmd +utils_bin_install= utils/gen_ha1/gen_ha1 #utils/sercmd/sercmd utils_script_install= # This is the list of files to be installed into the arch-independent -- 1.5.6.5

15 years, 10 months

[PATCH 2/3] Do not install tls.cfg, we do not have the tls module in sip-router yet.

by Jan Janak

We need to comment out those sections of the Makefile which deal with installation of the tls configuration file and tls certificates, because we do not have the tls module in the sip-router repository yet. Signed-off-by: Jan Janak <jan(a)iptel.org> --- Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b0f5c88..ba4f79e 100644 --- a/Makefile +++ b/Makefile @@ -602,9 +602,9 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) $(INSTALL_CFG) etc/dictionary.ser $(cfg_prefix)/$(cfg_dir) # TLS configuration - $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/tls.cfg - $(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir) - modules/tls/ser_cert.sh -d $(cfg_prefix)/$(cfg_dir) + #$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/tls.cfg + #$(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir) + #modules/tls/ser_cert.sh -d $(cfg_prefix)/$(cfg_dir) install-bin: $(bin_prefix)/$(bin_dir) $(NAME) $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) -- 1.5.6.5

15 years, 10 months

[PATCH 1/3] Renaming ser to sip-router.

by Jan Janak

Since we changed the name of the project to sip-router, we should also rename the name of the binary being produced from ser to sip-router. We should also replace 'ser' with 'sip-router' in directory names. Signed-off-by: Jan Janak <jan(a)iptel.org> --- Makefile.defs | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index a5bdf2b..e4f1642 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -97,7 +97,7 @@ export makefile_defs $(info normal Makefile.defs exec) # main binary name -MAIN_NAME=ser +MAIN_NAME=sip-router #version number VERSION = 2 @@ -162,37 +162,37 @@ endif CC_EXTRA_OPTS ?= # dirs -cfg_dir = etc/ser/ +cfg_dir = etc/sip-router/ bin_dir = sbin/ -share_dir = share/ser/ -modules_dir = lib/ser/modules/ -lib_dir = lib/ser/ +share_dir = share/sip-router/ +modules_dir = lib/sip-router/modules/ +lib_dir = lib/sip-router/ ifeq ($(OS), linux) - doc_dir = share/doc/ser/ + doc_dir = share/doc/sip-router/ man_dir = share/man/ LOCALBASE ?= /usr/local else ifeq ($(OS), freebsd) - doc_dir = share/doc/ser/ + doc_dir = share/doc/sip-router/ man_dir = man/ LOCALBASE ?= /usr/local else ifeq ($(OS), openbsd) - doc_dir = share/doc/ser/ + doc_dir = share/doc/sip-router/ man_dir = man/ LOCALBASE ?= /usr/local else ifeq ($(OS), netbsd) - doc_dir = share/doc/ser + doc_dir = share/doc/sip-router man_dir = man/ LOCALBASE ?= /usr/pkg else ifeq ($(OS), darwin) - doc_dir = share/doc/ser/ + doc_dir = share/doc/sip-router/ man_dir = man/ LOCALBASE ?= /usr/local else - doc_dir = doc/ser/ + doc_dir = doc/sip-router/ man_dir = man/ LOCALBASE ?= /usr/local endif -- 1.5.6.5

15 years, 10 months

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

by Jan Janak

Module: sip-router Branch: janakj/oracle Commit: 43e68d1c8d3177718844b2f0f36a31a79b014dee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43e68d1… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 01:08:28 2009 +0100 Merge branches 'janakj/oracle' and 'master' of ssh://janakj@git.sip-router.org/sip-router into oracle * 'janakj/oracle' 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. ---

15 years, 10 months

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

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 1ee9fa7cf857b8f770a13ab7174a02fef47938d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ee9fa7… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 01:07:20 2009 +0100 Merge branches 'janakj/mysql' and 'master' of ssh://janakj@git.sip-router.org/sip-router into mysql * 'janakj/mysql' 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, 10 months

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

← Newer
1
...
26
27
28
29
30
31
32
...
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