sr-dev

sr-dev@lists.kamailio.org

18 participants
44295 discussions

git:master: modules_k/drouting: Update SQL files

by Raul Alexis Betancor Santana

Module: sip-router Branch: master Commit: aba560469218f5cc80b5084a5038bfdaecab493e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aba5604… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Sun Jan 3 16:55:28 2010 +0000 modules_k/drouting: Update SQL files - Updated SQL files, created from make dbschema --- utils/kamctl/mysql/drouting-create.sql | 25 +++++++++++++++--- utils/kamctl/oracle/drouting-create.sql | 41 ++++++++++++++++++++++++++--- utils/kamctl/postgres/drouting-create.sql | 25 +++++++++++++++--- 3 files changed, 79 insertions(+), 12 deletions(-) diff --git a/utils/kamctl/mysql/drouting-create.sql b/utils/kamctl/mysql/drouting-create.sql index 9b4388f..aac0da3 100644 --- a/utils/kamctl/mysql/drouting-create.sql +++ b/utils/kamctl/mysql/drouting-create.sql @@ -1,22 +1,39 @@ -INSERT INTO version (table_name, table_version) values ('dr_gateways','1'); +INSERT INTO version (table_name, table_version) values ('dr_gateways','3'); CREATE TABLE dr_gateways ( gwid INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, type INT(11) UNSIGNED DEFAULT 0 NOT NULL, address VARCHAR(128) NOT NULL, strip INT(11) UNSIGNED DEFAULT 0 NOT NULL, - pri_prefix VARCHAR(64) DEFAULT NULL, + pri_prefix VARCHAR(16) DEFAULT NULL, + attrs VARCHAR(255) DEFAULT NULL, description VARCHAR(128) DEFAULT '' NOT NULL ) ENGINE=MyISAM; -INSERT INTO version (table_name, table_version) values ('dr_rules','1'); +INSERT INTO version (table_name, table_version) values ('dr_rules','3'); CREATE TABLE dr_rules ( ruleid INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, groupid VARCHAR(255) NOT NULL, prefix VARCHAR(64) NOT NULL, timerec VARCHAR(255) NOT NULL, priority INT(11) DEFAULT 0 NOT NULL, - routeid VARCHAR(64) NOT NULL, + routeid VARCHAR(255) NOT NULL, gwlist VARCHAR(255) NOT NULL, description VARCHAR(128) DEFAULT '' NOT NULL ) ENGINE=MyISAM; +INSERT INTO version (table_name, table_version) values ('dr_gw_lists','1'); +CREATE TABLE dr_gw_lists ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + gwlist VARCHAR(255) NOT NULL, + description VARCHAR(128) DEFAULT '' NOT NULL +) ENGINE=MyISAM; + +INSERT INTO version (table_name, table_version) values ('dr_groups','2'); +CREATE TABLE dr_groups ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + username VARCHAR(64) NOT NULL, + domain VARCHAR(128) DEFAULT '' NOT NULL, + groupid INT(11) UNSIGNED DEFAULT 0 NOT NULL, + description VARCHAR(128) DEFAULT '' NOT NULL +) ENGINE=MyISAM; + diff --git a/utils/kamctl/oracle/drouting-create.sql b/utils/kamctl/oracle/drouting-create.sql index a5dde37..e52cdba 100644 --- a/utils/kamctl/oracle/drouting-create.sql +++ b/utils/kamctl/oracle/drouting-create.sql @@ -1,10 +1,11 @@ -INSERT INTO version (table_name, table_version) values ('dr_gateways','1'); +INSERT INTO version (table_name, table_version) values ('dr_gateways','3'); CREATE TABLE dr_gateways ( gwid NUMBER(10) PRIMARY KEY, type NUMBER(10) DEFAULT 0 NOT NULL, address VARCHAR2(128), strip NUMBER(10) DEFAULT 0 NOT NULL, - pri_prefix VARCHAR2(64) DEFAULT NULL, + pri_prefix VARCHAR2(16) DEFAULT NULL, + attrs VARCHAR2(255) DEFAULT NULL, description VARCHAR2(128) DEFAULT '' ); @@ -16,14 +17,14 @@ END dr_gateways_tr; / BEGIN map2users('dr_gateways'); END; / -INSERT INTO version (table_name, table_version) values ('dr_rules','1'); +INSERT INTO version (table_name, table_version) values ('dr_rules','3'); CREATE TABLE dr_rules ( ruleid NUMBER(10) PRIMARY KEY, groupid VARCHAR2(255), prefix VARCHAR2(64), timerec VARCHAR2(255), priority NUMBER(10) DEFAULT 0 NOT NULL, - routeid VARCHAR2(64), + routeid VARCHAR2(255), gwlist VARCHAR2(255), description VARCHAR2(128) DEFAULT '' ); @@ -36,3 +37,35 @@ END dr_rules_tr; / BEGIN map2users('dr_rules'); END; / +INSERT INTO version (table_name, table_version) values ('dr_gw_lists','1'); +CREATE TABLE dr_gw_lists ( + id NUMBER(10) PRIMARY KEY, + gwlist VARCHAR2(255), + description VARCHAR2(128) DEFAULT '' +); + +CREATE OR REPLACE TRIGGER dr_gw_lists_tr +before insert on dr_gw_lists FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END dr_gw_lists_tr; +/ +BEGIN map2users('dr_gw_lists'); END; +/ +INSERT INTO version (table_name, table_version) values ('dr_groups','2'); +CREATE TABLE dr_groups ( + id NUMBER(10) PRIMARY KEY, + username VARCHAR2(64), + domain VARCHAR2(128) DEFAULT '', + groupid NUMBER(10) DEFAULT 0 NOT NULL, + description VARCHAR2(128) DEFAULT '' +); + +CREATE OR REPLACE TRIGGER dr_groups_tr +before insert on dr_groups FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END dr_groups_tr; +/ +BEGIN map2users('dr_groups'); END; +/ diff --git a/utils/kamctl/postgres/drouting-create.sql b/utils/kamctl/postgres/drouting-create.sql index 4defbfe..1a02c6b 100644 --- a/utils/kamctl/postgres/drouting-create.sql +++ b/utils/kamctl/postgres/drouting-create.sql @@ -1,22 +1,39 @@ -INSERT INTO version (table_name, table_version) values ('dr_gateways','1'); +INSERT INTO version (table_name, table_version) values ('dr_gateways','3'); CREATE TABLE dr_gateways ( gwid SERIAL PRIMARY KEY NOT NULL, type INTEGER DEFAULT 0 NOT NULL, address VARCHAR(128) NOT NULL, strip INTEGER DEFAULT 0 NOT NULL, - pri_prefix VARCHAR(64) DEFAULT NULL, + pri_prefix VARCHAR(16) DEFAULT NULL, + attrs VARCHAR(255) DEFAULT NULL, description VARCHAR(128) DEFAULT '' NOT NULL ); -INSERT INTO version (table_name, table_version) values ('dr_rules','1'); +INSERT INTO version (table_name, table_version) values ('dr_rules','3'); CREATE TABLE dr_rules ( ruleid SERIAL PRIMARY KEY NOT NULL, groupid VARCHAR(255) NOT NULL, prefix VARCHAR(64) NOT NULL, timerec VARCHAR(255) NOT NULL, priority INTEGER DEFAULT 0 NOT NULL, - routeid VARCHAR(64) NOT NULL, + routeid VARCHAR(255) NOT NULL, gwlist VARCHAR(255) NOT NULL, description VARCHAR(128) DEFAULT '' NOT NULL ); +INSERT INTO version (table_name, table_version) values ('dr_gw_lists','1'); +CREATE TABLE dr_gw_lists ( + id SERIAL PRIMARY KEY NOT NULL, + gwlist VARCHAR(255) NOT NULL, + description VARCHAR(128) DEFAULT '' NOT NULL +); + +INSERT INTO version (table_name, table_version) values ('dr_groups','2'); +CREATE TABLE dr_groups ( + id SERIAL PRIMARY KEY NOT NULL, + username VARCHAR(64) NOT NULL, + domain VARCHAR(128) DEFAULT '' NOT NULL, + groupid INTEGER DEFAULT 0 NOT NULL, + description VARCHAR(128) DEFAULT '' NOT NULL +); +

