October 2010 - sr-dev - kamailio.org

git:master: blst: module moved fom modules_s/ to modules/
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: bd2cbe49ec2ac47aa6dac673ecbde3149c46eb26 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd2cbe4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 4 15:03:26 2010 +0200 blst: module moved fom modules_s/ to modules/ --- {modules_s => modules}/blst/Makefile | 0 {modules_s => modules}/blst/README | 0 {modules_s => modules}/blst/blst.c | 0 {modules_s => modules}/blst/doc/Makefile | 0 {modules_s => modules}/blst/doc/blst.xml | 0 {modules_s => modules}/blst/doc/functions.xml | 0 {modules_s => modules}/blst/doc/params.xml | 0 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/blst/Makefile b/modules/blst/Makefile similarity index 100% rename from modules_s/blst/Makefile rename to modules/blst/Makefile diff --git a/modules_s/blst/README b/modules/blst/README similarity index 100% rename from modules_s/blst/README rename to modules/blst/README diff --git a/modules_s/blst/blst.c b/modules/blst/blst.c similarity index 100% rename from modules_s/blst/blst.c rename to modules/blst/blst.c diff --git a/modules_s/blst/doc/Makefile b/modules/blst/doc/Makefile similarity index 100% rename from modules_s/blst/doc/Makefile rename to modules/blst/doc/Makefile diff --git a/modules_s/blst/doc/blst.xml b/modules/blst/doc/blst.xml similarity index 100% rename from modules_s/blst/doc/blst.xml rename to modules/blst/doc/blst.xml diff --git a/modules_s/blst/doc/functions.xml b/modules/blst/doc/functions.xml similarity index 100% rename from modules_s/blst/doc/functions.xml rename to modules/blst/doc/functions.xml diff --git a/modules_s/blst/doc/params.xml b/modules/blst/doc/params.xml similarity index 100% rename from modules_s/blst/doc/params.xml rename to modules/blst/doc/params.xml

1 0

git:master: prefix_route: module moved from modules_s/ to modules/
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: d5d574fc125f38ad295e15c6760b464b1f77349e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5d574f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 4 15:05:01 2010 +0200 prefix_route: module moved from modules_s/ to modules/ --- {modules_s => modules}/prefix_route/Makefile | 0 {modules_s => modules}/prefix_route/README | 0 {modules_s => modules}/prefix_route/pr.h | 0 {modules_s => modules}/prefix_route/pr_rpc.c | 0 {modules_s => modules}/prefix_route/prefix_route.c | 0 .../prefix_route/prefix_route.sql | 0 {modules_s => modules}/prefix_route/tree.c | 0 {modules_s => modules}/prefix_route/tree.h | 0 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/prefix_route/Makefile b/modules/prefix_route/Makefile similarity index 100% rename from modules_s/prefix_route/Makefile rename to modules/prefix_route/Makefile diff --git a/modules_s/prefix_route/README b/modules/prefix_route/README similarity index 100% rename from modules_s/prefix_route/README rename to modules/prefix_route/README diff --git a/modules_s/prefix_route/pr.h b/modules/prefix_route/pr.h similarity index 100% rename from modules_s/prefix_route/pr.h rename to modules/prefix_route/pr.h diff --git a/modules_s/prefix_route/pr_rpc.c b/modules/prefix_route/pr_rpc.c similarity index 100% rename from modules_s/prefix_route/pr_rpc.c rename to modules/prefix_route/pr_rpc.c diff --git a/modules_s/prefix_route/prefix_route.c b/modules/prefix_route/prefix_route.c similarity index 100% rename from modules_s/prefix_route/prefix_route.c rename to modules/prefix_route/prefix_route.c diff --git a/modules_s/prefix_route/prefix_route.sql b/modules/prefix_route/prefix_route.sql similarity index 100% rename from modules_s/prefix_route/prefix_route.sql rename to modules/prefix_route/prefix_route.sql diff --git a/modules_s/prefix_route/tree.c b/modules/prefix_route/tree.c similarity index 100% rename from modules_s/prefix_route/tree.c rename to modules/prefix_route/tree.c diff --git a/modules_s/prefix_route/tree.h b/modules/prefix_route/tree.h similarity index 100% rename from modules_s/prefix_route/tree.h rename to modules/prefix_route/tree.h

