sr-dev November 2012

sr-dev@lists.kamailio.org

28 participants
122 discussions

Utils module - http requests
by Olle E. Johansson 30 Nov '12

30 Nov '12

Hi! (propably Hi Juha!) The documentation says: If HTTP server returns a class 2xx or 3xx reply, the first line of the reply's body (if any) is stored in <quote>result</quote> parameter, which must be a writable pseudo variable. My question is if we actually return any body of a 302 response or if we follow the redirect and return the body of the final response? I can change the text to make it more clear if we actually follow the redirect to a destination. /O

2 2

git:master: ipops: Minor documentation changes
by Olle E. Johansson 29 Nov '12

29 Nov '12

Module: sip-router Branch: master Commit: d02070dbef121525b320487d4ad2fbfda55aa62d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d02070d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Nov 29 22:00:19 2012 +0100 ipops: Minor documentation changes Use the IPv6 documentation address in examples if possible - 2001:DB8::/32 --- modules/ipops/README | 77 +++++++++++++++++++------------------ modules/ipops/doc/ipops_admin.xml | 26 ++++++++---- 2 files changed, 57 insertions(+), 46 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d02…

1 0

IPops module
by Olle E. Johansson 29 Nov '12

29 Nov '12

Any reason on why these functions can't be used from the onsend route? /O /* * Exported functions */ static cmd_export_t cmds[] = { { "is_ip", (cmd_function)w_is_ip, 1, fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "is_pure_ip", (cmd_function)w_is_pure_ip, 1, fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "is_ipv4", (cmd_function)w_is_ipv4, 1, fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "is_ipv6", (cmd_function)w_is_ipv6, 1, fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "is_ipv6_reference", (cmd_function)w_is_ipv6_reference, 1, fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "ip_type", (cmd_function)w_ip_type, 1, fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "compare_ips", (cmd_function)w_compare_ips, 2, fixup_spve_spve, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "compare_pure_ips", (cmd_function)w_compare_pure_ips, 2, fixup_spve_spve, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "is_ip_rfc1918", (cmd_function)w_is_ip_rfc1918, 1, fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "is_in_subnet", (cmd_function)w_ip_is_in_subnet, 2, fixup_spve_spve, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "bind_ipops", (cmd_function)bind_ipops, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0 } };

1 0

git:master: kamctlrc: adding sca to the list of extra modules
by Ovidiu Sas 29 Nov '12

29 Nov '12

Module: sip-router Branch: master Commit: 514875de53e19cfd4a208da3d778e454ce12a6f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=514875d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Nov 29 15:42:26 2012 -0500 kamctlrc: adding sca to the list of extra modules --- utils/kamctl/kamctlrc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 259f8e9..99b9562 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -107,7 +107,7 @@ # dialplan" # Kamailio extra modules -# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist htable purple" +# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist htable purple sca" ## type of aliases used: DB - database aliases; UL - usrloc aliases

1 0

git:master: utils: Fixing typos
by Olle E. Johansson 29 Nov '12

29 Nov '12

Module: sip-router Branch: master Commit: 14333d9360273c073473c144c198496a314e2e73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14333d9… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Nov 29 21:18:14 2012 +0100 utils: Fixing typos Typos that I missed in the first check... --- modules/utils/doc/utils_admin.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/utils/doc/utils_admin.xml b/modules/utils/doc/utils_admin.xml index 12e91d2..697d0ea 100644 --- a/modules/utils/doc/utils_admin.xml +++ b/modules/utils/doc/utils_admin.xml @@ -264,7 +264,7 @@ id switch filter proxy <title><function>forward_switch</function> usage</title> <programlisting format="linespecific"> ... -&ctltool; fifo sp_forward_switch 0=on +&ctltool; fifo forward_switch 0=on ... </programlisting> </example> @@ -294,7 +294,7 @@ id switch filter proxy <title><function>forward_filter</function> usage</title> <programlisting format="linespecific"> ... -&ctltool; fifo sp_forward_filter 0=REGISTER:INVITE +&ctltool; fifo forward_filter 0=REGISTER:INVITE ... </programlisting> </example> @@ -313,7 +313,7 @@ id switch filter proxy <title><function>forward_proxy</function> usage</title> <programlisting format="linespecific"> ... -&ctltool; fifo sp_forward_proxy 0=host-c.domain-c:5060 +&ctltool; fifo forward_proxy 0=host-c.domain-c:5060 ... </programlisting> </example>

