Module: sip-router Branch: master Commit: 23bf29c92ae9d7f4635281a292a25e48698cb63b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23bf29c9...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: Wed Jan 27 12:27:51 2010 +0100

drouting: updated db schema definition

- use module name in description - more appropriate field sizes

---

lib/srdb1/schema/dr_gateways.xml | 26 +++++++++++--------------- lib/srdb1/schema/dr_groups.xml | 2 +- lib/srdb1/schema/dr_gw_lists.xml | 4 ++-- lib/srdb1/schema/dr_rules.xml | 28 +++++++++++++--------------- lib/srdb1/schema/kamailio-drouting.xml | 12 ++++++------ 5 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/lib/srdb1/schema/dr_gateways.xml b/lib/srdb1/schema/dr_gateways.xml index e595151..9763c4b 100644 --- a/lib/srdb1/schema/dr_gateways.xml +++ b/lib/srdb1/schema/dr_gateways.xml @@ -12,9 +12,8 @@ <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - db:paraThis 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: &KAMAILIO_MOD_DOC;drouting.html. + db:paraThis table is used by the douting module - keeps the + gateways data. </db:para> </description>

@@ -25,8 +24,7 @@ <autoincrement/> <primary/> <type db="dbtext">int,auto</type> - <description>GW unique ID - used to link the GW from - the routing rules + <description>Unique ID per gateway </description> </column>

@@ -35,14 +33,14 @@ <type>unsigned int</type> <size>11</size> <default>0</default> - <description>Type/class of the GW (user defined)</description> + <description>Type of gateway</description> </column>

<column id="address"> <name>address</name> <type>string</type> <size>128</size> - <description>GW/destination address as name/IP[:port]</description> + <description>Address of gateway (hostname or ip and port)</description> </column>

<column id="strip"> @@ -50,18 +48,16 @@ <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> + <description>Number of digits to strip from dialed number</description> </column>

<column id="pri_prefix"> <name>pri_prefix</name> <type>string</type> - <size>16</size> + <size>64</size> <null/> <default><null/></default> - <description>String to prefix the username of RURI when using - this GW/destination</description> + <description>What to prefix to dialed number</description> </column>

<column id="attrs"> @@ -70,8 +66,7 @@ <size>255</size> <null/> <default><null/></default> - <description>Generic string describing GW attributes - this string is - to be interpreted from the script</description> + <description>Generic string to be returned in cfg script</description> </column>

<column id="description"> @@ -79,6 +74,7 @@ <type>string</type> <size>128</size> <default></default> - <description>Text description of the GW/destination</description> + <description>Short description of gateway</description> </column> </table> + diff --git a/lib/srdb1/schema/dr_groups.xml b/lib/srdb1/schema/dr_groups.xml index fa4d6df..92c2e5c 100644 --- a/lib/srdb1/schema/dr_groups.xml +++ b/lib/srdb1/schema/dr_groups.xml @@ -12,7 +12,7 @@ <version>2</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - db:paraThis table is used by the Dynamic Routing module to store + db:paraThis 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> diff --git a/lib/srdb1/schema/dr_gw_lists.xml b/lib/srdb1/schema/dr_gw_lists.xml index 7dd4c3e..6375c0d 100644 --- a/lib/srdb1/schema/dr_gw_lists.xml +++ b/lib/srdb1/schema/dr_gw_lists.xml @@ -12,7 +12,7 @@ <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - db:paraThis table is used by the Dynamic Routing module to define + db:paraThis 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> @@ -32,7 +32,7 @@ <name>gwlist</name> <type>string</type> <size>255</size> - <description>Reference to the GWs/destinations from the list. + <description>List of GW ids. </description> </column>

diff --git a/lib/srdb1/schema/dr_rules.xml b/lib/srdb1/schema/dr_rules.xml index a114ea7..a469a77 100644 --- a/lib/srdb1/schema/dr_rules.xml +++ b/lib/srdb1/schema/dr_rules.xml @@ -12,9 +12,8 @@ <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - db:paraThis table is used by the Dynamic Routing module to store - information about the routing rules. - More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. + db:paraThis table is used by the drouting module - keeps the + routing rules data. </db:para> </description>

@@ -33,8 +32,7 @@ <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>list of routing group IDs </description> </column>

@@ -42,14 +40,14 @@ <name>prefix</name> <type>string</type> <size>64</size> - <description>Numerical prefix to match this rule</description> + <description>Destination prefix for 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> + <description>Time recurrence for this rule.</description> </column>

<column id="priority"> @@ -57,24 +55,23 @@ <type>int</type> <size>11</size> <default>0</default> - <description>Priority of this rule (among rules with same prefix - and timerec).</description> + <description>Priority of the rule.</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> + <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>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> </column>

<column id="description"> @@ -82,7 +79,8 @@ <type>string</type> <size>128</size> <default></default> - <description>Text description of the rule</description> + <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 index d058f9b..7a95020 100644 --- a/lib/srdb1/schema/kamailio-drouting.xml +++ b/lib/srdb1/schema/kamailio-drouting.xml @@ -1,6 +1,6 @@ <?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" [ + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [

<!ENTITY % entities SYSTEM "entities.xml"> %entities; @@ -8,9 +8,9 @@ ]>

<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"/> + <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>