15 years

git:master: modules_k/drouting: Fix previous commit that comes from a broken merge

by Raul Alexis Betancor Santana

Module: sip-router Branch: master Commit: 8806c3c19fd7a4423b651310ec1361659034e459 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8806c3c… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Sun Jan 3 14:46:21 2010 +0000 modules_k/drouting: Fix previous commit that comes from a broken merge - Fixed .xml files so now they are valid ones. --- lib/srdb1/schema/dr_gateways.xml | 40 +--------------------------- lib/srdb1/schema/dr_groups.xml | 2 +- lib/srdb1/schema/dr_gw_lists.xml | 2 +- lib/srdb1/schema/dr_rules.xml | 45 +------------------------------- lib/srdb1/schema/kamailio-drouting.xml | 10 ------- 5 files changed, 4 insertions(+), 95 deletions(-) diff --git a/lib/srdb1/schema/dr_gateways.xml b/lib/srdb1/schema/dr_gateways.xml index d1c3f4f..e595151 100644 --- a/lib/srdb1/schema/dr_gateways.xml +++ b/lib/srdb1/schema/dr_gateways.xml @@ -9,20 +9,12 @@ <table id="dr_gateways" xmlns:db="http://docbook.org/ns/docbook"> <name>dr_gateways</name> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the Dynamic Routing module to store information about the destinations/gateways where to route calls. - More information can be found at: &OPENSIPS_MOD_DOC;drouting.html. -======= - <version>1</version> - <type db="mysql">&MYSQL_TABLE_TYPE;</type> - <description> - <db:para>This table is used by the douting module - keeps the - gateways data. ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml + More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. </db:para> </description> @@ -33,12 +25,8 @@ <autoincrement/> <primary/> <type db="dbtext">int,auto</type> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <description>GW unique ID - used to link the GW from the routing rules -======= - <description>Unique ID per gateway ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml </description> </column> @@ -47,22 +35,14 @@ <type>unsigned int</type> <size>11</size> <default>0</default> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <description>Type/class of the GW (user defined)</description> -======= - <description>Type of gateway</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml </column> <column id="address"> <name>address</name> <type>string</type> <size>128</size> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <description>GW/destination address as name/IP[:port]</description> -======= - <description>Address of gateway (hostname or ip and port)</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml </column> <column id="strip"> @@ -70,18 +50,13 @@ <type>unsigned int</type> <size>11</size> <default>0</default> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <description>Number of digits to be striped out for the begining of the username when using this GW/destination</description> -======= - <description>Number of digits to strip from dialed number</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml </column> <column id="pri_prefix"> <name>pri_prefix</name> <type>string</type> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <size>16</size> <null/> <default><null/></default> @@ -97,12 +72,6 @@ <default><null/></default> <description>Generic string describing GW attributes - this string is to be interpreted from the script</description> -======= - <size>64</size> - <null/> - <default><null/></default> - <description>What to prefix to dialed number</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml </column> <column id="description"> @@ -110,13 +79,6 @@ <type>string</type> <size>128</size> <default></default> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <description>Text description of the GW/destination</description> </column> </table> -======= - <description>Short description of gateway</description> - </column> -</table> - ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml diff --git a/lib/srdb1/schema/dr_groups.xml b/lib/srdb1/schema/dr_groups.xml index 03549e0..fa4d6df 100644 --- a/lib/srdb1/schema/dr_groups.xml +++ b/lib/srdb1/schema/dr_groups.xml @@ -14,7 +14,7 @@ <description> <db:para>This table is used by the Dynamic Routing module to store information about the routing groups (users mapped over groups). - More information can be found at: &OPENSIPS_MOD_DOC;drouting.html. + More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. </db:para> </description> diff --git a/lib/srdb1/schema/dr_gw_lists.xml b/lib/srdb1/schema/dr_gw_lists.xml index e8110e7..7dd4c3e 100644 --- a/lib/srdb1/schema/dr_gw_lists.xml +++ b/lib/srdb1/schema/dr_gw_lists.xml @@ -14,7 +14,7 @@ <description> <db:para>This table is used by the Dynamic Routing module to define lists of gateways to be used in rule definitions. - More information can be found at: &OPENSIPS_MOD_DOC;drouting.html. + More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. </db:para> </description> diff --git a/lib/srdb1/schema/dr_rules.xml b/lib/srdb1/schema/dr_rules.xml index 2c635ce..a114ea7 100644 --- a/lib/srdb1/schema/dr_rules.xml +++ b/lib/srdb1/schema/dr_rules.xml @@ -9,20 +9,12 @@ <table id="dr_rules" xmlns:db="http://docbook.org/ns/docbook"> <name>dr_rules</name> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the Dynamic Routing module to store information about the routing rules. - More information can be found at: &OPENSIPS_MOD_DOC;drouting.html. -======= - <version>1</version> - <type db="mysql">&MYSQL_TABLE_TYPE;</type> - <description> - <db:para>This table is used by the drouting module - keeps the - routing rules data. ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml + More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. </db:para> </description> @@ -41,12 +33,8 @@ <name>groupid</name> <type>string</type> <size>255</size> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>The ID(s) of the routing group(s) this rule is to be used for - comma separeted list of numerical Ids -======= - <description>list of routing group IDs ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </description> </column> @@ -54,22 +42,14 @@ <name>prefix</name> <type>string</type> <size>64</size> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>Numerical prefix to match this rule</description> -======= - <description>Destination prefix for this rule</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </column> <column id="timerec"> <name>timerec</name> <type>string</type> <size>255</size> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>Time recurrence used for matching this rule.</description> -======= - <description>Time recurrence for this rule.</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </column> <column id="priority"> @@ -77,39 +57,24 @@ <type>int</type> <size>11</size> <default>0</default> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>Priority of this rule (among rules with same prefix and timerec).</description> -======= - <description>Priority of the rule.</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </column> <column id="routeid"> <name>routeid</name> <type>string</type> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <size>255</size> <description>Route block (from cfg script) to be called when rule matches.</description> -======= - <size>64</size> - <description>Name of route block (from cfg script) to be - executed when matching this rule.</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </column> <column id="gwlist"> <name>gwlist</name> <type>string</type> <size>255</size> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>Reference to the GWs/destinations to be used when rule matches.</description> -======= - <description>The list of destinations (gws) to be used when - matching this rule.</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </column> <column id="description"> @@ -117,15 +82,7 @@ <type>string</type> <size>128</size> <default></default> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>Text description of the rule</description> </column> </table> -======= - <description>Short description of the rule</description> - </column> - -</table> - ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml diff --git a/lib/srdb1/schema/kamailio-drouting.xml b/lib/srdb1/schema/kamailio-drouting.xml index 6d4f59b..d058f9b 100644 --- a/lib/srdb1/schema/kamailio-drouting.xml +++ b/lib/srdb1/schema/kamailio-drouting.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" -<<<<<<< HEAD:lib/srdb1/schema/kamailio-drouting.xml "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ -======= - "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/kamailio-drouting.xml <!ENTITY % entities SYSTEM "entities.xml"> %entities; @@ -12,15 +8,9 @@ ]> <database xmlns:xi="http://www.w3.org/2001/XInclude"> -<<<<<<< HEAD:lib/srdb1/schema/kamailio-drouting.xml <name>Dynamic Routing</name> <xi:include href="dr_gateways.xml"/> <xi:include href="dr_rules.xml"/> <xi:include href="dr_gw_lists.xml"/> <xi:include href="dr_groups.xml"/> -======= - <name>DRouting</name> - <xi:include href="dr_gateways.xml"/> - <xi:include href="dr_rules.xml"/> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/kamailio-drouting.xml </database>