1 0

git:master: utils: Minor documentation changes
by Olle E. Johansson 29 Nov '12

29 Nov '12

Module: sip-router Branch: master Commit: 1ab39cf866600ce155db3d5454981167d001d285 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ab39cf… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Nov 29 21:15:53 2012 +0100 utils: Minor documentation changes --- modules/utils/README | 39 +++++++++++++++++++----------------- modules/utils/doc/utils_admin.xml | 27 +++++++++++++------------ 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/modules/utils/README b/modules/utils/README index 4c967c5..a4ff648 100644 --- a/modules/utils/README +++ b/modules/utils/README @@ -4,7 +4,7 @@ Juha Heinanen TutPro Inc. - Copyright © 2008-2009 Juha Heinanen + Copyright � 2008-2009 Juha Heinanen __________________________________________________________________ Table of Contents @@ -98,7 +98,7 @@ Chapter 1. Admin Guide deactivated. Function xcap_auth_status can be used to check from presence server - database, if watcher is authorized to subscribe event “presence” of + database, if watcher is authorized to subscribe event "presence" of presentity. 2. Dependencies @@ -126,9 +126,11 @@ Chapter 1. Admin Guide 3.1. http_query_timeout (int) - Defines in seconds how long Kamailio waits response from HTTP server. + Defines in seconds how long Kamailio waits for response from HTTP + server. - Default value is null, i.e., xcap_auth_status function is disabled. + Default value is zero, i.e., that the http_query_timeout function is + disabled. Example 1.1. Set http_query_timeout parameter ... @@ -139,7 +141,7 @@ modparam("utils", "http_query_timeout", 2) Defines if the forwarding callback should be installed. - Default value is “0”. + Default value is "0" - disabled. Example 1.2. Set forward_active parameter ... @@ -148,8 +150,8 @@ modparam("utils", "http_query_timeout", 2) 3.3. pres_db_url (string) - Defines presence server database URL. If not given, xcap_auth_status - function is disabled. + Defines presence server database URL. If not given, the + xcap_auth_status function is disabled. There is no default value. @@ -160,9 +162,10 @@ modparam("utils", "pres_db_url", "mysql://foo:secret@localhost/pres") 3.4. xcap_table (string) - Defines name of xcap table in presence server database. + Defines the name of the xcap table in the presence server database. See + the xcap_server module documentation for more information. - Default value is “xcap”. + Default value is "xcap". Example 1.4. Set xcap_table parameter ... @@ -176,12 +179,12 @@ modparam("utils", "xcap_table", "pres_xcap") 4.1. http_query(url, result) - Sends HTTP GET request according to URL given in “url” parameter, which + Sends HTTP GET request according to URL given in "url" parameter, which is a string that may contain pseudo variables. - If HTTP server returns a class 2xx or 3xx reply, first line of reply's - body (if any) is stored in “result” parameter, which must be a writable - pseudo variable. + If HTTP server returns a class 2xx or 3xx reply, the first line of the + reply's body (if any) is stored in "result" parameter, which must be a + writable pseudo variable. Function returns reply code of HTTP reply or -1 if something went wrong. @@ -201,12 +204,12 @@ switch ($retcode) { 4.2. xcap_auth_status(watcher_uri, presentity_uri) - Function checks from presence server database if watcher is authorized - to subscribe event “presence” of presentity. Sphere checking is not - included. + Function checks in the presence server database if a watcher is + authorized to subscribe to event "presence" of presentity. Sphere + checking is not included. - Both watcher_uri and presentity_uri are pseudo variables. Function - returns ACTIVE_STATUS, if subscription is allowed and PENDING_STATUS, + Both watcher_uri and presentity_uri are pseudo variables. The function + returns ACTIVE_STATUS, if a subscription is allowed and PENDING_STATUS, TERMINATED_STATUS, or WAITING_STATUS otherwise. See presence/subscribe.h for the corresponding integer codes. In case of error, function returns -1. diff --git a/modules/utils/doc/utils_admin.xml b/modules/utils/doc/utils_admin.xml index 28e611a..12e91d2 100644 --- a/modules/utils/doc/utils_admin.xml +++ b/modules/utils/doc/utils_admin.xml @@ -75,13 +75,13 @@ <section> <title><varname>http_query_timeout</varname> (int)</title> <para> - Defines in seconds how long &kamailio; waits response + Defines in seconds how long &kamailio; waits for response from HTTP server. </para> <para> <emphasis> - Default value is null, i.e., - xcap_auth_status function is disabled. + Default value is zero, i.e., + that the http_query_timeout function is disabled. </emphasis> </para> <example> @@ -100,7 +100,7 @@ modparam("utils", "http_query_timeout", 2) </para> <para> <emphasis> - Default value is <quote>0</quote>. + Default value is <quote>0</quote> - disabled. </emphasis> </para> <example> @@ -115,8 +115,8 @@ modparam("utils", "http_query_timeout", 2) <section> <title><varname>pres_db_url</varname> (string)</title> <para> - Defines presence server database URL. If not - given, xcap_auth_status function is disabled. + Defines presence server database URL. If not + given, the xcap_auth_status function is disabled. </para> <para> <emphasis> @@ -135,7 +135,8 @@ modparam("utils", "pres_db_url", "mysql://foo:secret@localhost/pres") <section> <title><varname>xcap_table</varname> (string)</title> <para> - Defines name of xcap table in presence server database. + Defines the name of the xcap table in the presence server database. + See the xcap_server module documentation for more information. </para> <para> <emphasis> @@ -166,7 +167,7 @@ modparam("utils", "xcap_table", "pres_xcap") </para> <para> If HTTP server returns a class 2xx or 3xx reply, - first line of reply's body (if any) is + the first line of the reply's body (if any) is stored in <quote>result</quote> parameter, which must be a writable pseudo variable. </para> @@ -176,7 +177,7 @@ modparam("utils", "xcap_table", "pres_xcap") </para> <para> This function can be used from REQUEST_ROUTE, - ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. + ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. </para> <example> <title><function>http_query()</function> usage</title> @@ -196,15 +197,15 @@ switch ($retcode) { <function moreinfo="none">xcap_auth_status(watcher_uri, presentity_uri)</function> </title> <para> - Function checks from presence server database if - watcher is authorized to subscribe event + Function checks in the presence server database if + a watcher is authorized to subscribe to event <quote>presence</quote> of presentity. Sphere checking is not included. </para> <para> Both watcher_uri and presentity_uri are - pseudo variables. Function returns - ACTIVE_STATUS, if subscription is + pseudo variables. The function returns + ACTIVE_STATUS, if a subscription is allowed and PENDING_STATUS, TERMINATED_STATUS, or WAITING_STATUS otherwise. See presence/subscribe.h for the corresponding integer

1 0

git:master: LDAP minor documentation changes
by Olle E. Johansson 29 Nov '12

29 Nov '12

Module: sip-router Branch: master Commit: 010ea5d4b71308cb18cd759db70ac48f081a672e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=010ea5d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Nov 29 20:52:27 2012 +0100 LDAP minor documentation changes --- modules_k/ldap/README | 68 ++++++++++++++++++------------------ modules_k/ldap/doc/ldap_admin.xml | 36 ++++++++++---------- 2 files changed, 52 insertions(+), 52 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=010…

1 0

git:master: sca: adding missing sca db utils files
by Ovidiu Sas 29 Nov '12

29 Nov '12

Module: sip-router Branch: master Commit: aca01e149445a0c6f87a9ed97974bcba612e426f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aca01e1… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Nov 29 09:57:48 2012 -0500 sca: adding missing sca db utils files --- .../kamctl/db_berkeley/kamailio/sca_subscriptions | 10 +++++++ utils/kamctl/db_berkeley/kamailio/version | 2 + utils/kamctl/db_sqlite/sca-create.sql | 20 ++++++++++++++ utils/kamctl/dbtext/kamailio/sca_subscriptions | 1 + utils/kamctl/dbtext/kamailio/version | 1 + utils/kamctl/oracle/sca-create.sql | 28 ++++++++++++++++++++ utils/kamctl/postgres/sca-create.sql | 20 ++++++++++++++ 7 files changed, 82 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/sca_subscriptions b/utils/kamctl/db_berkeley/kamailio/sca_subscriptions new file mode 100644 index 0000000..39709bc --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/sca_subscriptions @@ -0,0 +1,10 @@ +METADATA_COLUMNS +id(int) subscriber(str) aor(str) event(int) expires(int) state(int) app_idx(int) call_id(str) from_tag(str) to_tag(str) notify_cseq(int) subscribe_cseq(int) +METADATA_KEY + +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|NIL|NIL|0|0|0|0|NIL|NIL|NIL|NIL|NIL diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 61f4be3..933524c 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -92,6 +92,8 @@ rls_presentity| rls_presentity|1 rls_watchers| rls_watchers|3 +sca_subscriptions| +sca_subscriptions|0 silo| silo|7 sip_trace| diff --git a/utils/kamctl/db_sqlite/sca-create.sql b/utils/kamctl/db_sqlite/sca-create.sql new file mode 100644 index 0000000..eca6ea2 --- /dev/null +++ b/utils/kamctl/db_sqlite/sca-create.sql @@ -0,0 +1,20 @@ +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','0'); +CREATE TABLE sca_subscriptions ( + id INTEGER PRIMARY KEY NOT NULL, + subscriber VARCHAR(255) NOT NULL, + aor VARCHAR(255) NOT NULL, + event INTEGER DEFAULT 0 NOT NULL, + expires INTEGER DEFAULT 0 NOT NULL, + state INTEGER DEFAULT 0 NOT NULL, + app_idx INTEGER DEFAULT 0 NOT NULL, + call_id VARCHAR(255) NOT NULL, + from_tag VARCHAR(64) NOT NULL, + to_tag VARCHAR(64) NOT NULL, + notify_cseq INTEGER NOT NULL, + subscribe_cseq INTEGER NOT NULL, + CONSTRAINT sca_subscriptions_sca_subscriptions_idx UNIQUE (subscriber, call_id, from_tag, to_tag) +); + +CREATE INDEX sca_subscriptions_sca_expires_idx ON sca_subscriptions (expires); +CREATE INDEX sca_subscriptions_sca_subscribers_idx ON sca_subscriptions (subscriber, event); + diff --git a/utils/kamctl/dbtext/kamailio/sca_subscriptions b/utils/kamctl/dbtext/kamailio/sca_subscriptions new file mode 100644 index 0000000..ba5183a --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/sca_subscriptions @@ -0,0 +1 @@ +id(int,auto) subscriber(string) aor(string) event(int) expires(int) state(int) app_idx(int) call_id(string) from_tag(string) to_tag(string) notify_cseq(int) subscribe_cseq(int) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index b362eef..1fab1c5 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -41,6 +41,7 @@ purplemap:1 re_grp:1 rls_presentity:1 rls_watchers:3 +sca_subscriptions:0 silo:7 sip_trace:3 speed_dial:2 diff --git a/utils/kamctl/oracle/sca-create.sql b/utils/kamctl/oracle/sca-create.sql new file mode 100644 index 0000000..5674097 --- /dev/null +++ b/utils/kamctl/oracle/sca-create.sql @@ -0,0 +1,28 @@ +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','0'); +CREATE TABLE sca_subscriptions ( + id NUMBER(10) PRIMARY KEY, + subscriber VARCHAR2(255), + aor VARCHAR2(255), + event NUMBER(10) DEFAULT 0 NOT NULL, + expires NUMBER(10) DEFAULT 0 NOT NULL, + state NUMBER(10) DEFAULT 0 NOT NULL, + app_idx NUMBER(10) DEFAULT 0 NOT NULL, + call_id VARCHAR2(255), + from_tag VARCHAR2(64), + to_tag VARCHAR2(64), + notify_cseq NUMBER(10), + subscribe_cseq NUMBER(10), + CONSTRAINT ORA_sca_subscriptions_idx UNIQUE (subscriber, call_id, from_tag, to_tag) +); + +CREATE OR REPLACE TRIGGER sca_subscriptions_tr +before insert on sca_subscriptions FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END sca_subscriptions_tr; +/ +BEGIN map2users('sca_subscriptions'); END; +/ +CREATE INDEX ORA_sca_expires_idx ON sca_subscriptions (expires); +CREATE INDEX ORA_sca_subscribers_idx ON sca_subscriptions (subscriber, event); + diff --git a/utils/kamctl/postgres/sca-create.sql b/utils/kamctl/postgres/sca-create.sql new file mode 100644 index 0000000..6f7e1b5 --- /dev/null +++ b/utils/kamctl/postgres/sca-create.sql @@ -0,0 +1,20 @@ +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','0'); +CREATE TABLE sca_subscriptions ( + id SERIAL PRIMARY KEY NOT NULL, + subscriber VARCHAR(255) NOT NULL, + aor VARCHAR(255) NOT NULL, + event INTEGER DEFAULT 0 NOT NULL, + expires INTEGER DEFAULT 0 NOT NULL, + state INTEGER DEFAULT 0 NOT NULL, + app_idx INTEGER DEFAULT 0 NOT NULL, + call_id VARCHAR(255) NOT NULL, + from_tag VARCHAR(64) NOT NULL, + to_tag VARCHAR(64) NOT NULL, + notify_cseq INTEGER NOT NULL, + subscribe_cseq INTEGER NOT NULL, + CONSTRAINT sca_subscriptions_sca_subscriptions_idx UNIQUE (subscriber, call_id, from_tag, to_tag) +); + +CREATE INDEX sca_subscriptions_sca_expires_idx ON sca_subscriptions (expires); +CREATE INDEX sca_subscriptions_sca_subscribers_idx ON sca_subscriptions (subscriber, event); +

1 0

git:master: sca: remove old SQL table creation file
by Andrew Mortensen 29 Nov '12

29 Nov '12

Module: sip-router Branch: master Commit: cc3bc9669a2c528db9a8ada5e13cd553be9d2f1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc3bc96… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed Nov 28 23:23:48 2012 -0500 sca: remove old SQL table creation file - use make dbschema to generate sql from xml table schema instead. --- modules/sca/sca.sql | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/modules/sca/sca.sql b/modules/sca/sca.sql deleted file mode 100644 index 6333a7d..0000000 --- a/modules/sca/sca.sql +++ /dev/null @@ -1,17 +0,0 @@ -INSERT INTO version (table_name, table_version) values ('sca_subscriptions', '0'); -CREATE TABLE sca_subscriptions ( - id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - subscriber VARCHAR(255) NOT NULL, - aor VARCHAR(255) NOT NULL, - event INT(1) NOT NULL, - expires INT(11) NOT NULL, - state INT(1) NOT NULL, - app_idx INT(4) NOT NULL, - call_id VARCHAR(255) NOT NULL, - from_tag VARCHAR(128) NOT NULL, - to_tag VARCHAR(128) NOT NULL, - notify_cseq INT(11) NOT NULL, - subscribe_cseq INT(11) NOT NULL, - - CONSTRAINT sca_subscriptions_idx UNIQUE (subscriber, call_id, from_tag, to_tag) -) ENGINE=MyISAM;

1 0

git:master: sca: add db schema files and kamctl table create SQL file.
by Andrew Mortensen 29 Nov '12

29 Nov '12

Module: sip-router Branch: master Commit: 7575c853b1786fc09965238ea68bca4400bd7c5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7575c85… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed Nov 28 22:50:30 2012 -0500 sca: add db schema files and kamctl table create SQL file. --- lib/srdb1/schema/kamailio-sca.xml | 12 ++++ lib/srdb1/schema/sca.xml | 126 +++++++++++++++++++++++++++++++++++++ utils/kamctl/mysql/sca-create.sql | 20 ++++++ 3 files changed, 158 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/kamailio-sca.xml b/lib/srdb1/schema/kamailio-sca.xml new file mode 100644 index 0000000..e7b210e --- /dev/null +++ b/lib/srdb1/schema/kamailio-sca.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + + <!ENTITY % entities SYSTEM "entities.xml"> + %entities; +]> + +<database xmlns:xi="http://www.w3.org/2001/XInclude"> + <name>Shared Call Appearance Values</name> + <xi:include href="sca.xml"/> +</database> diff --git a/lib/srdb1/schema/sca.xml b/lib/srdb1/schema/sca.xml new file mode 100644 index 0000000..8dd16e6 --- /dev/null +++ b/lib/srdb1/schema/sca.xml @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="sca_susbcriptions" xmlns:db="http://docbook.org/ns/docbook"> + <name>sca_subscriptions</name> + <version>0</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the sca module to store active subscriptions. At startup time, the sca module loads unexpired subscriptions into its subscription hash table. More information about the sca module can be found at: &KAMAILIO_MOD_DOC;sca.html + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID</description> + </column> + + <column id="subscriber"> + <name>subscriber</name> + <type>string</type> + <size>255</size> + <description>URI of SCA subscriber</description> + </column> + + <column id="aor"> + <name>aor</name> + <type>string</type> + <size>255</size> + <description>SCA Address-of-Record for the group</description> + </column> + + <column id="event"> + <name>event</name> + <type>int</type> + <default>0</default> + <description>SCA event type. 0 - call-info, 1 - line-seize</description> + </column> + + <column id="expires"> + <name>expires</name> + <type>int</type> + <size>&expires_len;</size> + <default>0</default> + <description>Epoch time of SCA subscription expiration</description> + </column> + + <column id="state"> + <name>state</name> + <type>int</type> + <default>0</default> + <description>SCA subscription state, 0 - active</description> + </column> + + <column id="app_idx"> + <name>app_idx</name> + <type>int</type> + <default>0</default> + <description>Seized line appearance index</description> + </column> + + <column id="call_id"> + <name>call_id</name> + <type>string</type> + <size>&callid_len;</size> + <description>Call-ID value for subscription dialog</description> + </column> + + <column id="from_tag"> + <name>from_tag</name> + <type>string</type> + <size>&domain_len;</size> + <description>From-tag for subscription dialog</description> + </column> + + <column id="to_tag"> + <name>to_tag</name> + <type>string</type> + <size>&domain_len;</size> + <description>To-tag for subscription dialog</description> + </column> + + <column id="notify_cseq"> + <name>notify_cseq</name> + <type>int</type> + <size>&cseq_len;</size> + <description>Cseq for NOTIFYs sent to subscriber</description> + </column> + + <column id="subscribe_cseq"> + <name>subscribe_cseq</name> + <type>int</type> + <size>&cseq_len;</size> + <description>Cseq for SUBSCRIBEs sent from subscriber</description> + </column> + + <index> + <name>sca_subscriptions_idx</name> + <colref linkend="subscriber" /> + <colref linkend="call_id" /> + <colref linkend="from_tag" /> + <colref linkend="to_tag" /> + <unique /> + </index> + + <index> + <name>sca_expires_idx</name> + <colref linkend="expires" /> + </index> + + <index> + <name>sca_subscribers_idx</name> + <colref linkend="subscriber" /> + <colref linkend="event" /> + </index> +</table> diff --git a/utils/kamctl/mysql/sca-create.sql b/utils/kamctl/mysql/sca-create.sql new file mode 100644 index 0000000..ef2e371 --- /dev/null +++ b/utils/kamctl/mysql/sca-create.sql @@ -0,0 +1,20 @@ +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','0'); +CREATE TABLE sca_subscriptions ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + subscriber VARCHAR(255) NOT NULL, + aor VARCHAR(255) NOT NULL, + event INT DEFAULT 0 NOT NULL, + expires INT(11) DEFAULT 0 NOT NULL, + state INT DEFAULT 0 NOT NULL, + app_idx INT DEFAULT 0 NOT NULL, + call_id VARCHAR(255) NOT NULL, + from_tag VARCHAR(64) NOT NULL, + to_tag VARCHAR(64) NOT NULL, + notify_cseq INT(11) NOT NULL, + subscribe_cseq INT(11) NOT NULL, + CONSTRAINT sca_subscriptions_idx UNIQUE (subscriber, call_id, from_tag, to_tag) +) ENGINE=MyISAM; + +CREATE INDEX sca_expires_idx ON sca_subscriptions (expires); +CREATE INDEX sca_subscribers_idx ON sca_subscriptions (subscriber, event); +

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2012