1 0

git:master: presence_conference: added docbook files
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: c6228c19dec179abe2e143a9f162631e5748cf7c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c6228c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 4 14:08:05 2010 +0200 presence_conference: added docbook files - skeleton for module documentation --- modules_k/presence_conference/README | 105 ++++++++++++++++++- modules_k/presence_conference/doc/Makefile | 2 +- .../doc/presence_conference.xml | 34 ++++++ .../doc/presence_conference_admin.xml | 110 ++++++++++++++++++++ 4 files changed, 249 insertions(+), 2 deletions(-) diff --git a/modules_k/presence_conference/README b/modules_k/presence_conference/README index c86fdfc..f56b5eb 100644 --- a/modules_k/presence_conference/README +++ b/modules_k/presence_conference/README @@ -1,3 +1,106 @@ presence_conference Module -Bucur Marius \ No newline at end of file +Marius-Ovidiu Bucur + +Edited by + +Marius-Ovidiu Bucur + + Copyright © 2010 Marius-Ovidiu Bucur + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + + 3.1. use_partial_states (int) + + 4. Exported MI Functions + + 4.1. conference_reset + + List of Examples + + 1.1. Set use_partial_states parameter + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + + 3.1. use_partial_states (int) + + 4. Exported MI Functions + + 4.1. conference_reset + +1. Overview + + This module is a mixer for presence notifications published by an audio + conference mixer as per RFC 4353: A Framework for Conferencing with SIP + and RFC 4575: A SIP Event Package for Conference State. In other words + it is presence handling of conference events - conference-info+xml + documents. + +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules + + The following modules must be loaded before this module: + * presence. + +2.2. External Libraries or Applications + + The following libraries or applications must be installed before + running Kamailio with this module loaded: + * libxml2 - xml handling library. + +3. Exported Parameters + + 3.1. use_partial_states (int) + +3.1. use_partial_states (int) + + Control usage of partial state notifiations. + + Default value is “0”. + + Example 1.1. Set use_partial_states parameter +... +modparam("presence_conference", "use_partial_states", 0) +... + +4. Exported MI Functions + + 4.1. conference_reset + +4.1. conference_reset + + Reset internal data. + + Name: conference_reset + + Parameters: + * none + + MI FIFO Command Format: + :conference_reset:_reply_fifo_file_ + _empty_line_ diff --git a/modules_k/presence_conference/doc/Makefile b/modules_k/presence_conference/doc/Makefile index 0298c61..2f4f7f4 100644 --- a/modules_k/presence_conference/doc/Makefile +++ b/modules_k/presence_conference/doc/Makefile @@ -1,4 +1,4 @@ -docs = presence_xml.xml +docs = presence_conference.xml docbook_dir = ../../../docbook include $(docbook_dir)/Makefile.module diff --git a/modules_k/presence_conference/doc/presence_conference.xml b/modules_k/presence_conference/doc/presence_conference.xml new file mode 100644 index 0000000..83f2ae2 --- /dev/null +++ b/modules_k/presence_conference/doc/presence_conference.xml @@ -0,0 +1,34 @@ +<?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" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + +<book xmlns:xi="http://www.w3.org/2001/XInclude"> + <bookinfo> + <title>presence_conference Module</title> + <productname class="trade">&kamailioname;</productname> + <authorgroup> + <author> + <firstname>Marius-Ovidiu</firstname> + <surname>Bucur</surname> + </author> + <editor> + <firstname>Marius-Ovidiu</firstname> + <surname>Bucur</surname> + </editor> + </authorgroup> + <copyright> + <year>2010</year> + <holder>Marius-Ovidiu Bucur</holder> + </copyright> + </bookinfo> + <toc></toc> + + <xi:include href="presence_conference_admin.xml"/> + +</book> diff --git a/modules_k/presence_conference/doc/presence_conference_admin.xml b/modules_k/presence_conference/doc/presence_conference_admin.xml new file mode 100644 index 0000000..6d771ca --- /dev/null +++ b/modules_k/presence_conference/doc/presence_conference_admin.xml @@ -0,0 +1,110 @@ +<?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" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + + + +<chapter> + + <title>&adminguide;</title> + + <section> + <title>Overview</title> + <para> + This module is a mixer for presence notifications published by + an audio conference mixer as per RFC 4353: A Framework for + Conferencing with SIP and RFC 4575: A SIP Event Package for + Conference State. In other words it is presence handling of + conference events - conference-info+xml documents. + </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>presence</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>libxml2</emphasis> - xml handling library. + </para> + </listitem> + </itemizedlist> + </para> + </section> + </section> + <section> + <title>Exported Parameters</title> + <section> + <title><varname>use_partial_states</varname> (int)</title> + <para> + Control usage of partial state notifiations. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>use_partial_states</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_conference", "use_partial_states", 0) +... +</programlisting> + </example> + </section> + + </section> + + <section> + <title>Exported MI Functions</title> + + <section> + <title> + <function moreinfo="none">conference_reset</function> + </title> + <para> + Reset internal data. + </para> + <para> + Name: <emphasis>conference_reset</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>none</para></listitem> + </itemizedlist> + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :conference_reset:_reply_fifo_file_ + _empty_line_ + </programlisting> + </section> + + </section> + +</chapter> +