15 years

Re: [sr-dev] git:master: modules/privacy: Privacy module, for handling RFC3325

by Daniel-Constantin Mierla

On 1/3/10 2:26 PM, Raúl Alexis Betancor Santana wrote: > [...] > It's possible to have local commit not pushed to the main repo? ... I mean to > be able to do a selective push. > I haven't checked for such operation so far. Maybe someone else on the list can answer faster. I use separate local repo for intermediary work. Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

15 years

git:master: modules_k/drouting: Added missing db schema file

by Raul Alexis Betancor Santana

Module: sip-router Branch: master Commit: 3d05730e7db7dbb1e3c8fc3d88b13a57110e4be0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d05730… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Sun Jan 3 13:04:14 2010 +0000 modules_k/drouting: Added missing db schema file - Added kamailio-drouting.xml missing file, so make dbschema could regenerate the .sql files --- lib/srdb1/schema/kamailio-drouting.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/kamailio-drouting.xml b/lib/srdb1/schema/kamailio-drouting.xml new file mode 100644 index 0000000..d058f9b --- /dev/null +++ b/lib/srdb1/schema/kamailio-drouting.xml @@ -0,0 +1,16 @@ +<?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>Dynamic Routing</name> + <xi:include href="dr_gateways.xml"/> + <xi:include href="dr_rules.xml"/> + <xi:include href="dr_gw_lists.xml"/> + <xi:include href="dr_groups.xml"/> +</database>

