sr-dev October 2009

sr-dev@lists.kamailio.org

30 participants
468 discussions

git:master: dialog(k): copy dialog table from 1.5 branch, the version in this tree is older

by Henning Westerholt

Module: sip-router Branch: master Commit: d0b60d5b967e9ea8df5c911c606ae1ddad490379 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0b60d5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 1 18:26:17 2009 +0200 dialog(k): copy dialog table from 1.5 branch, the version in this tree is older --- lib/srdb1/schema/dialog.xml | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/dialog.xml b/lib/srdb1/schema/dialog.xml index 1738786..3eaf631 100644 --- a/lib/srdb1/schema/dialog.xml +++ b/lib/srdb1/schema/dialog.xml @@ -9,7 +9,7 @@ <table id="dialog" xmlns:db="http://docbook.org/ns/docbook"> <name>dialog</name> - <version>2</version> + <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Persistent dialog information for the dialog module. More @@ -166,6 +166,22 @@ </description> </column> + <column> + <name>sflags</name> + <type>unsigned int</type> + <size>10</size> + <description>The flags to set for dialog and usable from config file. + </description> + </column> + + <column> + <name>toroute</name> + <type>unsigned int</type> + <size>10</size> + <description>The route to be executed at dialog timeout. + </description> + </column> + <index> <name>hash_idx</name> <colref linkend="hash_entry"/>

14 years, 6 months

tcp_async and tls

by jh＠tutpro.com

earlier i thought that tls cannot use async tcp, but it actually turns out that if tls is enabled, tcp async capability has to be turned off and is thus lost: Note: Using TLS over asynch TCP is not supported at the moment. If you use TLS you have to disable asynch TCP! if it is not possible to make tls use non-async tcp at the same time when async tcp is enabled for non-tls tcp transport, then my opinion is that we should wait that tls can use async tcp before sr is released. -- juha

14 years, 6 months

git:master: makefile: mysql shared *.sql removed

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 04424443dc83e18bf75cdcf5e04aa23b44ed2ce3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0442444… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 16:52:17 2009 +0200 makefile: mysql shared *.sql removed mysql shared *.sql files are no longer installed by the main makefile, but by the db_mysql module. --- Makefile | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ec2b9ba..dfe5ea3 100644 --- a/Makefile +++ b/Makefile @@ -341,9 +341,7 @@ utils_script_install= # This is the list of files to be installed into the arch-independent # shared directory (by default /usr/local/share/$(MAIN_NAME)) -share_install= scripts/mysql/my_create.sql \ - scripts/mysql/my_data.sql \ - scripts/mysql/my_drop.sql +share_install=

14 years, 6 months

git:master: makefile: per modules arch. indep. files install support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 80c36172af7040d9d1da75121dda90abcc640ce4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80c3617… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 16:48:30 2009 +0200 makefile: per modules arch. indep. files install support Support for easily adding arch. independent files that should be installed along a module. The following new module makefile variable is supported: MOD_INSTALL_SHARE - list of files to install into the arch-independent shared directory (by default /usr/local/share/$(MAIN_NAME)). --- Makefile.modules | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/Makefile.modules b/Makefile.modules index fab1bf9..f1f172b 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -48,6 +48,11 @@ # # MOD_INSTALL_CFGS - list of extra config files that should be installed in # the main config directory, along the module (OPTIONAL). +# +# MOD_INSTALL_SHARE - list of files to install into the arch-independent +# shared directory (by default +# /usr/local/share/$(MAIN_NAME)) +# MOD_NAME=$(NAME:.so=) @@ -119,7 +124,7 @@ LIBS:=$(filter-out -ldl -lresolv, $(LIBS)) .PHONY: install-scripts .PHONY: install-cfgs install: $(NAME) $(mods_dst) install-libs install-utils install-scripts \ - install-cfg + install-cfg install-share $(INSTALL_TOUCH) $(mods_dst)/$(NAME) $(INSTALL_MODULES) $(NAME) $(mods_dst) @@ -191,6 +196,29 @@ install-cfg: endif # $(MOD_INSTALL_CFGS) +ifneq (,$(MOD_INSTALL_SHARE)) +install-share: $(share_prefix)/$(share_dir) + @for r in $(MOD_INSTALL_SHARE) ; do \ + if [ -n "$$r" ]; then \ + if [ -f "$$r" ]; then \ + $(call try_err, $(INSTALL_TOUCH) \ + $(share_prefix)/$(share_dir)/`basename "$$r"` ); \ + $(call try_err,\ + $(INSTALL_SHARE) "$$r" $(share_prefix)/$(share_dir) ); \ + else \ + echo "ERROR: $$r not found" ; \ + if [ ${err_fail} = 1 ] ; then \ + exit 1; \ + fi ; \ + fi ; \ + fi ; \ + done; true + +else +install-share: + +endif # $(MOD_INSTALL_SHARE) + $(bin_prefix)/$(bin_dir): mkdir -p $@ @@ -198,6 +226,9 @@ $(bin_prefix)/$(bin_dir): $(cfg_prefix)/$(cfg_dir): mkdir -p $@ +$(share_prefix)/$(share_dir): + mkdir -p $@ + # README build rules ifneq (,$(wildcard doc/Makefile)) #doc/Makefile present => we can generate README