1 0

git:master: dispatcher(k): updated description and dependencies
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: 51ec1f966ed2932daefffb52fe0ae432cf2de3c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51ec1f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 4 13:41:10 2010 +0200 dispatcher(k): updated description and dependencies --- modules_k/dispatcher/README | 19 ++++++++++++---- modules_k/dispatcher/doc/dispatcher_admin.xml | 29 +++++++++++++++++++------ 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index bcf71b7..67177a5 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -190,12 +190,19 @@ Chapter 1. Admin Guide 1. Overview - This modules implements a dispatcher for destination addresses. It - computes hashes over parts of the request and selects an address from a - destination set. The selected address is used then as outbound proxy. + This module offers SIP load balancer functionality and it can be used + as SIP traffic dispatcher. There are many load balancing and traffic + dispaching algorithms that you can choose from, like: round-robin, + weight based load balancing, call load distribution, hashing over SIP + message attributes. - The module can be used as a stateless load balancer, having no - guarantee of fair distribution. + The module can be used as a stateless load balancer, it does not depend + on any call state tracing module. It requires TM module if you enable + auto-discovery of active/inactive gateways. + + It is very lightweight, therefore suitable for handling heavy SIP + traffic. Its small footprint and ability to load balancing rules from a + text plain file makes it suitable for embedded systems. 2. Dependencies @@ -206,6 +213,8 @@ Chapter 1. Admin Guide The following modules must be loaded before this module: * TM - only if active recovery of failed hosts is required. + * database engine - only if you want to load balancing routes from + database instead of plain text file. . 2.2. External libraries or applications diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index f0d694c..a6c8748 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -16,14 +16,21 @@ <section> <title>Overview</title> <para> - This modules implements a dispatcher for destination addresses. It - computes hashes over parts of the request and selects an address from - a destination set. The selected address is used then as outbound - proxy. + This module offers SIP load balancer functionality and it can be + used as SIP traffic dispatcher. There are many load balancing and + traffic dispaching algorithms that you can choose from, like: + round-robin, weight based load balancing, call load distribution, + hashing over SIP message attributes. </para> <para> - The module can be used as a stateless load balancer, having no - guarantee of fair distribution. + The module can be used as a stateless load balancer, it does not + depend on any call state tracing module. It requires TM module if + you enable auto-discovery of active/inactive gateways. + </para> + <para> + It is very lightweight, therefore suitable for handling heavy SIP + traffic. Its small footprint and ability to load balancing rules + from a text plain file makes it suitable for embedded systems. </para> </section> <section> @@ -35,7 +42,15 @@ <itemizedlist> <listitem> <para> - <emphasis>TM - only if active recovery of failed hosts is required</emphasis>. + <emphasis>TM - only if active recovery of failed hosts + is required</emphasis>. + </para> + </listitem> + <listitem> + <para> + <emphasis>database engine - only if you want to load + balancing routes from database instead of plain text file. + </emphasis>. </para> </listitem> </itemizedlist>

1 0

git:master: Makefile: added presence_conference module to exclude list
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: 5880cc7cd8fedd0b70d712bc3e02d816ff403784 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5880cc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 4 12:44:46 2010 +0200 Makefile: added presence_conference module to exclude list - added it to presence group --- Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9f2f51c..a809162 100644 --- a/Makefile +++ b/Makefile @@ -176,7 +176,7 @@ module_group_radius=acc_radius auth_radius misc_radius avp_radius uri_radius \ # kamailio modules module_group_presence=presence presence_dialoginfo presence_mwi presence_xml \ pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp \ - rls xcap_client xcap_server + rls xcap_client xcap_server presence_conference #ser modules module_group_presence+=dialog presence_b2b xcap # obsolete/unmaintained ser modules @@ -258,7 +258,7 @@ module_group_ktls=tls # K presence modules module_group_kpresence=presence presence_dialoginfo presence_mwi presence_xml \ pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp \ - rls xcap_client xcap_server + rls xcap_client xcap_server presence_conference # K lua module module_group_klua=app_lua @@ -291,7 +291,7 @@ else dialplan lcr utils presence presence_mwi \ presence_dialoginfo presence_xml pua pua_bla \ pua_dialoginfo pua_usrloc pua_xmpp \ - regex xcap_client xcap_server + regex xcap_client xcap_server presence_conference #excluded because they depend on external *.h files exclude_modules+= h350 # excluded because they do not compile (remove them only after they are

1 0

git:master: seas: fixed header-encoding for longest headers
by Elias Baixas 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: 8b10e08f9e981400621b4871bbf9b215961843c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b10e08… Author: Elias Baixas <elias.baixas(a)voztele.com> Committer: Elias Baixas <elias.baixas(a)voztele.com> Date: Mon Oct 4 12:39:46 2010 +0200 seas: fixed header-encoding for longest headers -refactorings for newer sip-router TM apis -some headers longer than 255 bytes were wrongly encoded --- modules_k/seas/encode_header.c | 4 + modules_k/seas/encode_parameters.c | 16 +++ modules_k/seas/event_dispatcher.c | 71 +++++++----- modules_k/seas/event_dispatcher.h | 6 +- modules_k/seas/seas.c | 50 +++++--- modules_k/seas/seas_action.c | 224 ++++++++++++++++++++++------------- modules_k/seas/seas_action.h | 13 +- modules_k/seas/statistics.c | 2 +- modules_k/seas/statistics.h | 2 + 9 files changed, 245 insertions(+), 143 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8b1…

1 0

git:master: pipelimit: updated doc with missing parameters
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: 9aba7590db1a56d2deff99b4c31da77353322cb3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9aba759… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 4 12:40:41 2010 +0200 pipelimit: updated doc with missing parameters - changed prefix of parameters from rlp_ to plp_ --- modules/pipelimit/README | 133 ++++++++++++++++++++++------ modules/pipelimit/doc/pipelimit_admin.xml | 102 ++++++++++++++++++++++- modules/pipelimit/pipelimit.c | 8 +- 3 files changed, 209 insertions(+), 34 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9ab…

1 0