15 years

git:master: Merge branch 'master' of ssh://rbetancor@git.sip-router.org/ sip-router

by Raul Alexis Betancor Santana

Module: sip-router Branch: master Commit: e16f0a8d5dcbda2981fe6445a30c5bd8ce49668b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e16f0a8… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Sun Jan 3 13:16:09 2010 +0000 Merge branch 'master' of ssh://rbetancor@git.sip-router.org/sip-router * 'master' of ssh://rbetancor@git.sip-router.org/sip-router: drouting: lookup route block by name drouting: regenerate readme kamctl: added new db table definitions drouting: adding db table definitions Conflicts: lib/srdb1/schema/dr_gateways.xml lib/srdb1/schema/dr_rules.xml lib/srdb1/schema/kamailio-drouting.xml ---

15 years

git:master: modules_k/drouting: DB schema files for Drouting module

by Raul Alexis Betancor Santana

Module: sip-router Branch: master Commit: 1c1555b1ac761b20314d7411ee9dc7e6f401ca64 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c1555b… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Sun Jan 3 12:41:01 2010 +0000 modules_k/drouting: DB schema files for Drouting module - DB schema files for Drouting module, synced with latest OpenSIPS version --- lib/srdb1/schema/dr_gateways.xml | 84 ++++++++++++++++++++++++++++++++++++ lib/srdb1/schema/dr_groups.xml | 64 +++++++++++++++++++++++++++ lib/srdb1/schema/dr_gw_lists.xml | 47 ++++++++++++++++++++ lib/srdb1/schema/dr_rules.xml | 88 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 283 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/dr_gateways.xml b/lib/srdb1/schema/dr_gateways.xml new file mode 100644 index 0000000..5c81815 --- /dev/null +++ b/lib/srdb1/schema/dr_gateways.xml @@ -0,0 +1,84 @@ +<?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="dr_gateways" xmlns:db="http://docbook.org/ns/docbook"> + <name>dr_gateways</name> + <version>3</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the Dynamic Routing module to store + information about the destinations/gateways where to route calls. + More information can be found at: &OPENSIPS_MOD_DOC;drouting.html. + </db:para> + </description> + + <column id="gwid"> + <name>gwid</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>GW unique ID - used to link the GW from + the routing rules + </description> + </column> + + <column id="type"> + <name>type</name> + <type>unsigned int</type> + <size>11</size> + <default>0</default> + <description>Type/class of the GW (user defined)</description> + </column> + + <column id="address"> + <name>address</name> + <type>string</type> + <size>128</size> + <description>GW/destination address as name/IP[:port]</description> + </column> + + <column id="strip"> + <name>strip</name> + <type>unsigned int</type> + <size>11</size> + <default>0</default> + <description>Number of digits to be striped out for the begining + of the username when using this GW/destination</description> + </column> + + <column id="pri_prefix"> + <name>pri_prefix</name> + <type>string</type> + <size>16</size> + <null/> + <default><null/></default> + <description>String to prefix the username of RURI when using + this GW/destination</description> + </column> + + <column id="attrs"> + <name>attrs</name> + <type>string</type> + <size>255</size> + <null/> + <default><null/></default> + <description>Generic string describing GW attributes - this string is + to be interpreted from the script</description> + </column> + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Text description of the GW/destination</description> + </column> +</table> diff --git a/lib/srdb1/schema/dr_groups.xml b/lib/srdb1/schema/dr_groups.xml new file mode 100644 index 0000000..03549e0 --- /dev/null +++ b/lib/srdb1/schema/dr_groups.xml @@ -0,0 +1,64 @@ +<?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="dr_groups" xmlns:db="http://docbook.org/ns/docbook"> + <name>dr_groups</name> + <version>2</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the Dynamic Routing module to store + information about the routing groups (users mapped over groups). + More information can be found at: &OPENSIPS_MOD_DOC;drouting.html. + </db:para> + </description> + + <column id="gwid"> + <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="username"> + <name>username</name> + <type>string</type> + <size>64</size> + <description>Username part of user</description> + </column> + + <column id="domain"> + <name>domain</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Domain part of user</description> + </column> + + <column id="groupid"> + <name>groupid</name> + <type>unsigned int</type> + <size>11</size> + <default>0</default> + <description>The ID of the routing group the user belongs to. + </description> + </column> + + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Text description of the group/user</description> + </column> + +</table> diff --git a/lib/srdb1/schema/dr_gw_lists.xml b/lib/srdb1/schema/dr_gw_lists.xml new file mode 100644 index 0000000..e8110e7 --- /dev/null +++ b/lib/srdb1/schema/dr_gw_lists.xml @@ -0,0 +1,47 @@ +<?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="dr_gw_lists" xmlns:db="http://docbook.org/ns/docbook"> + <name>dr_gw_lists</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the Dynamic Routing module to define + lists of gateways to be used in rule definitions. + More information can be found at: &OPENSIPS_MOD_DOC;drouting.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="gwlist"> + <name>gwlist</name> + <type>string</type> + <size>255</size> + <description>Reference to the GWs/destinations from the list. + </description> + </column> + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Text description of the GW list</description> + </column> + +</table> diff --git a/lib/srdb1/schema/dr_rules.xml b/lib/srdb1/schema/dr_rules.xml new file mode 100644 index 0000000..b87b2fe --- /dev/null +++ b/lib/srdb1/schema/dr_rules.xml @@ -0,0 +1,88 @@ +<?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="dr_rules" xmlns:db="http://docbook.org/ns/docbook"> + <name>dr_rules</name> + <version>3</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the Dynamic Routing module to store + information about the routing rules. + More information can be found at: &OPENSIPS_MOD_DOC;drouting.html. + </db:para> + </description> + + <column id="ruleid"> + <name>ruleid</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Rule unique ID + </description> + </column> + + <column id="groupid"> + <name>groupid</name> + <type>string</type> + <size>255</size> + <description>The ID(s) of the routing group(s) this rule is to be + used for - comma separeted list of numerical Ids + </description> + </column> + + <column id="prefix"> + <name>prefix</name> + <type>string</type> + <size>64</size> + <description>Numerical prefix to match this rule</description> + </column> + + <column id="timerec"> + <name>timerec</name> + <type>string</type> + <size>255</size> + <description>Time recurrence used for matching this rule.</description> + </column> + + <column id="priority"> + <name>priority</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>Priority of this rule (among rules with same prefix + and timerec).</description> + </column> + + <column id="routeid"> + <name>routeid</name> + <type>string</type> + <size>255</size> + <description>Route block (from cfg script) to be called when rule + matches.</description> + </column> + + <column id="gwlist"> + <name>gwlist</name> + <type>string</type> + <size>255</size> + <description>Reference to the GWs/destinations to be used when + rule matches.</description> + </column> + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Text description of the rule</description> + </column> + +</table>

