kamailio.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
List overview
Download
sr-dev
May 2011
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
sr-dev@lists.kamailio.org
28 participants
166 discussions
Start a n
N
ew thread
git:3.1: ChangeLog: updated for 3.1.4
by Daniel-Constantin Mierla
Module: sip-router Branch: 3.1 Commit: 3b4da7610c57073b98afb34e8e663648366db1d4 URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b4da76…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 26 18:42:03 2011 +0200 ChangeLog: updated for 3.1.4 --- ChangeLog | 569 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 569 insertions(+), 0 deletions(-) Diff:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3b4…
13 years, 6 months
1
0
0
0
compiler warning
by Juha Heinanen
seen today when compiling master: CC (cc) [M sdpops.so] sdpops_data.o sdpops_data.c:42:9: warning: missing terminating " character sdpops_data.c:43:59: warning: missing terminating " character -- juha
13 years, 6 months
2
1
0
0
git:master: sdpops: fix gcc warning, reported from Juha
by Henning Westerholt
Module: sip-router Branch: master Commit: 327e12423f5476fe1a6002693e43f3080468d042 URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=327e124…
Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 26 18:22:23 2011 +0200 sdpops: fix gcc warning, reported from Juha --- modules/sdpops/sdpops_data.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/sdpops/sdpops_data.c b/modules/sdpops/sdpops_data.c index 29d81b4..178c705 100644 --- a/modules/sdpops/sdpops_data.c +++ b/modules/sdpops/sdpops_data.c @@ -30,7 +30,7 @@ #include "../../trim.h" #include "sdpops_data.h" -#if 0 +/*
http://www.iana.org/assignments/rtp-parameters
@@ -91,7 +91,7 @@ Registry Name: RTP Payload Format media types Reference: [RFC4855] Registration Procedures: Standards Action Process or expert approval -#endif +*/ typedef struct _codecsmap { str name;
13 years, 6 months
1
0
0
0
git:3.1: Makefile: version set to 3.1.4
by Daniel-Constantin Mierla
Module: sip-router Branch: 3.1 Commit: eac6d9e89e83edb962c14b35e7d3803adb9eb4bd URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eac6d9e…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 26 18:04:32 2011 +0200 Makefile: version set to 3.1.4 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 91d1435..e2e1c75 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -161,7 +161,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) #version number VERSION = 3 PATCHLEVEL = 1 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = # memory debugger switcher
13 years, 6 months
1
0
0
0
git:3.1: tm: recursive hash locks
by Daniel-Constantin Mierla
Module: sip-router Branch: 3.1 Commit: 06b74b600e6644f4bf289d256538d463f6734717 URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=06b74b6…
Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 29 19:40:36 2011 +0200 tm: recursive hash locks The hash locks are now recursive/re-entrant. This removes some of the TMCB_REQUEST_IN and TMCB_LOCAL_REQUEST_IN callback restrictions (like do not create new transactions, do not call t_lookup_*()) solving problems like the one described in
http://lists.sip-router.org/pipermail/sr-users/2011-April/068331.html
(cherry picked from commit 1699b6a4c479031c116fb081a805635a4d088bcb) --- modules/tm/h_table.c | 20 ++++++++++++++++++-- modules/tm/h_table.h | 2 ++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 33e72d7..c82f0b9 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -97,13 +97,29 @@ enum kill_reason get_kr() { void lock_hash(int i) { - lock(&_tm_table->entries[i].mutex); + + int mypid; + + mypid = my_pid(); + if (likely(atomic_get(&_tm_table->entries[i].locker_pid) != mypid)) { + lock(&_tm_table->entries[i].mutex); + atomic_set(&_tm_table->entries[i].locker_pid, mypid); + } else { + /* locked within the same process that called us*/ + _tm_table->entries[i].rec_lock_level++; + } } void unlock_hash(int i) { - unlock(&_tm_table->entries[i].mutex); + if (likely(_tm_table->entries[i].rec_lock_level == 0)) { + atomic_set(&_tm_table->entries[i].locker_pid, 0); + unlock(&_tm_table->entries[i].mutex); + } else { + /* recursive locked => decrease rec. lock count */ + _tm_table->entries[i].rec_lock_level--; + } } diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 784606e..ea2fa14 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -429,6 +429,8 @@ typedef struct entry struct cell* prev_c; /* sync mutex */ ser_lock_t mutex; + atomic_t locker_pid; /* pid of the process that holds the lock */ + int rec_lock_level; /* recursive lock count */ /* currently highest sequence number in a synonym list */ unsigned int next_label; #ifdef TM_HASH_STATS
13 years, 6 months
1
0
0
0
git:3.1: rpm/kamailio: version set to 3.1.4
by Daniel-Constantin Mierla
Module: sip-router Branch: 3.1 Commit: 1837d493e7d08427a19038721ecc0ac52d72a75b URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1837d49…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 26 16:16:54 2011 +0200 rpm/kamailio: version set to 3.1.4 --- pkg/kamailio/rpm/kamailio.spec-4.1 | 2 +- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- pkg/kamailio/rpm/kamailio.spec.SuSE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 12b02f0..71832e9 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 1.2.0 +%define ver 3.1.4 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 7043489..bae02bf 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.1.3 +%define ver 3.1.4 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 77af948..b25f75f 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 1.2.0 +%define ver 3.1.4 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops
13 years, 6 months
1
0
0
0
git:3.1: debs/kamailio: version set to 3.1.4 in changelog
by Daniel-Constantin Mierla
Module: sip-router Branch: 3.1 Commit: dd8b674cc2d19689612977b656fe7830304ac88d URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd8b674…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 26 15:22:52 2011 +0200 debs/kamailio: version set to 3.1.4 in changelog --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/lenny/changelog | 6 ++++++ pkg/kamailio/deb/lucid/changelog | 6 ++++++ pkg/kamailio/deb/squeeze/changelog | 6 ++++++ 4 files changed, 24 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 1c3efcb..1026395 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (3.1.4) unstable; urgency=low + + * update to 3.1.4 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 26 May 2011 15:40:40 +0100 + kamailio (3.1.3) unstable; urgency=low * update to 3.1.3 from upstream diff --git a/pkg/kamailio/deb/lenny/changelog b/pkg/kamailio/deb/lenny/changelog index 6979d4b..44f76d3 100644 --- a/pkg/kamailio/deb/lenny/changelog +++ b/pkg/kamailio/deb/lenny/changelog @@ -1,3 +1,9 @@ +kamailio (3.1.4) unstable; urgency=low + + * update to 3.1.4 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 26 May 2011 15:40:40 +0100 + kamailio (3.1.3) unstable; urgency=low * update to 3.1.3 from upstream diff --git a/pkg/kamailio/deb/lucid/changelog b/pkg/kamailio/deb/lucid/changelog index 6979d4b..44f76d3 100644 --- a/pkg/kamailio/deb/lucid/changelog +++ b/pkg/kamailio/deb/lucid/changelog @@ -1,3 +1,9 @@ +kamailio (3.1.4) unstable; urgency=low + + * update to 3.1.4 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 26 May 2011 15:40:40 +0100 + kamailio (3.1.3) unstable; urgency=low * update to 3.1.3 from upstream diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 6979d4b..44f76d3 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (3.1.4) unstable; urgency=low + + * update to 3.1.4 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 26 May 2011 15:40:40 +0100 + kamailio (3.1.3) unstable; urgency=low * update to 3.1.3 from upstream
13 years, 6 months
1
0
0
0
git:tteras/db_sqlite: utils: Install the sqlite scripts
by Timo Teras
Module: sip-router Branch: tteras/db_sqlite Commit: e09960f043ac110b597eec1ddf39dcd2a4300417 URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e09960f…
Author: Natanael Copa <ncopa(a)alpinelinux.org> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Thu May 26 14:44:33 2011 +0000 utils: Install the sqlite scripts Fix the makefiles to actually install the sqlite scripts --- modules_k/db_sqlite/Makefile | 10 ++++++++++ utils/kamctl/Makefile | 23 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/modules_k/db_sqlite/Makefile b/modules_k/db_sqlite/Makefile index 9a75593..1f1dd2d 100644 --- a/modules_k/db_sqlite/Makefile +++ b/modules_k/db_sqlite/Makefile @@ -13,3 +13,13 @@ DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules + +ifeq ($(INSTALL_FLAVOUR),kamailio) +# extra install for kamailio + +install-sqlite-scripts: $(bin_prefix)/$(bin_dir) + SQLITEON=yes make -C ../../utils/kamctl/ install-modules + +install-scripts: install-sqlite-scripts + +endif # INSTALL_FLAVOUR diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 0f2643b..8b0f790 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -245,6 +245,29 @@ install-modules: $(bin_prefix)/$(bin_dir) fi ;\ done ;\ fi + # install sqlite stuff + if [ "$(SQLITEON)" = "yes" ]; then \ + mkdir -p $(modules_prefix)/$(lib_dir)/kamctl ; \ + sed -e "s#/usr/local/sbin#$(bin_target)#g" \ + < kamctl.pgsql > /tmp/kamctl.sqlite ; \ + $(INSTALL_CFG) /tmp/kamctl.sqlite \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.sqlite ; \ + rm -fr /tmp/kamctl.sqlite ; \ + sed -e "s#/usr/local/share/kamailio#$(data_target)#g" \ + < kamdbctl.sqlite > /tmp/kamdbctl.sqlite ; \ + $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.sqlite ; \ + $(INSTALL_CFG) /tmp/kamdbctl.sqlite $(modules_prefix)/$(lib_dir)/kamctl/ ; \ + rm -fr /tmp/kamdbctl.sqlite ; \ + mkdir -p $(data_prefix)/$(data_dir)/sqlite ; \ + for FILE in $(wildcard sqlite/*) ; do \ + if [ -f $$FILE ] ; then \ + $(INSTALL_TOUCH) $$FILE \ + $(data_prefix)/$(data_dir)/sqlite/`basename "$$FILE"` ; \ + $(INSTALL_CFG) $$FILE \ + $(data_prefix)/$(data_dir)/sqlite/`basename "$$FILE"` ; \ + fi ;\ + done ; \ + fi $(cfg_prefix)/$(cfg_dir):
13 years, 6 months
1
0
0
0
git:tteras/db_sqlite: db_sqlite: add support for autogeneration of db scheme (make dbschema)
by Timo Teras
Module: sip-router Branch: tteras/db_sqlite Commit: 9b4f2e9912d70b75f02dede15d1e9a833bf66d8d URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b4f2e9…
Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Thu May 26 12:18:16 2011 +0200 db_sqlite: add support for autogeneration of db scheme (make dbschema) --- doc/stylesheets/dbschema_k/xsl/db_sqlite.xsl | 133 ++++++++++++++++++++++++++ lib/srdb1/schema/Makefile | 20 ++++- 2 files changed, 151 insertions(+), 2 deletions(-) diff --git a/doc/stylesheets/dbschema_k/xsl/db_sqlite.xsl b/doc/stylesheets/dbschema_k/xsl/db_sqlite.xsl new file mode 100644 index 0000000..1a42bc2 --- /dev/null +++ b/doc/stylesheets/dbschema_k/xsl/db_sqlite.xsl @@ -0,0 +1,133 @@ +<?xml version='1.0'?> +<!-- + * XSL converter script for sqlite databases + * + * Copyright (C) 2001-2007 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +--> + + +<xsl:stylesheet xmlns:xsl="
http://www.w3.org/1999/XSL/Transform
" + version='1.0' + xmlns:xi="
http://www.w3.org/2001/XInclude
" +> + + <xsl:import href="sql.xsl"/> + +<!-- specify the table type --> + <xsl:template name="table.close"> + <xsl:text>)</xsl:text> + <xsl:if test="type[@db=$db]"> + <xsl:text> Type=</xsl:text> + <xsl:value-of select="normalize-space(type[@db=$db])"/> + </xsl:if> + <xsl:text>;

</xsl:text> + </xsl:template> + + <xsl:template name="column.type"> + <xsl:variable name="type"> + <xsl:call-template name="get-type"/> + </xsl:variable> + + <xsl:choose> + <xsl:when test="type[@db=$db]"> + <xsl:value-of select="normalize-space(type[@db=$db])"/> + </xsl:when> + <xsl:when test="$type='char'"> + <xsl:text>SMALLINT</xsl:text> + <xsl:call-template name="column.trailing"/> + </xsl:when> + <xsl:when test="$type='short'"> + <xsl:text>SMALLINT</xsl:text> + <xsl:call-template name="column.trailing"/> + </xsl:when> + <xsl:when test="$type='int'"> + <xsl:if test="not(autoincrement)"> + <xsl:text>INTEGER</xsl:text> + </xsl:if> + <xsl:call-template name="column.trailing"/> + </xsl:when> + <xsl:when test="$type='long'"> + <xsl:text>BIGINT</xsl:text> + <xsl:call-template name="column.trailing"/> + </xsl:when> + <xsl:when test="$type='datetime'"> + <xsl:text>TIMESTAMP</xsl:text> + <xsl:call-template name="column.trailing"/> + </xsl:when> + <xsl:when test="$type='double'"> + <xsl:text>DOUBLE PRECISION</xsl:text> + <xsl:call-template name="column.trailing"/> + </xsl:when> + <xsl:when test="$type='float'"> + <xsl:text>REAL</xsl:text> + <xsl:call-template name="column.trailing"/> + </xsl:when> + <xsl:when test="$type='string'"> + <xsl:text>VARCHAR</xsl:text> + <xsl:call-template name="column.size"/> + <xsl:call-template name="column.trailing"/> + </xsl:when> + <xsl:when test="$type='binary'"> + <xsl:text>BYTEA</xsl:text> + <xsl:call-template name="column.size"/> + <xsl:call-template name="column.trailing"/> + </xsl:when> + <xsl:when test="$type='text'"> + <xsl:text>TEXT</xsl:text> + <xsl:call-template name="column.size"/> + <xsl:call-template name="column.trailing"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="type-error"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template name="column.trailing"> + <xsl:variable name="column.type"> + <xsl:call-template name="get-type"/> + </xsl:variable> + <xsl:if test="$column.type='datetime'"> + <xsl:text> WITHOUT TIME ZONE</xsl:text> + </xsl:if> + <xsl:if test="autoincrement"> + <xsl:text>INTEGER</xsl:text> + </xsl:if> + <!-- PRIMARY KEY column definition --> + <xsl:if test="primary"> + <xsl:text> PRIMARY KEY</xsl:text> + </xsl:if> + </xsl:template> + + <xsl:template name="get-index-name"> + <xsl:variable name="index.name"> + <xsl:call-template name="get-name"/> + </xsl:variable> + <xsl:variable name="table.name"> + <xsl:call-template name="get-name"> + <xsl:with-param name="select" select="parent::table"/> + </xsl:call-template> + </xsl:variable> + <!-- because postgres don't like identical index names, even on table level --> + <xsl:value-of select="concat($table.name, '_', $index.name)"/> + </xsl:template> + +</xsl:stylesheet> diff --git a/lib/srdb1/schema/Makefile b/lib/srdb1/schema/Makefile index 276ba16..5fbeecd 100644 --- a/lib/srdb1/schema/Makefile +++ b/lib/srdb1/schema/Makefile @@ -21,6 +21,9 @@ DBTEXT_XSL = $(STYLESHEETS)/dbtext.xsl # Stylesheet used to generate berkeley database schema DB_BERKELEY_XSL = $(STYLESHEETS)/db_berkeley.xsl +# Stylesheet used to generate sqlite database schema +DB_SQLITE_XSL = $(STYLESHEETS)/db_sqlite.xsl + # Stylesheet used to generate oracle database schema ORACLE_XSL = $(STYLESHEETS)/oracle.xsl @@ -56,7 +59,7 @@ ifeq ($(VERBOSE), 1) override XSLTPROC := $(XSLTPROC) --verbose endif -all: mysql postgres dbtext db_berkeley docbook oracle #modules dbdoc +all: mysql postgres dbtext db_berkeley db_sqlite docbook oracle #modules dbdoc .PHONY: mysql mysql_clean mysql: @@ -148,6 +151,19 @@ db_berkeley_clean: -@rm -f $(SCHEME)/db_berkeley/kamailio/* +.PHONY: db_sqlite db_sqlite_clean +db_sqlite: + for FILE in $(TABLES); do \ + XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ + --stringparam dir "$(SCHEME)/db_sqlite" \ + --stringparam prefix "$$FILE-" \ + --stringparam db "db_sqlite" \ + $(DB_SQLITE_XSL) kamailio-"$$FILE".xml ; \ + done + +db_sqlite_clean: + -@rm -f $(SCHEME)/db_sqlite/* + .PHONY: docbook docbook_clean docbook: for FILE in $(TABLES); do \ @@ -219,4 +235,4 @@ dbdoc_clean: done .PHONY: clean -clean: mysql_clean postgres_clean oracle_clean dbtext_clean db_berkeley_clean docbook_clean # modules_clean dbdoc_clean +clean: mysql_clean postgres_clean oracle_clean dbtext_clean db_berkeley_clean db_sqlite_clean docbook_clean # modules_clean dbdoc_clean
13 years, 6 months
1
0
0
0
git:tteras/db_sqlite: db_sqlite(k): add docbook docs
by Timo Teras
Module: sip-router Branch: tteras/db_sqlite Commit: f5d5348c0fd5a1b1bd204ef4bd34238c171ae047 URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5d5348…
Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Thu May 26 13:07:10 2011 +0300 db_sqlite(k): add docbook docs --- modules_k/db_sqlite/README | 6 +-- modules_k/db_sqlite/doc/Makefile | 4 ++ modules_k/db_sqlite/doc/db_sqlite.xml | 45 +++++++++++++++ modules_k/db_sqlite/doc/db_sqlite_admin.xml | 78 +++++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 4 deletions(-) diff --git a/modules_k/db_sqlite/README b/modules_k/db_sqlite/README index a19b2a6..2679f99 100644 --- a/modules_k/db_sqlite/README +++ b/modules_k/db_sqlite/README @@ -22,7 +22,6 @@ Timo Teräs 2.2. External Libraries or Applications 3. Exported Parameters - 4. Exported Functions Chapter 1. Admin Guide @@ -36,13 +35,12 @@ Chapter 1. Admin Guide 2.2. External Libraries or Applications 3. Exported Parameters - 4. Exported Functions 1. Overview - The module is an implementation of the internal DB API v1 connector - for SQlite 3 file. + The module is an implementation of the internal DB API v1 connector for + SQlite 3 file. 2. Dependencies diff --git a/modules_k/db_sqlite/doc/Makefile b/modules_k/db_sqlite/doc/Makefile new file mode 100644 index 0000000..e32e35e --- /dev/null +++ b/modules_k/db_sqlite/doc/Makefile @@ -0,0 +1,4 @@ +docs = db_sqlite.xml + +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules_k/db_sqlite/doc/db_sqlite.xml b/modules_k/db_sqlite/doc/db_sqlite.xml new file mode 100644 index 0000000..de1c53d --- /dev/null +++ b/modules_k/db_sqlite/doc/db_sqlite.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"
http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd
" [ + +<!-- Include general documentation entities --> +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + +<book xmlns:xi="
http://www.w3.org/2001/XInclude
"> + <bookinfo> + <title>SQlite Module</title> + <productname class="trade">&kamailioname;</productname> + <authorgroup> + <author> + <firstname>Timo</firstname> + <surname>Ter�s</surname> + <address> + <email>timo.teras(a)iki.fi</email> + </address> + </author> + <editor> + <firstname>Timo</firstname> + <surname>Ter�s</surname> + <address> + <email>timo.teras(a)iki.fi</email> + </address> + </editor> + </authorgroup> + <copyright> + <year>2011</year> + <holder>Timo Ter�s</holder> + </copyright> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </bookinfo> + <toc></toc> + + <xi:include href="db_sqlite_admin.xml"/> +</book> diff --git a/modules_k/db_sqlite/doc/db_sqlite_admin.xml b/modules_k/db_sqlite/doc/db_sqlite_admin.xml new file mode 100644 index 0000000..f60b799 --- /dev/null +++ b/modules_k/db_sqlite/doc/db_sqlite_admin.xml @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"
http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd
" [ + +<!-- Include general documentation entities --> +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + +<!-- Module User's Guide --> + +<chapter> + <title>&adminguide;</title> + + <section> + <title>Overview</title> + <para>The module is an implementation of the internal DB API v1 connector + for SQlite 3 file.</para> + </section> + <section> + <title>Dependencies</title> + <section> + <title>&kamailio; Modules</title> + <para> + The following modules must be loaded before this module: + <itemizedlist> + <listitem> + <para> + <emphasis>No dependencies on other &kamailio; modules</emphasis>. + </para> + </listitem> + </itemizedlist> + </para> + </section> + <section> + <title>External Libraries or Applications</title> + <para> + The following libraries or applications must be installed before running + &kamailio; with this module loaded: + <itemizedlist> + <listitem> + <para> + <emphasis>SQlite 3 library</emphasis> - e.g., libsqlite3-0 + </para> + </listitem> + <listitem> + <para> + <emphasis>SQlite 3 devel library</emphasis> - to compile + the module e.g. libsqlite3-dev + </para> + </listitem> + <listitem> + <para> + <emphasis>SQlite 3 utilities</emphasis> - for kamdbctl + e.g. sqlite3 + </para> + </listitem> + </itemizedlist> + </para> + </section> + </section> + + <section> + <title>Exported Parameters</title> + <para> + NONE + </para> + </section> + + <section> + <title>Exported Functions</title> + <para> + NONE + </para> + </section> +</chapter> +
13 years, 6 months
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
...
17
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
Results per page:
10
25
50
100
200