what is new in v3.1.0
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Hello, please check the wiki page for what is new in upcoming v3.1.0 and add missing parts as well as enhance existing ones: http://sip-router.org/wiki/features/new-in-devel Thanks, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

1 0

upgrade 3.0.x to 3.1.x tutorial
by Daniel-Constantin Mierla 04 Oct '10

04 Oct '10

Hello, please take a moment and check the upgrade guidelines at: http://sip-router.org/wiki/install/3.0.x-to-3.1.x Add any missing parts you discover and enhance existing sections in order to make the process as smooth as possible. There are only two days left to launch 3.1. Thanks, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

2 5

git:master: modules/lcr: added upgrade from 3.0 script to lcr/utils dir
by Juha Heinanen 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: 63f98febab463c98e729280cf84d3e8c73d6e0dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63f98fe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Oct 4 11:38:37 2010 +0300 modules/lcr: added upgrade from 3.0 script to lcr/utils dir --- modules/lcr/utils/lcr_upgrade_from_3.0.sh | 254 +++++++++++++++++++++++++++++ 1 files changed, 254 insertions(+), 0 deletions(-) diff --git a/modules/lcr/utils/lcr_upgrade_from_3.0.sh b/modules/lcr/utils/lcr_upgrade_from_3.0.sh new file mode 100644 index 0000000..78f4a70 --- /dev/null +++ b/modules/lcr/utils/lcr_upgrade_from_3.0.sh @@ -0,0 +1,254 @@ +#!/usr/bin/php -q +<?php + +// This script upgrades lcr tables from sr 3.0 to sr 3.1 + +$db_host = "localhost"; +$db_name = "ser"; +$db_user = "rwuser"; +$db_pass = "password"; + +function db_connect($db_name) { + global $db_host, $db_user, $db_pass, $db_conn; + $db_conn = @mysql_connect($db_host, $db_user, $db_pass) + or die("Failed to connect to database '$db_name': " . + mysql_error() . "!" ); + if (!mysql_select_db($db_name)) { + mysql_close($db_conn); + die("Unknown database: '$db_name'!"); + } +} + +function db_disconnect() { + global $db_conn; + mysql_close($db_conn) or + die ("Failed to disconnect from database!"); +} + +function create_lcr_rule_table() { + + // create 'ser/lcr_rule' table + + global $db_name; + + db_connect($db_name); + + $result = mysql_query("SELECT table_version FROM version WHERE table_name='lcr_rule'") + or die("Failed to select from 'ser/version' table!\n"); + if (mysql_num_rows($result) == 1) { + db_disconnect(); + echo "Nothing to do for 'ser/lrc_rules' table\n"; + return; + } + + mysql_query("CREATE TABLE lcr_rule (id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, lcr_id SMALLINT UNSIGNED NOT NULL, prefix VARCHAR(16) DEFAULT NULL, from_uri VARCHAR(64) DEFAULT NULL, stopper TINYINT UNSIGNED NOT NULL DEFAULT 0, enabled TINYINT UNSIGNED NOT NULL DEFAULT 1, CONSTRAINT lcr_id_prefix_from_uri_idx UNIQUE (lcr_id, prefix, from_uri))") + or die("Failed to create 'ser/lcr_rule' table!\n"); + + mysql_query("INSERT INTO version SET table_name='lcr_rule', table_version=1") + or die ("Failed to insert into 'ser/version'\n"); + + db_disconnect(); + + echo "Table 'ser/lcr_rule' created\n"; +} + +function create_lcr_rule_target_table() { + + // create 'ser/lcr_rule_target' table + + global $db_name; + + db_connect($db_name); + + $result = mysql_query("SELECT table_version FROM version WHERE table_name='lcr_rule_target'") + or die("Failed to select from 'ser/version' table!\n"); + if (mysql_num_rows($result) == 1) { + db_disconnect(); + echo "Nothing to do for 'ser/lrc_rule_targets' table\n"; + return; + } + + mysql_query("CREATE TABLE lcr_rule_target (id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, lcr_id INT UNSIGNED NOT NULL, rule_id INT UNSIGNED NOT NULL, gw_id INT UNSIGNED NOT NULL, priority TINYINT UNSIGNED NOT NULL DEFAULT 1, weight TINYINT UNSIGNED NOT NULL DEFAULT 1, CONSTRAINT rule_id_gw_id_idx UNIQUE (rule_id, gw_id), INDEX lcr_id_idx (lcr_id))") + or die("Failed to create 'ser/lcr_rule_target' table!\n"); + + mysql_query("INSERT INTO version SET table_name='lcr_rule_target', table_version=1") + or die ("Failed to insert into 'ser/version'\n"); + + db_disconnect(); + + echo "Table 'ser/lcr_rule_target' created\n"; +} + +function create_lcr_gw_table() { + + // create 'ser/lcr_gw' table + + global $db_name; + + db_connect($db_name); + + $result = mysql_query("SELECT table_version FROM version WHERE table_name='lcr_gw'") + or die("Failed to select from 'ser/version' table!\n"); + if (mysql_num_rows($result) == 1) { + db_disconnect(); + echo "Nothing to do for 'ser/lrc_gws' table\n"; + return; + } + + mysql_query("CREATE TABLE lcr_gw (id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, lcr_id SMALLINT UNSIGNED NOT NULL, gw_name VARCHAR(128) DEFAULT NULL, uri_scheme TINYINT DEFAULT NULL, ip_addr VARCHAR(15) DEFAULT NULL, port SMALLINT DEFAULT NULL, transport TINYINT DEFAULT NULL, params VARCHAR(64) DEFAULT NULL, hostname VARCHAR(64) DEFAULT NULL, strip TINYINT UNSIGNED DEFAULT NULL, tag VARCHAR(16) DEFAULT NULL, flags INT UNSIGNED NOT NULL DEFAULT 0, defunct INT UNSIGNED DEFAULT NULL, CONSTRAINT lcr_id_ip_addr_port_hostname_idx UNIQUE (lcr_id, ip_addr, port, hostname))") + or die("Failed to create 'ser/lcr_gw' table!\n"); + + mysql_query("INSERT INTO version SET table_name='lcr_gw', table_version=1") + or die ("Failed to insert into 'ser/version'\n"); + + db_disconnect(); + + echo "Table 'ser/lcr_gw' created\n"; +} + +function update_lcr_tables() { + + // update 3.1 lcr tables based on 3.0 lcr tables + + global $db_name; + + db_connect($db_name); + + $result = mysql_query("SELECT table_version FROM version WHERE table_name='lcr'") + or die("Could not select from 'ser/version' table\n"); + if (mysql_num_rows($result) == 0) { + echo "Nothing to do for 'ser' lcr tables\n"; + return; + } + + $lcrs = array(); + $result = mysql_query("SELECT * FROM lcr") + or die ("Failed to select from 'ser/lcr' table\n"); + while ($result && $row = mysql_fetch_assoc($result)) { + $lcrs[] = $row; + } + db_disconnect(); + foreach ($lcrs as $lcr) { + $lcr_id = $lcr['lcr_id']; + $prefix = $lcr['prefix']; + $from_uri = $lcr['from_uri']; + if ($from_uri) { + $from_select_uri = "='" . $from_uri . "'"; + $from_insert_uri = "'" . $from_uri . "'"; + } else { + $from_select_uri = " IS NULL"; + $from_insert_uri = "NULL"; + } + $grp_id = $lcr['grp_id']; + $priority = $lcr['priority']; + db_connect($db_name); + $result = mysql_query("SELECT id FROM lcr_rule WHERE lcr_id=$lcr_id AND prefix='$prefix' AND from_uri$from_select_uri") + or die ("Failed to select from 'ser/lcr_rule' table\n"); + if (mysql_num_rows($result) == 0) { + mysql_query("INSERT INTO lcr_rule SET lcr_id = $lcr_id, prefix='$prefix', from_uri=$from_insert_uri") + or die ("Failed to insert into 'ser/lcr_rule' table\n"); + $rule_id = mysql_insert_id(); + } else { + $row = mysql_fetch_assoc($result); + $rule_id = $row['id']; + } + $result = mysql_query("SELECT * FROM gw WHERE lcr_id=$lcr_id AND grp_id=$grp_id") + or die("Failed to select from 'ser/gw' table\n"); + $gws = array(); + while ($result && $row = mysql_fetch_assoc($result)) { + $gws[] = $row; + } + foreach ($gws as $gw) { + $gw_name = $gw['gw_name']; + if ($gw_name) { + $gw_name = "'" . $gw_name . "'"; + } else { + $gw_name = "NULL"; + } + $ip_addr = $gw['ip_addr']; + if ($ip_addr) { + $select_ip_addr = "='" . $ip_addr . "'"; + $ip_addr = "'" . $ip_addr . "'"; + } else { + $select_ip_addr = " IS NULL"; + $ip_addr = "NULL"; + } + $hostname = $gw['hostname']; + if ($hostname) { + $select_hostname = "='" . $hostname . "'"; + $hostname = "'" . $hostname . "'"; + } else { + $select_hostname = " IS NULL"; + $hostname = "NULL"; + } + $port = $gw['port']; + if (!$port) { + $select_port = " IS NULL"; + $port = "NULL"; + } else { + $select_port = "=$port"; + } + $params = $gw['params']; + if ($params) { + $params = "'" . $params . "'"; + } else { + $params = "NULL"; + } + $uri_scheme = $gw['uri_scheme']; + if (!$uri_scheme) { + $uri_scheme = "NULL"; + } + $transport = $gw['transport']; + if (!$transport) { + $transport = "NULL"; + } + $strip = $gw['strip']; + $tag = $gw['tag']; + if ($tag) { + $tag = "'" . $tag . "'"; + } else { + $tag = "NULL"; + } + $weight = $gw['weight']; + if (!$weight) $weight = 1; + $flags = $gw['flags']; + $defunct = $gw['defunct']; + if (!$defunct) { + $defunct = "NULL"; + } + $result = mysql_query("SELECT id FROM lcr_gw WHERE (ip_addr IS NOT NULL AND lcr_id=$lcr_id AND ip_addr$select_ip_addr AND port$select_port) OR (lcr_id=$lcr_id AND ip_addr IS NULL AND hostname$select_hostname AND port$select_port)") + or die ("Failed to select from 'ser/lcr_gw' table\n"); + if (mysql_num_rows($result) == 0) { + mysql_query("INSERT INTO lcr_gw SET lcr_id=$lcr_id, gw_name=$gw_name, uri_scheme=$uri_scheme, ip_addr=$ip_addr, port=$port, transport=$transport, params=$params, hostname=$hostname, strip=$strip, tag=$tag, flags=$flags, defunct=$defunct") + or die ("Failed to insert into 'ser/lcr_gw' table\n"); + $gw_id = mysql_insert_id(); + } else { + $row = mysql_fetch_assoc($result); + $gw_id = $row['id']; + } + mysql_query("INSERT INTO lcr_rule_target SET lcr_id=$lcr_id, rule_id=$rule_id, gw_id=$gw_id, priority=$priority, weight=$weight") + or die ("Failed to insert into 'ser/lcr_rule_target' table\n"); + } + } + + mysql_query("DELETE FROM version WHERE table_name='lcr' OR table_name='gw'") + or die ("Failed to delete from 'ser/version' table\n"); + + db_disconnect(); + + echo "lcr tables updated\n"; +} + +echo "Starting upgrade ...\n"; + +create_lcr_rule_table(); + +create_lcr_rule_target_table(); + +create_lcr_gw_table(); + +update_lcr_tables(); + +echo "Upgrade done.\n"; + +?>

1 0