14 years, 6 months

git:master: db_mysql: install shared *.sql files

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c7683811e99d30c95b0dfeaeeeee446cb6533d78 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c768381… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 16:51:36 2009 +0200 db_mysql: install shared *.sql files --- modules/db_mysql/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/db_mysql/Makefile b/modules/db_mysql/Makefile index a1b8a8a..379fca5 100644 --- a/modules/db_mysql/Makefile +++ b/modules/db_mysql/Makefile @@ -21,6 +21,9 @@ LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \ SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 +MOD_INSTALL_SHARE= ../../scripts/mysql/my_create.sql \ + ../../scripts/mysql/my_data.sql \ + ../../scripts/mysql/my_drop.sql install-mysql-script: $(bin_prefix)/$(bin_dir) sed -e "s#^DEFAULT_SCRIPT_DIR.*#DEFAULT_SCRIPT_DIR=\"$(share_prefix)/$(share_dir)\"#g" \

14 years, 6 months

git:master: makefile: doc update for Makefile.utils

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 6f7433d3d0f493e0ea65e4fe64e4f0d6a1c29420 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f7433d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 16:05:02 2009 +0200 makefile: doc update for Makefile.utils --- Makefile.utils | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/Makefile.utils b/Makefile.utils index 0c38a79..3f48660 100644 --- a/Makefile.utils +++ b/Makefile.utils @@ -8,6 +8,24 @@ # -------- # 2009-04-23 initial version derived from Makefile.modules (andrei) +# +# Variables that should be defined in the util Makefiles, prior to including +# this makefile: +# +# NAME - util binary name, with no path (MUST). +# +# COREPATH - path to the main/core directory (OPTIONAL, default ../..) +# +# DEFS - local extra defines (OPTIONAL) +# +# LIBS - local extra libs (OPTIONAL) +# +# SER_LIBS - ser/sr libs that should be compiled, linked against and installed +# along the binary. The format is: <path>/<shortname>, e.g. +# SER_LIBS=../../lib/srdb2/srdb2 for libsrdb2 with the sources +# in ../../lib/srdb2. (OPTIONAL) +# + UTIL_NAME=$(NAME) # default path to the core makefiles @@ -66,10 +84,16 @@ install: $(NAME) $(util_dst) install-libs $(INSTALL_TOUCH) $(util_dst)/$(NAME) $(INSTALL_BIN) $(NAME) $(util_dst) +ifneq (,$(SER_LIBS)) install-libs: @for lib in $(dir $(SER_LIBS)); do \ $(call try_err, $(MAKE) -C "$${lib}" install-if-newer ) ;\ - done + done; true + +else +install-libs: + +endif # $(SER_LIBS) .PHONY: install-if-newer install-if-newer: $(util_dst)/$(NAME)

14 years, 6 months

git:master: doc: serdoc2man.xsl revived

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: aae2c1f4b05b297bc4e459cc91cc9f57485e5f94 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aae2c1f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 16:29:14 2009 +0200 doc: serdoc2man.xsl revived serdoc2man.xsl is still needed for the ser modules that have manpages. --- doc/stylesheets/serdoc2man.xsl | 111 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/doc/stylesheets/serdoc2man.xsl b/doc/stylesheets/serdoc2man.xsl new file mode 100644 index 0000000..6de062c --- /dev/null +++ b/doc/stylesheets/serdoc2man.xsl @@ -0,0 +1,111 @@ +<?xml version='1.0'?> + + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" + xmlns:serdoc="http://sip-router.org/xml/serdoc" + xmlns="http://docbook2x.sourceforge.net/xmlns/Man-XML" + exclude-result-prefixes="doc" + version='1.0' + xml:lang="en"> + + +<xsl:template match="* [@role='admin-guide']" /> + + +<xsl:include href="http://docbook2x.sourceforge.net/latest/xslt/man/docbook.xsl" /> + + +<xsl:template match="serdoc:todo"> + <para> + <xsl:text>TODO</xsl:text> + </para> +</xsl:template> + +<xsl:template match="serdoc:link"> + <xsl:call-template name="inline-bold" /> +</xsl:template> + +<xsl:template match="serdoc:func"> + <xsl:call-template name="inline-bold-monospace"/> + <xsl:text>()</xsl:text> +</xsl:template> + +<xsl:template match="serdoc:module"> + <xsl:call-template name="inline-bold-monospace"/> + <xsl:text>(7)</xsl:text> +</xsl:template> + +<xsl:template match="serdoc:modparam"> + <xsl:call-template name="inline-bold-monospace"/> +</xsl:template> + +<xsl:template match="serdoc:coreparam"> + <xsl:call-template name="inline-bold-monospace"/> +</xsl:template> + +<xsl:template match="serdoc:field"> + <xsl:call-template name="inline-bold-monospace"/> +</xsl:template> + +<xsl:template match="serdoc:bin"> + <xsl:call-template name="inline-bold-monospace"/> + <xsl:text>(1)</xsl:text> +</xsl:template> + +<xsl:template match="serdoc:sbin"> + <xsl:call-template name="inline-bold-monospace"/> + <xsl:text>(8)</xsl:text> +</xsl:template> + +<xsl:template match="serdoc:file"> + <xsl:call-template name="inline-bold-monospace"/> + <xsl:text>(5)</xsl:text> +</xsl:template> + +<xsl:template match="serdoc:prototype"> + <xsl:call-template name="inline-bold-monospace"/> +</xsl:template> + +<xsl:template match="serdoc:paraminfo"> + <para> + <xsl:apply-templates /> + </para> +</xsl:template> + +<xsl:template match="serdoc:paramtype"> + <br /> + <xsl:text>Type: </xsl:text> + <xsl:apply-templates /> +</xsl:template> + +<xsl:template match="serdoc:paramdefault"> + <br /> + <xsl:text>Default: </xsl:text> + <xsl:apply-templates /> +</xsl:template> + +<xsl:template match="serdoc:fieldinfo"> + <para> + <xsl:apply-templates /> + </para> +</xsl:template> + +<xsl:template match="serdoc:fieldsql"> + <br /> + <xsl:text>Type: </xsl:text> + <xsl:call-template name="inline-monospace" /> +</xsl:template> + + + +<xsl:template match="optional"> + <xsl:text>[</xsl:text> + <xsl:apply-templates /> + <xsl:text>]</xsl:text> +</xsl:template> + + + +</xsl:stylesheet>

14 years, 6 months

git:master: makefile: utils and cfg cleanup

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 48dd70783900038f379a35817df942dc59d5e646 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48dd707… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 16:02:51 2009 +0200 makefile: utils and cfg cleanup Moved sercmd, sip-router_mysql.sh and tls.cfg install to their respective modules. --- Makefile | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index b7d2bbe..ec2b9ba 100644 --- a/Makefile +++ b/Makefile @@ -336,7 +336,7 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods))) # 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_bin_install= utils/gen_ha1/gen_ha1 # sercmd is now installed by ctl utils_script_install= # This is the list of files to be installed into the arch-independent @@ -801,11 +801,6 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) $(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(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/$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) - install-bin: $(bin_prefix)/$(bin_dir) $(NAME) $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) $(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir) @@ -866,12 +861,6 @@ install-utils: utils $(bin_prefix)/$(bin_dir) fi ;\ fi ; \ done; true - # FIXME: This is a hack, this should be (and will be) done properly in - # per-module Makefiles - sed -e "s#^DEFAULT_SCRIPT_DIR.*#DEFAULT_SCRIPT_DIR=\"$(share_prefix)/$(share_dir)\"#g" \ - < scripts/mysql/$(SCR_NAME)_mysql.sh > \ - $(bin_prefix)/$(bin_dir)/$(MAIN_NAME)_mysql.sh - chmod 755 $(bin_prefix)/$(bin_dir)/$(MAIN_NAME)_mysql.sh install-modules-all: install-every-module install-every-module-doc

14 years, 6 months

git:master: tls: updated to the new auto install cfg makefile

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ce383454955291178e9fd097711ca28a11363009 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce38345… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 16:01:34 2009 +0200 tls: updated to the new auto install cfg makefile --- modules/tls/Makefile | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/tls/Makefile b/modules/tls/Makefile index 8fac654..f3970a4 100644 --- a/modules/tls/Makefile +++ b/modules/tls/Makefile @@ -15,17 +15,14 @@ LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto \ # NOTE: depending on the way in which libssl was compiled you might # have to add -lz -lkrb5 (zlib and kerberos5). # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" - +MOD_INSTALL_CFGS=tls.cfg DEFS+=-DOPENSER_MOD_INTERFACE include ../../Makefile.modules -$(cfg_prefix)/$(cfg_dir): - mkdir -p $(cfg_prefix)/$(cfg_dir) -install-cfg: $(cfg_prefix)/$(cfg_dir) - $(INSTALL_CFG) tls.cfg $(cfg_prefix)/$(cfg_dir) +install-tls-cert: $(cfg_prefix)/$(cfg_dir) ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) -install: install-cfg +install-cfg: install-tls-cert

14 years, 6 months

git:master: ctl(s): automatically install sercmd

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 9e4c500f6e6e6ad0725316968878d3ae661ace8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e4c500… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 15:56:56 2009 +0200 ctl(s): automatically install sercmd --- modules_s/ctl/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_s/ctl/Makefile b/modules_s/ctl/Makefile index eac18c0..144d4c5 100644 --- a/modules_s/ctl/Makefile +++ b/modules_s/ctl/Makefile @@ -7,6 +7,7 @@ include ../../Makefile.defs auto_gen= NAME=ctl.so LIBS= +MOD_INSTALL_UTILS=../../utils/sercmd # fifo support DEFS+=-DUSE_FIFO

14 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2009