15 years

[tracker] Comment added: Module drouting, address routeid as string

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#24 - Module drouting, address routeid as string User who did this - Daniel-Constantin Mierla (miconda) ---------- I added in master and kamailio_3.0 the definition of the tables as per README. However, checking a bit the sources, seems that the modules uses a different db tables structures than in documentation. Please add/update the xml files in lib/srdb1/schema/ and then do 'make dbschema' to regenerate the sql scripts. Also, another update I did: when the route id is '0' the module ignores it, since with integer id that was the behavior. Thanks. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=24#comment23 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.

15 years

git:master: Merge branch 'master' of ssh://daniel@git.sip-router.org/ sip-router

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 356aa80ebc749d736dda5e861f85cbfc7aa6b1ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=356aa80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 3 11:37:49 2010 +0100 Merge branch 'master' of ssh://daniel@git.sip-router.org/sip-router * 'master' of ssh://daniel@git.sip-router.org/sip-router: (159 commits) modules_k/drouting: Merging changes with recent OpenSIPS module modules/privacy: Privacy module, for handling RFC3325 modules/privacy: Privacy module, for handling RFC3325 topoh: updated README topoh: update Replaces header topoh: code to update Refer-to URI topoh: callid prefix can be set via param topoh: add prefix to encoded callid db scheme(k): update lcr tables scripts after index addition in scheme doc: change commit requirements according the discussion on ml core: added id to every field of gw table schema tcp: use the forced socket ip as source tmx: pv_t_copy_msg: copy also the send flags textops(k): msg_apply_changes: preserve the send flags seas: use set_force_socket() rr(k): use set_force_socket() registrar(k): use set_force_socket() pv: use set_force_socket() kex: use set_force_socket() domainpolicy: use set_force_socket() ... ---

15 years

git:master: drouting: lookup route block by name

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8e298ed9462ccd639d054cd7639278fdd3932ee9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8e298ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 3 12:38:48 2010 +0100 drouting: lookup route block by name - routes are identified in 3.0 by string name - if name is "0", do not execute the route (this is the main one) for backward compatibility - based on patch by Andrey 'Krieger' Utkin, FS#24 --- modules_k/drouting/dr_load.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/dr_load.c b/modules_k/drouting/dr_load.c index a8b6f05..bea5b29 100644 --- a/modules_k/drouting/dr_load.c +++ b/modules_k/drouting/dr_load.c @@ -522,7 +522,7 @@ rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db1_con_t* db_hdl, continue; } /* lookup for the script route ID */ - if (str_vals[3][0]) { + if (str_vals[3][0] && str_vals[3][0]!='0') { int_vals[3] = route_lookup(&main_rt, str_vals[3]); if (int_vals[3]==-1) { LM_WARN("route <%s> does not exist\n",str_vals[3]);

15 years

git:master: drouting: regenerate readme

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 510489a0fb51f00141d24859bad031af9550b163 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=510489a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 3 13:25:51 2010 +0100 drouting: regenerate readme - it was out of sync with docbook sources - use entity for application name and corrected db url (cherry picked from commit 0d88fc527d5ddb90e3d52ca8f369bdcfaab63ed4) --- modules_k/drouting/README | 160 ++++++++++++----------------- modules_k/drouting/doc/drouting_admin.xml | 8 +- 2 files changed, 72 insertions(+), 96 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=510…

15 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev