further changes after the db name change

- update INSTALL file
- fix Makefile skip modules variable
- fix module Makefile, lib name
- change db_bind_mod to add the db prefix in the function
- change db url defines in db_berkeley and db_text
- change database modules names in module struct
- fix debian packaging
- fix tests


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

test/unit/11.cfg

@@ -7,7 +7,7 @@ disable_tcp=yes
 
 # ------------------ module loading ----------------------------------
 mpath="../modules/"
-loadmodule "mysql/mysql.so"
+loadmodule "db_mysql/db_mysql.so"
 loadmodule "sl/sl.so"
 loadmodule "tm/tm.so"
 loadmodule "rr/rr.so"

test/unit/12.cfg

@@ -1,6 +1,6 @@
 log_stderror=yes
 mpath="../modules/"
-loadmodule "mysql/mysql.so"
+loadmodule "db_mysql/db_mysql.so"
 loadmodule "sl/sl.so"
 loadmodule "tm/tm.so"
 loadmodule "rr/rr.so"

test/unit/13.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# loads a carrierroute config for loadbalancing from database
+# loads a carrierroute config for loadbalancing from mysql database
 
 # Copyright (C) 2007 1&1 Internet AG
 #
@@ -29,7 +29,7 @@ fi ;
 cp $CFG $CFG.bak
 
 # setup config
-echo "loadmodule \"mysql/mysql.so\"" >> $CFG
+echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 
 # setup database

test/unit/15.sh

@@ -21,9 +21,9 @@
 
 CFG=15.cfg
 
-echo "loadmodule \"../modules/dbtext/dbtext.so\"" >> $CFG
+echo "loadmodule \"../modules/db_text/db_text.so\"" >> $CFG
 cat 2.cfg >> $CFG
-echo "modparam(\"acc|alias_db|auth_db|dialog|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt\", \"db_url\", \"dbtext://`pwd`/../scripts/dbtext/openser\")" >> $CFG
+echo "modparam(\"acc|alias_db|auth_db|dialog|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt\", \"db_url\", \"text://`pwd`/../scripts/dbtext/openser\")" >> $CFG
 
 ../openser -w . -f $CFG > /dev/null
 ret=$?

test/unit/16.sh

@@ -21,7 +21,7 @@
 
 # Needs a default openser database setup for postgres
 
-if [ ! -e ../modules/postgres/postgres.so ] ; then
+if [ ! -e ../modules/db_postgres/db_postgres.so ] ; then
 	echo "postgres driver not found, not run"
 	exit 0
 fi ;
@@ -29,7 +29,7 @@ fi ;
 CFG=2.cfg
 cp $CFG $CFG.bak
 
-echo "loadmodule \"postgres/postgres.so\"" >> $CFG
+echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
 echo "modparam(\"acc|alias_db|auth_db|dialog|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt\", \"db_url\", \"postgres://openserro:openserro@localhost/openser\")" >> $CFG
 
 

test/unit/17.sh

@@ -30,7 +30,7 @@ tmp_name=""$RANDOM"_openserdb_tmp"
 
 echo "loadmodule \"../modules/db_berkeley/db_berkeley.so\"" >> $CFG
 cat 2.cfg >> $CFG
-echo "modparam(\"acc|alias_db|auth_db|dialog|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt\", \"db_url\", \"db_berkeley://`pwd`/../scripts/$tmp_name\")" >> $CFG
+echo "modparam(\"acc|alias_db|auth_db|dialog|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt\", \"db_url\", \"berkeley://`pwd`/../scripts/$tmp_name\")" >> $CFG
 
 cd ../scripts
 

test/unit/19.cfg

@@ -11,7 +11,7 @@ rev_dns=no
 
 #-----------------------Loading Modiules-------------------------------------
 mpath="../modules/"
-loadmodule "mysql/mysql.so"
+loadmodule "db_mysql/db_mysql.so"
 loadmodule "usrloc/usrloc.so"
 loadmodule "registrar/registrar.so"
 loadmodule "sl/sl.so"

test/unit/2.cfg

@@ -14,7 +14,7 @@ loadmodule "domain/domain.so"
 loadmodule "domainpolicy/domainpolicy.so"
 loadmodule "enum/enum.so"
 loadmodule "exec/exec.so"
-loadmodule "flatstore/flatstore.so"
+loadmodule "db_flatstore/db_flatstore.so"
 loadmodule "gflags/gflags.so"
 loadmodule "group/group.so"
 loadmodule "imc/imc.so"

test/unit/2.sh

@@ -21,7 +21,7 @@
 
 # Needs a default openser database setup for mysql
 
-if [ ! -e ../modules/mysql/mysql.so ] ; then
+if [ ! -e ../modules/db_mysql/db_mysql.so ] ; then
 	echo "mysql driver not found, not run"
 	exit 0
 fi ;
@@ -31,7 +31,7 @@ cp $CFG $CFG.bak
 
 touch dispatcher.list
 
-echo "loadmodule \"mysql/mysql.so\"" >> $CFG
+echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"dispatcher\", \"list_file\", \"`pwd`/../test/dispatcher.list\")" >> $CFG
 
 # start

test/unit/20.cfg

@@ -11,7 +11,7 @@ rev_dns=no
 
 #-----------------------Loading Modiules-------------------------------------
 mpath="../modules/"
-loadmodule "mysql/mysql.so"
+loadmodule "db_mysql/db_mysql.so"
 loadmodule "usrloc/usrloc.so"
 loadmodule "registrar/registrar.so"
 loadmodule "sl/sl.so"
@@ -25,11 +25,13 @@ loadmodule "mi_fifo/mi_fifo.so"
 #-----------------------Module parameters-------------------------------------
 modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
 modparam("usrloc", "db_mode", 3)
-modparam("usrloc", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("usrloc", "db_url", "mysql://openser:openserrw@127.0.0.1/openser")
 modparam("acc", "log_level", 3)
 modparam("acc", "log_flag", 1)
 modparam("acc", "log_level", 2)
 modparam("acc", "log_facility", "LOG_DAEMON")
+modparam("db_mysql", "timeout_interval", 2)
+
 
 #-----------------------Routing configuration---------------------------------#
 route{

test/unit/21.cfg

@@ -25,7 +25,7 @@ rev_dns=no
 mpath="../modules/"
 
 # Uncomment this if you want to use SQL database
-loadmodule "mysql/mysql.so"
+loadmodule "db_mysql/db_mysql.so"
 
 loadmodule "sl/sl.so"
 loadmodule "tm/tm.so"

test/unit/22.sh

@@ -32,7 +32,7 @@ if [ ! $ret -eq 0 ] ; then
 fi ;
 
 cp $CFG $CFG.tmp
-echo "loadmodule \"postgres/postgres.so\"" >> $CFG
+echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
 echo "modparam(\"usrloc\", \"db_url\", \"postgres://openser:openserrw@localhost/openser\")" >> $CFG
 
 ../openser -w . -f $CFG > /dev/null

test/unit/5.cfg

@@ -63,7 +63,7 @@ port=5060
 mpath="../modules"
 
 /* uncomment next line for MySQL DB support */
-#loadmodule "mysql.so"
+#loadmodule "db_mysql.so"
 loadmodule "sl/sl.so"
 loadmodule "tm/tm.so"
 loadmodule "rr/rr.so"

test/unit/7.cfg

@@ -220,9 +220,9 @@ modparam("registrar", "received_avp", "$avp(i:801)")
 loadmodule "sl/sl.so"
 modparam("sl", "enable_stats", 1)
 
-loadmodule "mysql/mysql.so"
-modparam("mysql", "ping_interval", 300)
-modparam("mysql", "auto_reconnect", 1)
+loadmodule "db_mysql/db_mysql.so"
+modparam("db_mysql", "ping_interval", 300)
+modparam("db_mysql", "auto_reconnect", 1)
 
 loadmodule "auth/auth.so"
 modparam("auth", "nonce_expire", 300)