sr-dev January 2010

sr-dev@lists.kamailio.org

28 participants
289 discussions

git:master: modules_k/drouting: Added missing db schema file
by Raul Alexis Betancor Santana 03 Jan '10

03 Jan '10

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>

1 0

[tracker] Comment added: Module drouting, address routeid as string
by sip-router 03 Jan '10

03 Jan '10

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.

1 0

git:master: drouting: adding db table definitions
by Daniel-Constantin Mierla 03 Jan '10

03 Jan '10

Module: sip-router Branch: master Commit: fb2df84aa150d7f0f8b96e7c5035d2b74c9a3fa9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb2df84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 3 13:27:57 2010 +0100 drouting: adding db table definitions - built based on readme - needs further updates as the code is ahead of documentation with what tables are used and their structure (cherry picked from commit 53a25f097d127eea7fef3c3c32f7f24421aaad15) --- lib/srdb1/schema/dr_gateways.xml | 71 ++++++++++++++++++++++++++ lib/srdb1/schema/dr_rules.xml | 86 ++++++++++++++++++++++++++++++++ lib/srdb1/schema/kamailio-drouting.xml | 14 +++++ 3 files changed, 171 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..e96773b --- /dev/null +++ b/lib/srdb1/schema/dr_gateways.xml @@ -0,0 +1,71 @@ +<?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>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the douting module - keeps the + gateways data. + </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>Unique ID per gateway + </description> + </column> + + <column id="type"> + <name>type</name> + <type>unsigned int</type> + <size>11</size> + <default>0</default> + <description>Type of gateway</description> + </column> + + <column id="address"> + <name>address</name> + <type>string</type> + <size>128</size> + <description>Address of gateway (hostname or ip and port)</description> + </column> + + <column id="strip"> + <name>strip</name> + <type>unsigned int</type> + <size>11</size> + <default>0</default> + <description>Number of digits to strip from dialed number</description> + </column> + + <column id="pri_prefix"> + <name>pri_prefix</name> + <type>string</type> + <size>64</size> + <null/> + <default><null/></default> + <description>What to prefix to dialed number</description> + </column> + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Short description of gateway</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..213332a --- /dev/null +++ b/lib/srdb1/schema/dr_rules.xml @@ -0,0 +1,86 @@ +<?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>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. + </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>list of routing group IDs + </description> + </column> + + <column id="prefix"> + <name>prefix</name> + <type>string</type> + <size>64</size> + <description>Destination prefix for this rule</description> + </column> + + <column id="timerec"> + <name>timerec</name> + <type>string</type> + <size>255</size> + <description>Time recurrence for this rule.</description> + </column> + + <column id="priority"> + <name>priority</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>Priority of the rule.</description> + </column> + + <column id="routeid"> + <name>routeid</name> + <type>string</type> + <size>64</size> + <description>Name of route block (from cfg script) to be + executed when matching this rule.</description> + </column> + + <column id="gwlist"> + <name>gwlist</name> + <type>string</type> + <size>255</size> + <description>The list of destinations (gws) to be used when + matching this rule.</description> + </column> + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Short description of the rule</description> + </column> + +</table> + diff --git a/lib/srdb1/schema/kamailio-drouting.xml b/lib/srdb1/schema/kamailio-drouting.xml new file mode 100644 index 0000000..183c87b --- /dev/null +++ b/lib/srdb1/schema/kamailio-drouting.xml @@ -0,0 +1,14 @@ +<?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>DRouting</name> + <xi:include href="dr_gateways.xml"/> + <xi:include href="dr_rules.xml"/> +</database>

1 0

git:master: kamctl: added new db table definitions
by Daniel-Constantin Mierla 03 Jan '10

03 Jan '10

Module: sip-router Branch: master Commit: faffb276892843e26ba5aba1454d7c97d833b575 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=faffb27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 3 13:31:23 2010 +0100 kamctl: added new db table definitions - sql to create drouting tables for mysql, postgres and oracle (cherry picked from commit 0292a4b5f2cb0564649699c592e51a06edbd91a4) --- utils/kamctl/mysql/drouting-create.sql | 22 ++++++++++++++++ utils/kamctl/oracle/drouting-create.sql | 38 +++++++++++++++++++++++++++++ utils/kamctl/postgres/drouting-create.sql | 22 ++++++++++++++++ 3 files changed, 82 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/mysql/drouting-create.sql b/utils/kamctl/mysql/drouting-create.sql new file mode 100644 index 0000000..9b4388f --- /dev/null +++ b/utils/kamctl/mysql/drouting-create.sql @@ -0,0 +1,22 @@ +INSERT INTO version (table_name, table_version) values ('dr_gateways','1'); +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, + description VARCHAR(128) DEFAULT '' NOT NULL +) ENGINE=MyISAM; + +INSERT INTO version (table_name, table_version) values ('dr_rules','1'); +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, + gwlist VARCHAR(255) 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 new file mode 100644 index 0000000..a5dde37 --- /dev/null +++ b/utils/kamctl/oracle/drouting-create.sql @@ -0,0 +1,38 @@ +INSERT INTO version (table_name, table_version) values ('dr_gateways','1'); +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, + description VARCHAR2(128) DEFAULT '' +); + +CREATE OR REPLACE TRIGGER dr_gateways_tr +before insert on dr_gateways FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END dr_gateways_tr; +/ +BEGIN map2users('dr_gateways'); END; +/ +INSERT INTO version (table_name, table_version) values ('dr_rules','1'); +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), + gwlist VARCHAR2(255), + description VARCHAR2(128) DEFAULT '' +); + +CREATE OR REPLACE TRIGGER dr_rules_tr +before insert on dr_rules FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END dr_rules_tr; +/ +BEGIN map2users('dr_rules'); END; +/ diff --git a/utils/kamctl/postgres/drouting-create.sql b/utils/kamctl/postgres/drouting-create.sql new file mode 100644 index 0000000..4defbfe --- /dev/null +++ b/utils/kamctl/postgres/drouting-create.sql @@ -0,0 +1,22 @@ +INSERT INTO version (table_name, table_version) values ('dr_gateways','1'); +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, + description VARCHAR(128) DEFAULT '' NOT NULL +); + +INSERT INTO version (table_name, table_version) values ('dr_rules','1'); +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, + gwlist VARCHAR(255) NOT NULL, + description VARCHAR(128) DEFAULT '' NOT NULL +); +

1 0

git:master: Merge branch 'sr_3.0' of ssh://daniel@git.sip-router.org/ sip-router
by Daniel-Constantin Mierla 03 Jan '10

03 Jan '10

Module: sip-router Branch: master Commit: 3d581a35990ba889337dfbdc844888e4aa1884b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d581a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 22:53:06 2009 +0200 Merge branch 'sr_3.0' of ssh://daniel@git.sip-router.org/sip-router * 'sr_3.0' of ssh://daniel@git.sip-router.org/sip-router: makefile: support self-installing utils, extra cfgs a.s.o. core: fix memleak in fixup_free* core: fix cfg_update() on config error 2nd try userblacklist(k): gcc 2.95 compile fixes statistics(k): minor warning in printf fmt siputils(k): gcc 2.95 compile fixes registrar(k): gcc 2.95 compile fixes pua_mi: gcc 2.95 compile fixes cfgutils(k): gcc 2.95 compile fixes lcr: compile & warning fixes for gcc 2.95 db_postgres: compile fixes for gcc 2.95 db_mysql: compile fix for gcc 2.95 compile: don't warn on old gcc versions utils/sercmd: Fixed include paths also in sr_3.0 branch. ---

1 0

git:master: drouting: regenerate readme
by Daniel-Constantin Mierla 03 Jan '10

03 Jan '10

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…

1 0

git:master: drouting: lookup route block by name
by Daniel-Constantin Mierla 03 Jan '10

03 Jan '10

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]);

1 0

git:master: Merge branch 'master' of ssh://daniel@git.sip-router.org/ sip-router
by Daniel-Constantin Mierla 03 Jan '10

03 Jan '10

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() ... ---

1 0

git:kamailio_3.0: drouting: lookup route block by name
by Daniel-Constantin Mierla 03 Jan '10

03 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: 94f834041eb43121e6750cf524c32225aaf1c80d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94f8340… 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 | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/modules_k/drouting/dr_load.c b/modules_k/drouting/dr_load.c index 3d833d9..bea5b29 100644 --- a/modules_k/drouting/dr_load.c +++ b/modules_k/drouting/dr_load.c @@ -34,6 +34,7 @@ #include "../../dprint.h" +#include "../../route.h" //#include "../../db/db.h" #include "../../mem/shm_mem.h" @@ -280,7 +281,7 @@ rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db1_con_t* db_hdl, str *drd_table, str *drl_table, str* drr_table ) { int int_vals[4]; - char * str_vals[4]; + char * str_vals[5]; str tmp; db_key_t columns[7]; db1_res_t* res; @@ -509,31 +510,41 @@ rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db1_con_t* db_hdl, check_val( ROW_VALUES(row)+4, DB1_INT, 1, 0); int_vals[2] = VAL_INT (ROW_VALUES(row)+4); /* ROUTE_ID column */ - check_val( ROW_VALUES(row)+5, DB1_INT, 1, 0); - int_vals[3] = VAL_INT (ROW_VALUES(row)+5); + check_val( ROW_VALUES(row)+5, DB1_STRING, 1, 0); + str_vals[3] = (char*)VAL_STRING(ROW_VALUES(row)+5); /* DSTLIST column */ check_val( ROW_VALUES(row)+6, DB1_STRING, 1, 1); - str_vals[3] = (char*)VAL_STRING(ROW_VALUES(row)+6); + str_vals[4] = (char*)VAL_STRING(ROW_VALUES(row)+6); /* parse the time definition */ if ((time_rec=parse_time_def(str_vals[2]))==0) { LM_ERR("bad time definition <%s> for rule id %d -> skipping\n", str_vals[2], int_vals[0]); continue; } + /* lookup for the script route ID */ + 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]); + int_vals[3] = 0; + } + } else { + int_vals[3] = 0; + } /* is gw_list a list or a list id? */ - if (str_vals[3][0]=='#') { - s_id.s = str_vals[3]+1; + if (str_vals[4][0]=='#') { + s_id.s = str_vals[4]+1; s_id.len = strlen(s_id.s); if ( str2int( &s_id, &id)!=0 || - (str_vals[3]=get_tmp_gw_list(id))==NULL ) { + (str_vals[4]=get_tmp_gw_list(id))==NULL ) { LM_ERR("invalid reference to a GW list <%s> -> skipping\n", - str_vals[3]); + str_vals[4]); continue; } } /* build the routing rule */ if ((ri = build_rt_info( int_vals[2], time_rec, int_vals[3], - str_vals[3], rdata->pgw_l))== 0 ) { + str_vals[4], rdata->pgw_l))== 0 ) { LM_ERR("failed to add routing info for rule id %d -> " "skipping\n", int_vals[0]); tmrec_free( time_rec ); @@ -573,5 +584,6 @@ error: dr_dbf->free_result(db_hdl, res); if (rdata) free_rt_data( rdata, 1 ); + rdata = NULL; return 0; }

1 0

git:kamailio_3.0: drouting: adding db table definitions
by Daniel-Constantin Mierla 03 Jan '10

03 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: 53a25f097d127eea7fef3c3c32f7f24421aaad15 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53a25f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 3 13:27:57 2010 +0100 drouting: adding db table definitions - built based on readme - needs further updates as the code is ahead of documentation with what tables are used and their structure --- lib/srdb1/schema/dr_gateways.xml | 71 ++++++++++++++++++++++++++ lib/srdb1/schema/dr_rules.xml | 86 ++++++++++++++++++++++++++++++++ lib/srdb1/schema/kamailio-drouting.xml | 14 +++++ 3 files changed, 171 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..e96773b --- /dev/null +++ b/lib/srdb1/schema/dr_gateways.xml @@ -0,0 +1,71 @@ +<?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>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the douting module - keeps the + gateways data. + </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>Unique ID per gateway + </description> + </column> + + <column id="type"> + <name>type</name> + <type>unsigned int</type> + <size>11</size> + <default>0</default> + <description>Type of gateway</description> + </column> + + <column id="address"> + <name>address</name> + <type>string</type> + <size>128</size> + <description>Address of gateway (hostname or ip and port)</description> + </column> + + <column id="strip"> + <name>strip</name> + <type>unsigned int</type> + <size>11</size> + <default>0</default> + <description>Number of digits to strip from dialed number</description> + </column> + + <column id="pri_prefix"> + <name>pri_prefix</name> + <type>string</type> + <size>64</size> + <null/> + <default><null/></default> + <description>What to prefix to dialed number</description> + </column> + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Short description of gateway</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..213332a --- /dev/null +++ b/lib/srdb1/schema/dr_rules.xml @@ -0,0 +1,86 @@ +<?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>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. + </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>list of routing group IDs + </description> + </column> + + <column id="prefix"> + <name>prefix</name> + <type>string</type> + <size>64</size> + <description>Destination prefix for this rule</description> + </column> + + <column id="timerec"> + <name>timerec</name> + <type>string</type> + <size>255</size> + <description>Time recurrence for this rule.</description> + </column> + + <column id="priority"> + <name>priority</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>Priority of the rule.</description> + </column> + + <column id="routeid"> + <name>routeid</name> + <type>string</type> + <size>64</size> + <description>Name of route block (from cfg script) to be + executed when matching this rule.</description> + </column> + + <column id="gwlist"> + <name>gwlist</name> + <type>string</type> + <size>255</size> + <description>The list of destinations (gws) to be used when + matching this rule.</description> + </column> + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Short description of the rule</description> + </column> + +</table> + diff --git a/lib/srdb1/schema/kamailio-drouting.xml b/lib/srdb1/schema/kamailio-drouting.xml new file mode 100644 index 0000000..183c87b --- /dev/null +++ b/lib/srdb1/schema/kamailio-drouting.xml @@ -0,0 +1,14 @@ +<?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>DRouting</name> + <xi:include href="dr_gateways.xml"/> + <xi:include href="dr_rules.xml"/> +</database>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2010