Module: sip-router
Branch: andrei/cdefs2doc
Commit: cee03233fd22955617dc6dfc0676a19c68b86b67
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cee0323…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Date: Thu Mar 4 19:27:33 2010 +0100
doc: select_list: added intro & notations sections
---
doc/select_list/Makefile | 1 +
doc/select_list/docbook/intro.xml | 61 +++++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/doc/select_list/Makefile b/doc/select_list/Makefile
index 4962624..a41b226 100644
--- a/doc/select_list/Makefile
+++ b/doc/select_list/Makefile
@@ -184,6 +184,7 @@ $(docbook_output_dir)/select_list.xml: \
@echo " $(MAKE) -C doc/select_list $(MAKECMDGOALS)" >>$@
@echo ' </revremark>' >>$@
@echo ' </revision></revhistory></info>' >>$@
+ @echo ' <xi:include href="intro.xml"/>' >>$@
@$(foreach f,$(flist),\
echo ' <xi:include'\
'href="'$(call get_target,$f).xml'"/>' \
diff --git a/doc/select_list/docbook/intro.xml b/doc/select_list/docbook/intro.xml
new file mode 100644
index 0000000..da9e852
--- /dev/null
+++ b/doc/select_list/docbook/intro.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter id="Select_Intro">
+ <title>Introduction and Notations</title>
+ <section id="Intro">
+ <title>Introduction</title>
+ <para>Selects are read-only functions that can be used in the script and
+ that always return a string value. In the script a select always starts
+ with a '<emphasis>@</emphasis>'. In an expression context a
+ select always evaluates to either a string or undef.
+ </para>
+ <para>For more informations see
+ <ulink url=' http://sip-router.org/wiki/cookbooks/selects/devel'>
+ http://sip-router.org/wiki/cookbooks/selects/devel</ulink>.
+ </para>
+ <para>This document lists all the selects implemented by each module.
+ </para>
+ </section>
+ <section id="Notations">
+ <title>Notations</title>
+ <para>The following notations are used:
+ <orderedlist>
+ <listitem>@ - all selects always start with '@'. </listitem>
+ <listitem>"string" - string type.</listitem>
+ <listitem>integer - integer type.</listitem>
+ <listitem>[] - Parameter markers. Can be either [integer] or
+ ["string"].
+ Note that instead of ["string"] one could write .string,
+ e.g.:
+ @foo.bar["string"] is equivalent to @foo.bar.string.
+ </listitem>
+ <listitem>{} - denotes an optional parameter.
+ E.g.: @ruri.params{["string"]} means you could use
+ @ruri.params by itself or you could specify an extra parameter:
+ @ruri.params["trasnport"] or @ruri.params.transport.
+ </listitem>
+ <listitem><string> - means the next member is not fixed and can
+ take any string value (it is a string parameter).
+ It is equivalent with ["string"], e.g.:
+ @msg.header.<string> is the same as
+ @msg.header["string"].
+ It is used only to expose an internal implementation detail
+ (SEL_PARAM_* vs. CONSUME_NEXT_*), but from the script writer point
+ of view it is the same thing.
+ </listitem>
+ <listitem>.* - means the select can be followed by a variable number of
+ string parameters.
+ E.g.: @cfg_get.* means that @cfg_get.core.version is a valid usage.
+ </listitem>
+ <listitem>* (without a '.' in front) - it means the last member
+ might be a class that might expand further (but the
+ "expansion" is not defined in the same module).
+ E.g. @foo.nameaddr* means that nameaddr is most likely
+ a class that expands further
+ (for example into @foo.nameaddr.uri a.s.o).
+ </listitem>
+ </orderedlist>
+ </para>
+ </section>
+</chapter>
Revision: 5992
http://openser.svn.sourceforge.net/openser/?rev=5992&view=rev
Author: mariuszbihlei
Date: 2010-03-04 12:37:07 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
modules/carrierroute Fixed a bug that caused prefixes in the form of '+0040' to crash kamailio 1.3
(in some cases, reproductible if prefix is in the form of '+++++++++++++++' or longer).
Modified Paths:
--------------
branches/1.3/modules/carrierroute/route_tree.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY.
The following task is now closed:
FS#38 - make install overwrites existing tls.cfg file
User who did this - Andrei Pelinescu-Onciul (andrei)
Reason for closing: Implemented
Additional comments about closing: Thanks, fixed on latest git (master and 3.0 branches), see GIT#6c0de6.
More information can be found at the following URL:
http://sip-router.org/tracker/index.php?do=details&task_id=38
You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.
Module: sip-router
Branch: kamailio_3.0
Commit: 1cae9198b490c833a44091974811caec8d8feef5
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cae919…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Date: Thu Mar 4 13:16:06 2010 +0100
makefile: fix modules config overwrite
A config file provided by a module was installed even if a
previous version was already installed, overwriting the old
version. Now if a file with the same name already exists, the
module config file will be installed with a .sample extension
added (so only .sample will be overwritten, never an active .cfg).
Reported-by: Klaus Darilion klaus.mailinglists pernau at
Closes FlySpray#38 .
(cherry picked from commit 6c0de64647038072ba1959ead39dcc601fd6292c)
---
Makefile.modules | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile.modules b/Makefile.modules
index 1f226ba..27cd0cd 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -16,6 +16,8 @@
# inside modules or libs) (andrei)
# 2009-10-01 added support for automatically installing extra utils,
# scripts and cfg files (andrei)
+# 2010-03-04 don't overwrite already installed .cfgs, save the .cfg as
+# .sample in this case (andrei)
#
#
@@ -209,10 +211,17 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
@for r in $(MOD_INSTALL_CFGS) ; do \
if [ -n "$$r" ]; then \
if [ -f "$$r" ]; then \
+ n=`basename "$$r"` ; \
$(call try_err, $(INSTALL_TOUCH) \
- $(cfg_prefix)/$(cfg_dir)/`basename "$$r"` ); \
+ "$(cfg_prefix)/$(cfg_dir)/$$n.sample" ); \
$(call try_err,\
- $(INSTALL_CFG) "$$r" $(cfg_prefix)/$(cfg_dir) ); \
+ $(INSTALL_CFG) "$$r" \
+ "$(cfg_prefix)/$(cfg_dir)/$$n.sample"); \
+ if [ -z "${skip_cfg_install}" -a \
+ ! -f "$(cfg_prefix)/$(cfg_dir)$$n" ]; then \
+ mv -f $(cfg_prefix)/$(cfg_dir)$$n.sample \
+ $(cfg_prefix)/$(cfg_dir)$$n; \
+ fi ; \
else \
echo "ERROR: $$r not found" ; \
if [ ${err_fail} = 1 ] ; then \
Module: sip-router
Branch: sr_3.0
Commit: e0c8ec8642eb683f06455f0b516754f1465aa2db
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e0c8ec8…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Date: Thu Mar 4 13:16:06 2010 +0100
makefile: fix modules config overwrite
A config file provided by a module was installed even if a
previous version was already installed, overwriting the old
version. Now if a file with the same name already exists, the
module config file will be installed with a .sample extension
added (so only .sample will be overwritten, never an active .cfg).
Reported-by: Klaus Darilion klaus.mailinglists pernau at
Closes FlySpray#38 .
(cherry picked from commit 6c0de64647038072ba1959ead39dcc601fd6292c)
---
Makefile.modules | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile.modules b/Makefile.modules
index 1f226ba..27cd0cd 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -16,6 +16,8 @@
# inside modules or libs) (andrei)
# 2009-10-01 added support for automatically installing extra utils,
# scripts and cfg files (andrei)
+# 2010-03-04 don't overwrite already installed .cfgs, save the .cfg as
+# .sample in this case (andrei)
#
#
@@ -209,10 +211,17 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
@for r in $(MOD_INSTALL_CFGS) ; do \
if [ -n "$$r" ]; then \
if [ -f "$$r" ]; then \
+ n=`basename "$$r"` ; \
$(call try_err, $(INSTALL_TOUCH) \
- $(cfg_prefix)/$(cfg_dir)/`basename "$$r"` ); \
+ "$(cfg_prefix)/$(cfg_dir)/$$n.sample" ); \
$(call try_err,\
- $(INSTALL_CFG) "$$r" $(cfg_prefix)/$(cfg_dir) ); \
+ $(INSTALL_CFG) "$$r" \
+ "$(cfg_prefix)/$(cfg_dir)/$$n.sample"); \
+ if [ -z "${skip_cfg_install}" -a \
+ ! -f "$(cfg_prefix)/$(cfg_dir)$$n" ]; then \
+ mv -f $(cfg_prefix)/$(cfg_dir)$$n.sample \
+ $(cfg_prefix)/$(cfg_dir)$$n; \
+ fi ; \
else \
echo "ERROR: $$r not found" ; \
if [ ${err_fail} = 1 ] ; then \
Module: sip-router
Branch: master
Commit: 6c0de64647038072ba1959ead39dcc601fd6292c
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c0de64…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org>
Date: Thu Mar 4 13:16:06 2010 +0100
makefile: fix modules config overwrite
A config file provided by a module was installed even if a
previous version was already installed, overwriting the old
version. Now if a file with the same name already exists, the
module config file will be installed with a .sample extension
added (so only .sample will be overwritten, never an active .cfg).
Reported-by: Klaus Darilion klaus.mailinglists pernau at
Closes FlySpray#38 .
---
Makefile.modules | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile.modules b/Makefile.modules
index 1f226ba..27cd0cd 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -16,6 +16,8 @@
# inside modules or libs) (andrei)
# 2009-10-01 added support for automatically installing extra utils,
# scripts and cfg files (andrei)
+# 2010-03-04 don't overwrite already installed .cfgs, save the .cfg as
+# .sample in this case (andrei)
#
#
@@ -209,10 +211,17 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
@for r in $(MOD_INSTALL_CFGS) ; do \
if [ -n "$$r" ]; then \
if [ -f "$$r" ]; then \
+ n=`basename "$$r"` ; \
$(call try_err, $(INSTALL_TOUCH) \
- $(cfg_prefix)/$(cfg_dir)/`basename "$$r"` ); \
+ "$(cfg_prefix)/$(cfg_dir)/$$n.sample" ); \
$(call try_err,\
- $(INSTALL_CFG) "$$r" $(cfg_prefix)/$(cfg_dir) ); \
+ $(INSTALL_CFG) "$$r" \
+ "$(cfg_prefix)/$(cfg_dir)/$$n.sample"); \
+ if [ -z "${skip_cfg_install}" -a \
+ ! -f "$(cfg_prefix)/$(cfg_dir)$$n" ]; then \
+ mv -f $(cfg_prefix)/$(cfg_dir)$$n.sample \
+ $(cfg_prefix)/$(cfg_dir)$$n; \
+ fi ; \
else \
echo "ERROR: $$r not found" ; \
if [ ${err_fail} = 1 ] ; then \
Hello,
I am pleased to announce a dedicated event in London, Tuesday, March 9
afternoon, where to present the version 3.0 and latest developments in
Kamailio and SIP Router projects. The event includes as well
presentations from various players in the VoIP and SIP market, more
details at:
http://www.kamailio.org/mos/view/Present-and-Future-of-SIP-Routing-2010-Lon…
It is a free event, the number of seats is limited, room being available
courtesy of Sun Microsystems (address 55 King William St, London EC4),
therefore the first come first serve policy is applied. You can also
enroll for a presentation, just send a short description about the topic
in the registration email.
Hope to see many of you in London next week,
Daniel
--
Daniel-Constantin Mierla
Kamailio SIP Router Masterclass, Berlin, March 22-26, 2010
* http://www.asipto.com/index.php/sip-router-masterclass/