- finish refactoring of carrierroute module

- replace O(n) matching logic for carrier and domain names with a efficient
  binary search implementation
- use qsort and bsearch of glibc in most of the cases, where its possible
  (basically all carrier/domain searches are O(log n) now, only when dynamic
  strings for are used in the cfg, it needs to search the whole list)
- change carrier and domain names from string to integer, to allow the lookup
- instead of storing the carrier/domain name string in the memory structure,
  a pointer to the name is used to save space
- get rid of this internal ID vs. external ID stuff, we use now only one
- rename the route_tree table to carrier_name
- add a new table domain_name, to hold the domain names (like route_tree tbl)
- adapt tests for the new or changed functionality
- extend documentation with a paragraph about the used matching logic
- Credits for this work belongs to Hardy Kahl, hardy dot kahl at 1und1 dot de
- fix a few errors in the postgres cr test, fix a few doxygen statements
- move some parts of log messages to DBG log level
- update documentation and database schemes


git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5189 689a6050-402a-0410-94f2-e92a70836424

test/unit/13.cfg

@@ -1,3 +1,4 @@
+debug=3
 mpath="../modules"
 loadmodule "sl/sl.so"
 loadmodule "tm/tm.so"
@@ -22,20 +23,6 @@ route{
 		sl_send_reply("513", "Message too big");
 		return;
 	};
-	if (method == "REGISTER") {
-		if(!cr_route("default", "register", "$rU", "$rU", "call_id", "$avp(s:30)")) {
-			sl_send_reply("403", "Not allowed");
-		}
-		sl_send_reply("200", "OK");
-		return;
-	}
-	if (method == "INVITE") {
-		if(!cr_route("default", "proxy", "$rU", "$rU", "call_id")) {
-			sl_send_reply("403", "Not allowed");
-		}
-		sl_send_reply("100", "Trying");
-		return;
-	}
 	cr_user_carrier("$fU", "$fd", "$avp(carrier)");
 	$avp(domain)="start";
 	if (!cr_route("$avp(carrier)", "$avp(domain)", "$rU", "$rU", "call_id", "$avp(host)")) {

test/unit/13.sh

@@ -36,21 +36,25 @@ echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 
 # setup database
-$MYSQL "insert into route_tree (id, carrier) values ('1', 'carrier1');"
-$MYSQL "insert into route_tree (id, carrier) values ('2', 'default');"
-$MYSQL "insert into route_tree (id, carrier) values ('3', 'carrier2');"
-
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('1','1','0','49','0.5','0','host1.local');"
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('2','1','0','49','0.5','0','host2.local');"
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('3','1','0','42','0.3','0','host3.local');"
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('4','1','0','42','0.7','0','host4.local');"
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('5','1','0','','0.1','0','host5.local');"
+$MYSQL "insert into carrier_name (id, carrier) values ('1', 'carrier1');"
+$MYSQL "insert into carrier_name (id, carrier) values ('2', 'default');"
+$MYSQL "insert into carrier_name (id, carrier) values ('3', 'carrier2');"
+
+$MYSQL "insert into domain_name (id, domain) values ('10', 'domain1');"
+$MYSQL "insert into domain_name (id, domain) values ('1', 'domain2');"
+$MYSQL "insert into domain_name (id, domain) values ('2', 'domain3');"
+
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('1','1','10','49','0.5','0','host1.local');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('2','1','10','49','0.5','0','host2.local');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('3','1','10','42','0.3','0','host3.local');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('4','1','10','42','0.7','0','host4.local');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('5','1','10','','0.1','0','host5.local');"
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('6','1','1','','0.1','0','host5.local');"
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('7','1','2','','0.1','0','host5.local');"
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('8','2','0','','1','0','host6.local');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('8','2','10','','1','0','host6.local');"
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('9','2','1','','1','0','host6.local');"
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('10','2','2','','1','0','host6.local');"
-$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('11','3','0','','1','0','host1.local');"
+$MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('11','3','10','','1','0','host1.local');"
 
 $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code, flags,
 mask, next_domain) values ('1', '1', '1', '49', 'host1.local', '404', '0', '0', '2');"
@@ -78,24 +82,24 @@ fi ;
 
 if [ "$ret" -eq 0 ] ; then
 	tmp=`grep -v "Printing routing information:
-Printing tree for carrier carrier1 (1)
-Printing tree for domain 0
+Printing tree for carrier 'carrier1' (1)
+Printing tree for domain 'domain2' (1)
+      NULL: 100.000 %, 'host5.local': ON, '0', '', '', ''
+Printing tree for domain 'domain3' (2)
+      NULL: 100.000 %, 'host5.local': ON, '0', '', '', ''
+Printing tree for domain 'domain1' (10)
         42: 70.140 %, 'host4.local': ON, '0', '', '', ''
         42: 30.060 %, 'host3.local': ON, '0', '', '', ''
         49: 50.000 %, 'host2.local': ON, '0', '', '', ''
         49: 50.000 %, 'host1.local': ON, '0', '', '', ''
       NULL: 100.000 %, 'host5.local': ON, '0', '', '', ''
-Printing tree for domain 1
-      NULL: 100.000 %, 'host5.local': ON, '0', '', '', ''
-Printing tree for domain 2
-      NULL: 100.000 %, 'host5.local': ON, '0', '', '', ''
-Printing tree for carrier default (2)
-Printing tree for domain 0
+Printing tree for carrier 'default' (2)
+Printing tree for domain 'domain2' (1)
       NULL: 100.000 %, 'host6.local': ON, '0', '', '', ''
-Printing tree for domain 1
+Printing tree for domain 'domain1' (10)
       NULL: 100.000 %, 'host6.local': ON, '0', '', '', ''
-Printing tree for carrier carrier2 (3)
-Printing tree for domain 0
+Printing tree for carrier 'carrier2' (3)
+Printing tree for domain 'domain1' (10)
       NULL: 100.000 %, 'host1.local': ON, '0', '', '', ''" $TMPFILE`
 	if [ "$tmp" = "" ] ; then
 		ret=0
@@ -107,9 +111,12 @@ fi ;
 $KILL
 
 # cleanup database
-$MYSQL "delete from route_tree where id = 1;"
-$MYSQL "delete from route_tree where id = 2;"
-$MYSQL "delete from route_tree where id = 3;"
+$MYSQL "delete from carrier_name where id = 1;"
+$MYSQL "delete from carrier_name where id = 2;"
+$MYSQL "delete from carrier_name where id = 3;"
+$MYSQL "delete from domain_name where id = 10;"
+$MYSQL "delete from domain_name where id = 1;"
+$MYSQL "delete from domain_name where id = 2;"
 $MYSQL "delete from carrierroute where carrier=1;"
 $MYSQL "delete from carrierroute where carrier=2;"
 $MYSQL "delete from carrierroute where carrier=3;"
@@ -122,4 +129,4 @@ cd ../test
 mv $CFG.bak $CFG
 rm $TMPFILE
 
-exit $ret
+exit $ret

test/unit/14.sh

@@ -49,12 +49,12 @@ fi ;
 
 if [ "$ret" -eq 0 ] ; then
 	tmp=`grep -v "Printing routing information:
-Printing tree for carrier default (1)
-Printing tree for domain register
+Printing tree for carrier 'default' (1)
+Printing tree for domain 'register' (1)
       NULL: 0.000 %, 'test1': OFF, '0', '', '', ''
       NULL: 50.000 %, 'test2.localdomain': ON, '0', '', '', ''
       NULL: 50.000 %, 'test3.localdomain': ON, '0', '', '', ''
-Printing tree for domain proxy
+Printing tree for domain 'proxy' (2)
          2: 87.610 %, 'test7.localdomain': ON, '0', '', '', ''
          2: 12.516 %, 'test8.localdomain': ON, '0', '', '', ''
         42: 70.070 %, 'test4': ON, '0', '', '', ''
@@ -63,7 +63,7 @@ Printing tree for domain proxy
         49: 0.000 %, 'test5.localdomain': OFF, '0', '', '', ''
         49: 44.444 %, 'test4': ON, '0', '', '', ''
         49: 55.556 %, 'test6.localdomain': ON, '0', '', '', ''
-Printing tree for domain other
+Printing tree for domain 'other' (3)
       NULL: 0.000 %, 'test1': OFF, '0', '', '', ''
       NULL: 50.000 %, 'test2.localdomain': OFF, '0', '', '', ''
             Rule is backed up by: test3.localdomain

test/unit/23.sh

@@ -37,18 +37,19 @@ echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 echo "modparam(\"carrierroute\", \"db_url\", \"postgres://openserro:openserro@localhost/openser\")" >> $CFG
 
 # setup database
-$PSQL "insert into route_tree (id, carrier) values ('1', 'carrier1');
-insert into route_tree (id, carrier) values ('2', 'default');
-insert into route_tree (id, carrier) values ('3', 'premium');
-insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('1','1','49','0','0.5','0','host1.local.domain');
-insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('2','1','49','0','0.5','0','host2.local.domain');
-insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('3','1','42','0','0.3','0','host3.local');
-insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('4','1','42','0','0.7','0','host4.local');
-insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('5','1','1','0','0.5','0','host1-ca.local:5060');
-insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('6','1','1','0','0.5','0','host2-ca.local.domain:5060');
-insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('10','1','','0','0.1','0','host5.local');
-insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('20','2','','0','1','0','host6');
-insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('21','3','','0','1','0','premium.host.local');"
+$PSQL "insert into carrier_name (id, carrier) values ('1', 'carrier1');
+insert into carrier_name (id, carrier) values ('2', 'default');
+insert into carrier_name (id, carrier) values ('3', 'premium');
+insert into domain_name (id, domain) values ('10', 'domain1');
+insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('1','1','49','10','0.5','0','host1.local.domain');
+insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('2','1','49','10','0.5','0','host2.local.domain');
+insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('3','1','42','10','0.3','0','host3.local');
+insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('4','1','42','10','0.7','0','host4.local');
+insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('5','1','1','10','0.5','0','host1-ca.local:5060');
+insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('6','1','1','10','0.5','0','host2-ca.local.domain:5060');
+insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('10','1','','10','0.1','0','host5.local');
+insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('20','2','','10','1','0','host6');
+insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('21','3','','10','1','0','premium.host.local');"
 
 ../$BIN -w . -f $CFG > /dev/null
 ret=$?
@@ -66,21 +67,21 @@ fi ;
 
 if [ "$ret" -eq 0 ] ; then
 	tmp=`grep -v "Printing routing information:
-Printing tree for carrier premium (3)
-Printing tree for domain 0
-      NULL: 100.000 %, 'premium.host.local': ON, '0', '', '', ''
-Printing tree for carrier default (2)
-Printing tree for domain 0
-      NULL: 100.000 %, 'host6': ON, '0', '', '', ''
-Printing tree for carrier carrier1 (1)
-Printing tree for domain 0
+Printing tree for carrier 'carrier1' (1)
+Printing tree for domain 'domain1' (10)
          1: 50.000 %, 'host2-ca.local.domain:5060': ON, '0', '', '', ''
          1: 50.000 %, 'host1-ca.local:5060': ON, '0', '', '', ''
         42: 70.140 %, 'host4.local': ON, '0', '', '', ''
         42: 30.060 %, 'host3.local': ON, '0', '', '', ''
         49: 50.000 %, 'host2.local.domain': ON, '0', '', '', ''
         49: 50.000 %, 'host1.local.domain': ON, '0', '', '', ''
-      NULL: 100.000 %, 'host5.local': ON, '0', '', '', ''" $TMPFILE`
+      NULL: 100.000 %, 'host5.local': ON, '0', '', '', ''
+Printing tree for carrier 'default' (2)
+Printing tree for domain 'domain1' (10)
+      NULL: 100.000 %, 'host6': ON, '0', '', '', ''
+Printing tree for carrier 'premium' (3)
+Printing tree for domain 'domain1' (10)
+      NULL: 100.000 %, 'premium.host.local': ON, '0', '', '', ''" $TMPFILE`
 	if [ "$tmp" = "" ] ; then
 		ret=0
 	else
@@ -91,9 +92,10 @@ fi ;
 $KILL
 
 # cleanup database
-$PSQL "delete from route_tree where id = 1;
-delete from route_tree where id = 2;
-delete from route_tree where id = 3;
+$PSQL "delete from carrier_name where id = 1;
+delete from carrier_name where id = 2;
+delete from carrier_name where id = 3;
+delete from domain_name where id = 10;
 delete from carrierroute where carrier=1;
 delete from carrierroute where carrier=2;
 delete from carrierroute where carrier=3;"

test/unit/26.cfg

@@ -28,7 +28,7 @@ route{
 
 	# user route
 	if(cr_user_carrier("$rU", "$rd", "$avp(carrier)")) {
-		$avp(domain)="0";
+		$avp(domain)="domain0";
 		if (!cr_route("$avp(carrier)", "$avp(domain)", "$rU", "$rU", "call_id", "$avp(host)")) {
 			xlog("L_ERR", "cr_route failed\n");
 			exit;
@@ -36,7 +36,7 @@ route{
 		t_on_failure("1");
 	} else {
 	# default route
-		if (!cr_route("default", "0", "$rU", "$rU", "call_id")) {
+		if (!cr_route("default", "domain0", "$rU", "$rU", "call_id")) {
 			xlog("L_ERR", "cr_route failed\n");
 			exit;
 		}
@@ -63,4 +63,3 @@ failure_route[1] {
 		exit;
 	}
 }
-

test/unit/26.sh

@@ -36,33 +36,37 @@ echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 
 # setup database
-$MYSQL "insert into route_tree (id, carrier) values ('1', 'default');"
-$MYSQL "insert into route_tree (id, carrier) values ('2', 'carrier1');"
-$MYSQL "insert into route_tree (id, carrier) values ('3', 'carrier2');"
+$MYSQL "insert into carrier_name (id, carrier) values ('1', 'default');"
+$MYSQL "insert into carrier_name (id, carrier) values ('2', 'carrier1');"
+$MYSQL "insert into carrier_name (id, carrier) values ('3', 'carrier2');"
+
+$MYSQL "insert into domain_name (id, domain) values ('10', 'domain0');"
+$MYSQL "insert into domain_name (id, domain) values ('1', 'fallback');"
+$MYSQL "insert into domain_name (id, domain) values ('2', 'domain2');"
 
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, prob, strip, rewrite_host)
-values ('1','1','0','49','0','0.5','0','127.0.0.1:7000');"
+values ('1','1','10','49','0','0.5','0','127.0.0.1:7000');"
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, prob, strip, rewrite_host)
-values ('2','1','0','49','0','0.5','0','127.0.0.1:8000');"
+values ('2','1','10','49','0','0.5','0','127.0.0.1:8000');"
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, prob, strip, rewrite_host)
-values ('3','2','0','49','0','1','0','127.0.0.1:9000');"
+values ('3','2','10','49','0','1','0','127.0.0.1:9000');"
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, mask,prob, strip, rewrite_host)
-values ('4','3','0','49','0', '3', '1','0','127.0.0.1:10001');"
+values ('4','3','10','49','0', '3', '1','0','127.0.0.1:10001');"
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, mask,prob, strip, rewrite_host)
-values ('5','3','0','49','1', '3', '1','0','127.0.0.1:10000');"
+values ('5','3','10','49','1', '3', '1','0','127.0.0.1:10000');"
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, mask, prob, strip, rewrite_host)
-values ('6','3','0','49','2', '3', '1','0','127.0.0.1:10002');"
+values ('6','3','10','49','2', '3', '1','0','127.0.0.1:10002');"
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, prob, strip, rewrite_host)
-values ('7','3','fallback','49','0','1','0','127.0.0.1:10000');"
+values ('7','3','1','49','0','1','0','127.0.0.1:10000');"
 $MYSQL "insert into carrierroute (id, carrier, domain, scan_prefix, flags, prob, strip, rewrite_host)
 values ('8','3','2','49','0','1','0','127.0.0.1:10000');"
 
 $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code,
-flags, mask, next_domain) values ('1', '3', '0', '49', '127.0.0.1:10000', '5..', '0', '0', 'fallback');"
+flags, mask, next_domain) values ('1', '3', '10', '49', '127.0.0.1:10000', '5..', '0', '0', '1');"
 $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code,
-flags, mask, next_domain) values ('2', '3', 'fallback', '49', '127.0.0.1:10000', '483', '0', '0', '2');"
+flags, mask, next_domain) values ('2', '3', '1', '49', '127.0.0.1:10000', '483', '0', '0', '2');"
 $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code,
-flags, mask, next_domain) values ('3', '3', 'fallback', '49', '127.0.0.1:9000', '4..', '0', '0', '2');"
+flags, mask, next_domain) values ('3', '3', '1', '49', '127.0.0.1:9000', '4..', '0', '0', '2');"
 
 $MYSQL "alter table subscriber add cr_preferred_carrier int(10) default NULL;"
 
@@ -104,9 +108,9 @@ if [ "$ret" -eq 0 ] ; then
 fi;
 
 $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code,
-flags, mask, next_domain) values ('4', '3', 'fallback', '49', '127.0.0.1:10000', '4..', '0', '0', '4');"
+flags, mask, next_domain) values ('4', '3', '1', '49', '127.0.0.1:10000', '4..', '0', '0', '4');"
 $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code,
-flags, mask, next_domain) values ('5', '3', 'fallback', '49', '127.0.0.1:10000', '486', '0', '0', '2');"
+flags, mask, next_domain) values ('5', '3', '1', '49', '127.0.0.1:10000', '486', '0', '0', '2');"
 
 if [ ! "$ret" -eq 0 ] ; then
 	../scripts/$CTL fifo cr_reload_routes
@@ -121,9 +125,12 @@ $KILL
 killall -9 sipp
 
 # cleanup database
-$MYSQL "delete from route_tree where id = 1;"
-$MYSQL "delete from route_tree where id = 2;"
-$MYSQL "delete from route_tree where id = 3;"
+$MYSQL "delete from carrier_name where id = 1;"
+$MYSQL "delete from carrier_name where id = 2;"
+$MYSQL "delete from carrier_name where id = 3;"
+$MYSQL "delete from domain_name where id = 10;"
+$MYSQL "delete from domain_name where id = 1;"
+$MYSQL "delete from domain_name where id = 2;"
 $MYSQL "delete from carrierroute where carrier=1;"
 $MYSQL "delete from carrierroute where carrier=2;"
 $MYSQL "delete from carrierroute where carrier=3;"

test/unit/37.sh

@@ -25,9 +25,9 @@ source include/database
 
 CFG=13.cfg
 # number of routes, multiplied with 10
-# if you want to increase this above 8500, comment the fifo command below,
+# if you want to increase this above 4500, comment the fifo command below,
 # otherwise this will fails with memory allocation errors (with 1MB PKG mem)
-NR=850
+NR=450
 
 if ! (check_kamailio && check_module "carrierroute" && check_module "db_mysql" && check_mysql); then
 	exit 0
@@ -40,24 +40,25 @@ echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 
 # setup database
-$MYSQL "insert into route_tree (id, carrier) values ('1', 'default');"
-$MYSQL "insert into route_tree (id, carrier) values ('2', 'carrier2');"
-$MYSQL "insert into route_tree (id, carrier) values ('3', 'carrier3');"
-$MYSQL "insert into route_tree (id, carrier) values ('4', 'carrier4');"
-$MYSQL "insert into route_tree (id, carrier) values ('5', 'carrier5');"
-$MYSQL "insert into route_tree (id, carrier) values ('6', 'carrier6');"
-$MYSQL "insert into route_tree (id, carrier) values ('7', 'carrier7');"
-$MYSQL "insert into route_tree (id, carrier) values ('8', 'carrier8');"
-$MYSQL "insert into route_tree (id, carrier) values ('9', 'carrier9');"
-$MYSQL "insert into route_tree (id, carrier) values ('10', 'carrier10');"
-$MYSQL "insert into route_tree (id, carrier) values ('11', 'carrier11');"
+$MYSQL "insert into carrier_name (id, carrier) values ('1', 'default');"
+$MYSQL "insert into carrier_name (id, carrier) values ('2', 'carrier2');"
+$MYSQL "insert into carrier_name (id, carrier) values ('3', 'carrier3');"
+$MYSQL "insert into carrier_name (id, carrier) values ('4', 'carrier4');"
+$MYSQL "insert into carrier_name (id, carrier) values ('5', 'carrier5');"
+$MYSQL "insert into carrier_name (id, carrier) values ('6', 'carrier6');"
+$MYSQL "insert into carrier_name (id, carrier) values ('7', 'carrier7');"
+$MYSQL "insert into carrier_name (id, carrier) values ('8', 'carrier8');"
+$MYSQL "insert into carrier_name (id, carrier) values ('9', 'carrier9');"
+$MYSQL "insert into carrier_name (id, carrier) values ('10', 'carrier10');"
+$MYSQL "insert into carrier_name (id, carrier) values ('11', 'carrier11');"
 
 
 COUNTER=0
 while [  $COUNTER -lt $NR ]; do
 	COUNTER=$(($COUNTER+1))
 	domain=`expr $COUNTER % 9`
-	$MYSQL "insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('2','$domain','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('3','$domain','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('4','$domain','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('5','$domain','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('6','$domain','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('7','$domain','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('8','$domain','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('9','$domain','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('10','$domain','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('11','$domain','$RANDOM','0.5','0','host-$RANDOM');"
+	$MYSQL "insert into domain_name (id, domain) values ('$COUNTER', '$domain');"
+	$MYSQL "insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('2','$COUNTER','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('3','$COUNTER','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('4','$COUNTER','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('5','$COUNTER','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('6','$COUNTER','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('7','$COUNTER','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('8','$COUNTER','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('9','$COUNTER','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('10','$COUNTER','$RANDOM','0.5','0','host-$RANDOM'); insert into carrierroute (carrier, domain, scan_prefix, prob, strip, rewrite_host) values ('11','$COUNTER','$RANDOM','0.5','0','host-$RANDOM');"
 
 done
 
@@ -65,7 +66,7 @@ done
 ret=$?
 
 # adjust if you have bigger rule sets
-sleep 2
+sleep 20
 
 cd ../scripts
 
@@ -80,17 +81,23 @@ fi ;
 $KILL
 
 # cleanup database
-$MYSQL "delete from route_tree where id = 1;"
-$MYSQL "delete from route_tree where id = 2;"
-$MYSQL "delete from route_tree where id = 3;"
-$MYSQL "delete from route_tree where id = 4;"
-$MYSQL "delete from route_tree where id = 5;"
-$MYSQL "delete from route_tree where id = 6;"
-$MYSQL "delete from route_tree where id = 7;"
-$MYSQL "delete from route_tree where id = 8;"
-$MYSQL "delete from route_tree where id = 9;"
-$MYSQL "delete from route_tree where id = 10;"
-$MYSQL "delete from route_tree where id = 11;"
+$MYSQL "delete from carrier_name where id = 1;"
+$MYSQL "delete from carrier_name where id = 2;"
+$MYSQL "delete from carrier_name where id = 3;"
+$MYSQL "delete from carrier_name where id = 4;"
+$MYSQL "delete from carrier_name where id = 5;"
+$MYSQL "delete from carrier_name where id = 6;"
+$MYSQL "delete from carrier_name where id = 7;"
+$MYSQL "delete from carrier_name where id = 8;"
+$MYSQL "delete from carrier_name where id = 9;"
+$MYSQL "delete from carrier_name where id = 10;"
+$MYSQL "delete from carrier_name where id = 11;"
+
+COUNTER=0
+while [  $COUNTER -lt $NR ]; do
+	COUNTER=$(($COUNTER+1))
+	$MYSQL "delete from domain_name where id = $COUNTER;"
+done
 
 $MYSQL "delete from carrierroute where carrier=1;"
 $MYSQL "delete from carrierroute where carrier=2;"
@@ -108,4 +115,4 @@ cd ../test
 
 mv $CFG.bak $CFG
 
-exit $ret
+exit $ret