sr-dev

sr-dev@lists.kamailio.org

15 participants
44240 discussions

git:kamailio_3.0: drouting: updated db schema from master

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 700fb1a97a5c6c089fce85f547117286644872b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=700fb1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 4 14:32:19 2010 +0100 drouting: updated db schema from master --- lib/srdb1/schema/dr_gateways.xml | 11 +++++- lib/srdb1/schema/dr_groups.xml | 64 ++++++++++++++++++++++++++++++++ lib/srdb1/schema/dr_gw_lists.xml | 47 +++++++++++++++++++++++ lib/srdb1/schema/dr_rules.xml | 2 +- lib/srdb1/schema/kamailio-drouting.xml | 2 + 5 files changed, 124 insertions(+), 2 deletions(-) diff --git a/lib/srdb1/schema/dr_gateways.xml b/lib/srdb1/schema/dr_gateways.xml index e96773b..9763c4b 100644 --- a/lib/srdb1/schema/dr_gateways.xml +++ b/lib/srdb1/schema/dr_gateways.xml @@ -9,7 +9,7 @@ <table id="dr_gateways" xmlns:db="http://docbook.org/ns/docbook"> <name>dr_gateways</name> - <version>1</version> + <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the douting module - keeps the @@ -60,6 +60,15 @@ <description>What to prefix to dialed number</description> </column> + <column id="attrs"> + <name>attrs</name> + <type>string</type> + <size>255</size> + <null/> + <default><null/></default> + <description>Generic string to be returned in cfg script</description> + </column> + <column id="description"> <name>description</name> <type>string</type> diff --git a/lib/srdb1/schema/dr_groups.xml b/lib/srdb1/schema/dr_groups.xml new file mode 100644 index 0000000..92c2e5c --- /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 drouting module to store + information about the routing groups (users mapped over groups). + More information can be found at: &KAMAILIO_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..6375c0d --- /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 drouting module to define + lists of gateways to be used in rule definitions. + More information can be found at: &KAMAILIO_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>List of GW ids. + </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 index 213332a..a469a77 100644 --- a/lib/srdb1/schema/dr_rules.xml +++ b/lib/srdb1/schema/dr_rules.xml @@ -9,7 +9,7 @@ <table id="dr_rules" xmlns:db="http://docbook.org/ns/docbook"> <name>dr_rules</name> - <version>1</version> + <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the drouting module - keeps the diff --git a/lib/srdb1/schema/kamailio-drouting.xml b/lib/srdb1/schema/kamailio-drouting.xml index 183c87b..7a95020 100644 --- a/lib/srdb1/schema/kamailio-drouting.xml +++ b/lib/srdb1/schema/kamailio-drouting.xml @@ -11,4 +11,6 @@ <name>DRouting</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:kamailio_3.0: kamctl: regenerate db creation scripts

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: af5463d865bde28d1a2f977d0c9bd9347588b6e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af5463d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 4 14:35:19 2010 +0100 kamctl: regenerate db creation scripts --- utils/kamctl/db_berkeley/kamailio/version | 8 ++++++ utils/kamctl/dbtext/kamailio/version | 4 +++ utils/kamctl/mysql/drouting-create.sql | 21 +++++++++++++++- utils/kamctl/oracle/drouting-create.sql | 37 +++++++++++++++++++++++++++- utils/kamctl/postgres/drouting-create.sql | 21 +++++++++++++++- 5 files changed, 85 insertions(+), 6 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index cd6c6dc..88278aa 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -38,6 +38,14 @@ domain_name| domain_name|1 domainpolicy| domainpolicy|2 +dr_gateways| +dr_gateways|3 +dr_groups| +dr_groups|2 +dr_gw_lists| +dr_gw_lists|1 +dr_rules| +dr_rules|3 globalblacklist| globalblacklist|1 grp| diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index abd03a6..685386f 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -14,6 +14,10 @@ dispatcher:3 domain:1 domain_name:1 domainpolicy:2 +dr_gateways:3 +dr_groups:2 +dr_gw_lists:1 +dr_rules:3 globalblacklist:1 grp:2 gw:10 diff --git a/utils/kamctl/mysql/drouting-create.sql b/utils/kamctl/mysql/drouting-create.sql index 9b4388f..8f72794 100644 --- a/utils/kamctl/mysql/drouting-create.sql +++ b/utils/kamctl/mysql/drouting-create.sql @@ -1,14 +1,15 @@ -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, + 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, @@ -20,3 +21,19 @@ CREATE TABLE dr_rules ( 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..4d2a005 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, + attrs VARCHAR2(255) DEFAULT NULL, description VARCHAR2(128) DEFAULT '' ); @@ -16,7 +17,7 @@ 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), @@ -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..73c2c7f 100644 --- a/utils/kamctl/postgres/drouting-create.sql +++ b/utils/kamctl/postgres/drouting-create.sql @@ -1,14 +1,15 @@ -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, + 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, @@ -20,3 +21,19 @@ CREATE TABLE dr_rules ( 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/privacy: Privacy module, for handling RFC3325

by Raul Alexis Betancor Santana

Module: sip-router Branch: master Commit: 4d0d5d78edc1ab45a54d46e01c928d4f7e443d87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d0d5d7… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Wed Dec 30 22:43:04 2009 +0000 modules/privacy: Privacy module, for handling RFC3325 - New module for handling RFC3325, with DB support - Initial Makefile --- modules/privacy/Makefile | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/modules/privacy/Makefile b/modules/privacy/Makefile new file mode 100644 index 0000000..6458f9e --- /dev/null +++ b/modules/privacy/Makefile @@ -0,0 +1,17 @@ +# +# Privacy module Makefile +# +# +# WARNING: do not run this directly, it should be run by the master Makefile + +include ../../Makefile.defs + +auto_gen= +NAME=privacy.so + +DEFS+=-DOPENSER_MOD_INTERFACE + +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kcore/kcore + +include ../../Makefile.modules

15 years

Kamailio 3.0.0 - Jan 11, 2010

by Daniel-Constantin Mierla

Hello, it was a bit longer way than usual with the testing, but the achievements pay the bill - you can run kamailio and ser modules at the same time, as well as most of the core features from both applications. I propose to release Kamailio (OpenSER) 3.0.0 on 11th of January, by that time we should fix the small issues discussed on the devel list lately. If you are aware of other issues, report them to: sr-dev [at] lists.sip-router.org I encourage everyone to contribute to wiki pages for what is new and migration from 1.5.x: http://www.kamailio.org/dokuwiki/doku.php/features:new-in-3.0.x http://www.kamailio.org/dokuwiki/doku.php/install:1.5.x-to-3.0.0 To get it from GIT and test, see: http://www.kamailio.org/dokuwiki/doku.php/install:kamailio-3.0.x-from-git I started to detail some of the new features in blog posts, see ToC at: http://bit.ly/4qy9cn A great 2010 for kamailians and sip router users! Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

15 years

git:master: modules_k/drouting: Updated table versions

by Raul Alexis Betancor Santana

Module: sip-router Branch: master Commit: 310d12dcd1f5791073317101fa4027075e06bc4d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=310d12d… 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:54:18 2010 +0000 modules_k/drouting: Updated table versions - Updated table versions after fixing drouting db schema --- utils/kamctl/db_berkeley/kamailio/version | 8 ++++++++ utils/kamctl/dbtext/kamailio/version | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index e03028f..bbe6621 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -38,6 +38,14 @@ domain_name| domain_name|1 domainpolicy| domainpolicy|2 +dr_gateways| +dr_gateways|3 +dr_groups| +dr_groups|2 +dr_gw_lists| +dr_gw_lists|1 +dr_rules| +dr_rules|3 globalblacklist| globalblacklist|1 grp| diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 5b9b49d..93a7018 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -14,6 +14,10 @@ dispatcher:3 domain:1 domain_name:1 domainpolicy:2 +dr_gateways:3 +dr_groups:2 +dr_gw_lists:1 +dr_rules:3 globalblacklist:1 grp:2 gw:10

15 years

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev