- renaming: openser -> kamailio

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

test/unit/1.sh

@@ -24,11 +24,11 @@ CFG=1.cfg
 # setup config
 echo -e "debug=3" > $CFG
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
-killall -9 openser
+killall -9 kamailio
 
 rm -f $CFG
 

test/unit/10.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# test basic db related openserctl functionality for dbtext
+# test basic db related kamailioctl functionality for dbtext
 
 # Copyright (C) 2007 1&1 Internet AG
 #
@@ -22,28 +22,28 @@
 cd ../scripts
 
 # setup config file
-cp openserctlrc openserctlrc.bak
-cp openserctl openserctl.bak
-sed -i "s/# DBENGINE=MYSQL/DBENGINE=DBTEXT/g" openserctlrc
-sed -i "s/TEST=\"false\"/TEST=\"true\"/g" openserctl
+cp kamailioctlrc kamailioctlrc.bak
+cp kamailioctl kamailioctl.bak
+sed -i "s/# DBENGINE=MYSQL/DBENGINE=DBTEXT/g" kamailioctlrc
+sed -i "s/TEST=\"false\"/TEST=\"true\"/g" kamailioctl
 
-./openserctl avp list > /dev/null
+./kamailioctl avp list > /dev/null
 
 ret=$?
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl domain showdb > /dev/null
+	./kamailioctl domain showdb > /dev/null
 	ret=$?
 fi ;
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl lcr show > /dev/null
+	./kamailioctl lcr show > /dev/null
 	ret=$?
 fi ;
 
 # cleanup
-mv openserctlrc.bak openserctlrc
-mv openserctl.bak openserctl
+mv kamailioctlrc.bak kamailioctlrc
+mv kamailioctl.bak kamailioctl
 
 cd ../test
 exit $ret

test/unit/11.cfg

@@ -13,7 +13,7 @@ loadmodule "rr/rr.so"
 loadmodule "maxfwd/maxfwd.so"
 loadmodule "textops/textops.so"
 loadmodule "mi_fifo/mi_fifo.so"
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 
 loadmodule "usrloc/usrloc.so"
 modparam("usrloc", "db_mode", 1)

test/unit/11.sh

@@ -24,7 +24,7 @@ source include/database
 
 CFG=11.cfg
 
-if ! (check_netcat && check_openser && check_module "db_mysql" && check_mysql); then
+if ! (check_netcat && check_kamailio && check_module "db_mysql" && check_mysql); then
 	exit 0
 fi ;
 
@@ -32,7 +32,7 @@ cp $CFG $CFG.bak
 
 echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
@@ -43,11 +43,11 @@ cat register.sip | nc -q 1 -u localhost 5060 > /dev/null
 cd ../scripts
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl ul show | grep "AOR:: 1000" > /dev/null
+	./kamailioctl ul show | grep "AOR:: 1000" > /dev/null
 	ret=$?
 fi ;
 
-TMP=`mysql -B -u openserro --password=openserro openser -e "select COUNT(*) from location where username="1000";" | tail -n 1`
+TMP=`mysql -B -u kamailioro --password=kamailioro kamailio -e "select COUNT(*) from location where username="1000";" | tail -n 1`
 if [ "$TMP" -eq 0 ] ; then
 	ret=1
 fi ;
@@ -56,7 +56,7 @@ fi ;
 cat ../test/unregister.sip | nc -q 1 -u localhost 5060 > /dev/null
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl ul show | grep "AOR:: 1000" > /dev/null
+	./kamailioctl ul show | grep "AOR:: 1000" > /dev/null
 	ret=$?
 	if [ "$ret" -eq 0 ] ; then
 		ret=1
@@ -65,11 +65,11 @@ if [ "$ret" -eq 0 ] ; then
 	fi ;
 fi ;
 
-ret=`mysql -B -u openserro --password=openserro openser -e "select COUNT(*) from location where username="1000";" | tail -n 1`
+ret=`mysql -B -u kamailioro --password=kamailioro kamailio -e "select COUNT(*) from location where username="1000";" | tail -n 1`
 
 cd ../test
 
-killall -9 openser
+killall -9 kamailio
 
 mv $CFG.bak $CFG
 

test/unit/12.cfg

@@ -10,14 +10,14 @@ loadmodule "xlog/xlog.so"
 loadmodule "usrloc/usrloc.so"
 loadmodule "registrar/registrar.so"
 loadmodule "mi_fifo/mi_fifo.so"
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 
 avp_aliases="identity_user=i:81"
 avp_aliases="identity_domain=i:82"
 avp_aliases="identity_uri=i:83"
 
 route{
-	xlog("received by openser[$pp] at '$Tf' from $si:$sp, method: $rm, transport: $rP:$Ri:$rp, user agent: $ua\n");
+	xlog("received by kamailio[$pp] at '$Tf' from $si:$sp, method: $rm, transport: $rP:$Ri:$rp, user agent: $ua\n");
 
 	if !(route(39)) {
 		xlog("L_ERR", "Error getting identity\n");

test/unit/12.sh

@@ -22,13 +22,13 @@
 source include/require
 
 CFG=12.cfg
-TMPFILE=`mktemp -t openser-test.XXXXXXXXXX`
+TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX`
 
-if ! (check_netcat && check_openser); then
+if ! (check_netcat && check_kamailio); then
 	exit 0
 fi ;
 
-../openser -w . -f $CFG &> $TMPFILE
+../kamailio -w . -f $CFG &> $TMPFILE
 ret=$?
 
 sleep 1
@@ -39,7 +39,7 @@ cat register.sip | nc -q 1 -u localhost 5060 > /dev/null
 cd ../scripts
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl ul show | grep "AOR:: 1000" > /dev/null
+	./kamailioctl ul show | grep "AOR:: 1000" > /dev/null
 	ret=$?
 fi ;
 
@@ -47,7 +47,7 @@ fi ;
 cat ../test/unregister.sip | nc -q 1 -u localhost 5060 > /dev/null
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl ul show | grep "AOR:: 1000" > /dev/null
+	./kamailioctl ul show | grep "AOR:: 1000" > /dev/null
 	ret=$?
 	if [ "$ret" -eq 0 ] ; then
 		ret=1
@@ -83,7 +83,7 @@ fi ;
 
 cd ../test
 
-killall -9 openser
+killall -9 kamailio
 rm $TMPFILE
 
 exit $ret

test/unit/13.cfg

@@ -6,7 +6,7 @@ loadmodule "maxfwd/maxfwd.so"
 loadmodule "carrierroute/carrierroute.so"
 loadmodule "mi_fifo/mi_fifo.so"
 
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 
 avp_aliases="domain=s:10"
 avp_aliases="carrier=s:11"

test/unit/13.sh

@@ -24,7 +24,7 @@ source include/database
 
 CFG=13.cfg
 
-if ! (check_openser && check_module "carrierroute" ); then
+if ! (check_kamailio && check_module "carrierroute" ); then
 	exit 0
 fi ;
 
@@ -60,7 +60,7 @@ mask, next_domain) values ('3', '2', '1', '49', 'host1.local', '503', '0', '0',
 $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code, flags,
 mask, next_domain) values ('4', '2', '2', '49', 'host1.local', '5..', '0', '0', '3');"
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 
 ret=$?
 
@@ -68,10 +68,10 @@ sleep 1
 
 cd ../scripts
 
-TMPFILE=`mktemp -t openser-test.XXXXXXXXXX`
+TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX`
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl fifo cr_dump_routes > $TMPFILE
+	./kamailioctl fifo cr_dump_routes > $TMPFILE
 	ret=$?
 fi ;
 
@@ -103,7 +103,7 @@ Printing tree for domain 0
 	fi ;
 fi ;
 
-killall -9 openser
+killall -9 kamailio
 
 # cleanup database
 $MYSQL "delete from route_tree where id = 1;"

test/unit/14.cfg

@@ -5,7 +5,7 @@ loadmodule "maxfwd/maxfwd.so"
 loadmodule "carrierroute/carrierroute.so"
 loadmodule "mi_fifo/mi_fifo.so"
 
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 
 avp_aliases="domain=s:10"
 avp_aliases="carrier=s:11"

test/unit/14.sh

@@ -23,7 +23,7 @@ source include/require
 
 CFG=14.cfg
 
-if ! (check_openser && check_module "carrierroute" ); then
+if ! (check_kamailio && check_module "carrierroute" ); then
 	exit 0
 fi ;
 
@@ -32,17 +32,17 @@ cp $CFG $CFG.bak
 # setup config
 echo "modparam(\"carrierroute\", \"config_file\", \"`pwd`/../test/carrierroute.cfg\")" >> $CFG
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
 
 cd ../scripts
 
-TMPFILE=`mktemp -t openser-test.XXXXXXXXXX`
+TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX`
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl fifo cr_dump_routes > $TMPFILE
+	./kamailioctl fifo cr_dump_routes > $TMPFILE
 	ret=$?
 fi ;
 
@@ -75,7 +75,7 @@ Printing tree for domain other
 	fi ;
 fi ;
 
-killall -9 openser
+killall -9 kamailio
 
 cd ../test
 

test/unit/15.sh

@@ -24,19 +24,19 @@ source include/require
 
 CFG=15.cfg
 
-if ! (check_openser); then
+if ! (check_kamailio); then
 	exit 0
 fi ;
 
 echo "loadmodule \"../modules/db_text/db_text.so\"" >> $CFG
 cat 2.cfg >> $CFG
-echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../scripts/dbtext/openser\")" >> $CFG
+echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../scripts/dbtext/kamailio\")" >> $CFG
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
-killall -9 openser
+killall -9 kamailio
 
 rm $CFG
 

test/unit/16.sh

@@ -22,9 +22,9 @@
 source include/common
 source include/require
 
-# Needs a default openser database setup for postgres
+# Needs a default kamailio database setup for postgres
 
-if ! (check_openser && check_module "db_postgres" ); then
+if ! (check_kamailio && check_module "db_postgres" ); then
 	exit 0
 fi ;
 
@@ -32,14 +32,14 @@ CFG=2.cfg
 cp $CFG $CFG.bak
 
 echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
-echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"postgres://openserro:openserro@localhost/openser\")" >> $CFG
+echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"postgres://kamailioro:kamailioro@localhost/kamailio\")" >> $CFG
 
 # start
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
-killall -9 openser
+killall -9 kamailio
 
 mv $CFG.bak $CFG
 rm -f dispatcher.list

test/unit/17.sh

@@ -22,13 +22,13 @@
 source include/common
 source include/require
 
-if ! (check_openser && check_module "db_berkeley" ); then
+if ! (check_kamailio && check_module "db_berkeley" ); then
 	exit 0
 fi ;
 
 CFG=17.cfg
 
-tmp_name=""$RANDOM"_openserdb_tmp"
+tmp_name=""$RANDOM"_kamailiodb_tmp"
 
 echo "loadmodule \"../modules/db_berkeley/db_berkeley.so\"" >> $CFG
 cat 2.cfg >> $CFG
@@ -37,29 +37,29 @@ echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"berkeley://`pwd`/../scripts/$tmp_n
 cd ../scripts
 
 # setup config file
-cp openserctlrc openserctlrc.bak
-sed -i "s/# DBENGINE=MYSQL/DBENGINE=DB_BERKELEY/g" openserctlrc
-sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" openserctlrc
-sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" openserctlrc
+cp kamailioctlrc kamailioctlrc.bak
+sed -i "s/# DBENGINE=MYSQL/DBENGINE=DB_BERKELEY/g" kamailioctlrc
+sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" kamailioctlrc
+sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" kamailioctlrc
 
-cp openserdbctl openserdbctl.bak
-sed -i "s/TEST=\"false\"/TEST=\"true\"/g" openserdbctl
+cp kamailiodbctl kamailiodbctl.bak
+sed -i "s/TEST=\"false\"/TEST=\"true\"/g" kamailiodbctl
 
-./openserdbctl create $tmp_name > /dev/null
+./kamailiodbctl create $tmp_name > /dev/null
 ret=$?
 
 if [ "$ret" -eq 0 ] ; then
-	../openser -w . -f ../test/$CFG > /dev/null	
+	../kamailio -w . -f ../test/$CFG > /dev/null	
 	ret=$?
 fi ;
 
 sleep 1
-killall -9 openser
+killall -9 kamailio
 
 # cleanup
-./openserdbctl drop $tmp_name > /dev/null
-mv openserctlrc.bak openserctlrc
-mv openserdbctl.bak openserdbctl
+./kamailiodbctl drop $tmp_name > /dev/null
+mv kamailioctlrc.bak kamailioctlrc
+mv kamailiodbctl.bak kamailiodbctl
 
 cd ../test/
 rm $CFG

test/unit/18.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# runs ../openser with all command line arguments.
+# runs ../kamailio with all command line arguments.
 # ommited options are -h -v -C -c -D
 
 # Copyright (C) 2007 1&1 Internet AG
@@ -22,7 +22,7 @@
 
 source include/require
 
-if ! (check_openser); then
+if ! (check_kamailio); then
 	exit 0
 fi ;
 
@@ -33,14 +33,14 @@ CFG=18.cfg
 echo -e "debug=3" > $CFG
 
 # start:
-../openser -f ./$CFG -l 127.0.0.1 -n 0 -rR -v  -E -d -T -N 0 -b 23 -m 42 -w ./  -u $(id -u)  -g $(id -g) -P ./pid.out -G ./pgid.out  > /dev/null 2>&1
+../kamailio -f ./$CFG -l 127.0.0.1 -n 0 -rR -v  -E -d -T -N 0 -b 23 -m 42 -w ./  -u $(id -u)  -g $(id -g) -P ./pid.out -G ./pgid.out  > /dev/null 2>&1
 
 ret=$?
 
 sleep 1
 
 # clean up:
-killall -9 openser
+killall -9 kamailio
 
 rm $CFG
 rm pgid.out

test/unit/19.cfg

@@ -1,4 +1,4 @@
-# OpenSER config for lookup / registrar testing
+# Kamailio config for lookup / registrar testing
 
 #------------------------Global configuration----------------------------------
 debug=3
@@ -22,9 +22,9 @@ loadmodule "mi_fifo/mi_fifo.so"
 
 
 #-----------------------Module parameters-------------------------------------
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 modparam("usrloc", "db_mode", 3)
-modparam("usrloc", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("usrloc", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 
 #-----------------------Routing configuration---------------------------------#
 route{

test/unit/19.sh

@@ -22,7 +22,7 @@
 source include/require
 source include/database
 
-if ! (check_sipp && check_openser); then
+if ! (check_sipp && check_kamailio); then
 	exit 0
 fi ;
 
@@ -35,7 +35,7 @@ UAC=5080
 # add an registrar entry to the db;
 $MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:foo@localhost:$UAS\",\"udp:127.0.0.1:$UAS\",\"ser_test\",1,-1);"
 
-../openser -w . -f $CFG &> /dev/null
+../kamailio -w . -f $CFG &> /dev/null
 sipp -sn uas -bg -i localhost -m 10 -f 2 -p $UAS &> /dev/null
 sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 10 -f 2 -p $UAC &> /dev/null
 
@@ -43,7 +43,7 @@ ret=$?
 
 # cleanup
 killall -9 sipp > /dev/null 2>&1
-killall -9 openser > /dev/null 2>&1
+killall -9 kamailio > /dev/null 2>&1
 
 $MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo@localhost:$UAS\") and (user_agent = \"ser_test\"));"
 exit $ret;

test/unit/2.cfg

@@ -52,8 +52,8 @@ loadmodule "pdt/pdt.so"
 loadmodule "mediaproxy/mediaproxy.so"
 loadmodule "xlog/xlog.so"
 
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
-modparam("mi_datagram", "socket_name", "/tmp/openser.sock")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
+modparam("mi_datagram", "socket_name", "/tmp/kamailio.sock")
 modparam("dialog", "dlg_flag", 10)
 modparam("dialog", "db_mode", 2)
 modparam("lcr", "contact_avp", "$avp(i:711)")

test/unit/2.sh

@@ -19,14 +19,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-# Needs a default openser database setup for mysql
+# Needs a default kamailio database setup for mysql
 
 source include/require
 source include/database
 
 CFG=2.cfg
 
-if ! (check_openser && check_module "db_mysql" && check_mysql); then
+if ! (check_kamailio && check_module "db_mysql" && check_mysql); then
 	exit 0
 fi ;
 
@@ -38,11 +38,11 @@ echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"dispatcher\", \"list_file\", \"`pwd`/../test/dispatcher.list\")" >> $CFG
 
 # start
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
-killall -9 openser
+killall -9 kamailio
 
 mv $CFG.bak $CFG
 rm -f dispatcher.list

test/unit/20.cfg

@@ -1,4 +1,4 @@
-# OpenSER config for lookup / registrar testing
+# Kamailio config for lookup / registrar testing
 
 #------------------------Global configuration----------------------------------
 debug=3
@@ -24,9 +24,9 @@ loadmodule "xlog/xlog.so"
 
 
 #-----------------------Module parameters-------------------------------------
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 modparam("usrloc", "db_mode", 3)
-modparam("usrloc", "db_url", "mysql://openser:openser[email protected]/openser")
+modparam("usrloc", "db_url", "mysql://kamailio:kamaili[email protected]/kamailio")
 modparam("acc", "log_flag", 1)
 modparam("db_mysql", "timeout_interval", 2)
 

test/unit/20.sh

@@ -22,19 +22,19 @@
 source include/require
 source include/database
 
-if ! (check_sipp && check_openser); then
+if ! (check_sipp && check_kamailio); then
 	exit 0
 fi ;
 
 CFG="20.cfg"
-TMPFILE=`mktemp -t openser-test.XXXXXXXXXX`
+TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX`
 
 # add an registrar entry to the db;
 $MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:foo@localhost\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);"
 
 sipp -sn uas -bg -i localhost -m 1 -f 10 -p 5060 &> /dev/null
 
-../openser -w . -f $CFG &> $TMPFILE
+../kamailio -w . -f $CFG &> $TMPFILE
 
 sipp -sn uac -s foo 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 10 -p 5061 &> /dev/null
 
@@ -43,7 +43,7 @@ ret=$?
 
 # cleanup
 killall -9 sipp &> /dev/null
-killall -9 openser &> /dev/null
+killall -9 kamailio &> /dev/null
 rm $TMPFILE
 
 $MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo@localhost\") and (user_agent = \"ser_test\"));"

test/unit/21.cfg

@@ -1,8 +1,8 @@
 #
-# $Id: openser.cfg 2825 2007-09-27 09:05:52Z henningw $
+# $Id: kamailio.cfg 2825 2007-09-27 09:05:52Z henningw $
 #
 # simple quick-start config script
-# Please refer to the Core CookBook at http://www.openser.org/dokuwiki/doku.php
+# Please refer to the Core CookBook at http://www.kamailio.org/dokuwiki/doku.php
 # for a explanation of possible statements, functions and parameters.
 #
 
@@ -44,7 +44,7 @@ loadmodule "xlog/xlog.so"
 # Uncomment this if you want to use SQL database 
 # for persistent storage and comment the previous line
 modparam("usrloc", "db_mode", 3)
-modparam("usrloc", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("usrloc", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 
 # -- auth params --
 # Uncomment if you are using auth module

test/unit/21.sh

@@ -22,7 +22,7 @@
 source include/require
 source include/database
 
-if ! (check_sipp && check_openser); then
+if ! (check_sipp && check_kamailio); then
 	exit 0
 fi ;
 
@@ -32,7 +32,7 @@ CFG=21.cfg
 # add an registrar entry to the db;
 $MYSQL "INSERT INTO subscriber (username, domain, password, email_address) VALUES (\"alice\",\"localhost\",\"alice\",\"alice@localhost\");"
 
-../openser -w . -f $CFG &> /dev/null;
+../kamailio -w . -f $CFG &> /dev/null;
 ret=$?
 sleep 1
 
@@ -47,7 +47,7 @@ if [ "$ret" -eq 0 ] ; then
 fi;
 
 #cleanup
-killall -9 openser &> /dev/null;
+killall -9 kamailio &> /dev/null;
 killall -9 sipp &> /dev/null;
 $MYSQL "DELETE FROM subscriber WHERE((username = \"alice\") and (domain = \"localhost\"));"
 

test/unit/22.sh

@@ -21,7 +21,7 @@
 
 source include/require
 
-if ! (check_netcat && check_openser && check_module "db_postgres"); then
+if ! (check_netcat && check_kamailio && check_module "db_postgres"); then
 	exit 0
 fi ;
 
@@ -29,9 +29,9 @@ CFG=11.cfg
 
 cp $CFG $CFG.tmp
 echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
-echo "modparam(\"usrloc\", \"db_url\", \"postgres://openser:openserrw@localhost/openser\")" >> $CFG
+echo "modparam(\"usrloc\", \"db_url\", \"postgres://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
@@ -41,11 +41,11 @@ cat register.sip | nc -q 1 -u localhost 5060 > /dev/null
 cd ../scripts
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl ul show | grep "AOR:: 1000" > /dev/null
+	./kamailioctl ul show | grep "AOR:: 1000" > /dev/null
 	ret=$?
 fi ;
 
-TMP=`PGPASSWORD='openserro' psql -A -t -n -q -h localhost -U openserro openser -c "select COUNT(*) from location where username='1000';" | tail -n 1`
+TMP=`PGPASSWORD='kamailioro' psql -A -t -n -q -h localhost -U kamailioro kamailio -c "select COUNT(*) from location where username='1000';" | tail -n 1`
 if [ "$TMP" -eq 0 ] ; then
 	ret=1
 fi ;
@@ -54,7 +54,7 @@ fi ;
 cat ../test/unregister.sip | nc -q 1 -u localhost 5060 > /dev/null
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl ul show | grep "AOR:: 1000" > /dev/null
+	./kamailioctl ul show | grep "AOR:: 1000" > /dev/null
 	ret=$?
 	if [ "$ret" -eq 0 ] ; then
 		ret=1
@@ -63,9 +63,9 @@ if [ "$ret" -eq 0 ] ; then
 	fi ;
 fi ;
 
-ret=`PGPASSWORD='openserro' psql -A -t -n -q -h localhost -U openserro openser -c "select COUNT(*) from location where username='1000';" | tail -n 1`
+ret=`PGPASSWORD='kamailioro' psql -A -t -n -q -h localhost -U kamailioro kamailio -c "select COUNT(*) from location where username='1000';" | tail -n 1`
 
-killall -9 openser
+killall -9 kamailio
 
 cd ../test
 mv $CFG.tmp $CFG

test/unit/23.sh

@@ -21,7 +21,7 @@
 
 source include/require
 
-if ! (check_openser && check_module "carrierroute" && check_module "db_postgres"); then
+if ! (check_kamailio && check_module "carrierroute" && check_module "db_postgres"); then
 	exit 0
 fi ;
 
@@ -32,10 +32,10 @@ cp $CFG $CFG.bak
 # setup config
 echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
-echo "modparam(\"carrierroute\", \"db_url\", \"postgres://openserro:openserro@localhost/openser\")" >> $CFG
+echo "modparam(\"carrierroute\", \"db_url\", \"postgres://kamailioro:kamailioro@localhost/kamailio\")" >> $CFG
 
 # setup database
-PGPASSWORD='openserrw' psql -A -t -n -q -h localhost -U openser openser -c "insert into route_tree (id, carrier) values ('1', 'carrier1');
+PGPASSWORD='kamailiorw' psql -A -t -n -q -h localhost -U kamailio kamailio -c "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');
@@ -48,17 +48,17 @@ insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite
 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');"
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
 
 cd ../scripts
 
-TMPFILE=`mktemp -t openser-test.XXXXXXXXXX`
+TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX`
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl fifo cr_dump_routes > $TMPFILE
+	./kamailioctl fifo cr_dump_routes > $TMPFILE
 	ret=$?
 fi ;
 
@@ -86,10 +86,10 @@ Printing tree for domain 0
 	fi ;
 fi ;
 
-killall -9 openser
+killall -9 kamailio
 
 # cleanup database
-PGPASSWORD='openserrw' psql -A -t -n -q -h localhost -U openser openser -c "delete from route_tree where id = 1;
+PGPASSWORD='kamailiorw' psql -A -t -n -q -h localhost -U kamailio kamailio -c "delete from route_tree where id = 1;
 delete from route_tree where id = 2;
 delete from route_tree where id = 3;
 delete from carrierroute where carrier=1;

test/unit/24.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# creates a postgres database with openserdbctl and deletes it again
+# creates a postgres database with kamailiodbctl and deletes it again
 
 # Copyright (C) 2007 1&1 Internet AG
 #
@@ -27,30 +27,30 @@ if [ ! -f ~/.pgpass ] ; then
        exit 0
 fi ;
 
-tmp_name=""$RANDOM"_openserdb_tmp"
+tmp_name=""$RANDOM"_kamailiodb_tmp"
 
 cd ../scripts
 
 # setup config file
-cp openserctlrc openserctlrc.bak
-sed -i "s/# DBENGINE=MYSQL/DBENGINE=PGSQL/g" openserctlrc
-sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" openserctlrc
-sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" openserctlrc
+cp kamailioctlrc kamailioctlrc.bak
+sed -i "s/# DBENGINE=MYSQL/DBENGINE=PGSQL/g" kamailioctlrc
+sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" kamailioctlrc
+sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" kamailioctlrc
 
-cp openserdbctl openserdbctl.bak
-sed -i "s/TEST=\"false\"/TEST=\"true\"/g" openserdbctl
+cp kamailiodbctl kamailiodbctl.bak
+sed -i "s/TEST=\"false\"/TEST=\"true\"/g" kamailiodbctl
 
-./openserdbctl create $tmp_name &> /dev/null
+./kamailiodbctl create $tmp_name &> /dev/null
 ret=$?
 
 if [ "$ret" -eq 0 ] ; then
-	./openserdbctl drop $tmp_name &> /dev/null
+	./kamailiodbctl drop $tmp_name &> /dev/null
 	ret=$?
 fi ;
 
 # cleanup
-mv openserctlrc.bak openserctlrc
-mv openserdbctl.bak openserdbctl
+mv kamailioctlrc.bak kamailioctlrc
+mv kamailiodbctl.bak kamailiodbctl
 
 cd ../test
 exit $ret

test/unit/25.cfg

@@ -14,7 +14,7 @@ loadmodule "maxfwd/maxfwd.so"
 loadmodule "mi_fifo/mi_fifo.so"
 
 modparam("usrloc", "db_mode", 3)
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 
 route {
 	#xlog("user: $rU\n");

test/unit/25.sh

@@ -22,7 +22,7 @@
 source include/require
 source include/database
 
-if ! (check_sipp && check_openser); then
+if ! (check_sipp && check_kamailio); then
 	exit 0
 fi ;
 
@@ -56,7 +56,7 @@ $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('1'
 $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('','0','_test_');"
 
 
-../openser -w . -f $CFG &> /dev/null
+../kamailio -w . -f $CFG &> /dev/null
 sleep 1
 
 sipp -sn uas -bg -i localhost -p 5060 &> /dev/null
@@ -80,7 +80,7 @@ if [ "$ret" -eq 1 ] ; then
 fi;
 
 $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('123456786','1','_test_');"
-../scripts/openserctl fifo reload_blacklist
+../scripts/kamailioctl fifo reload_blacklist
 
 if [ "$ret" -eq 1 ] ; then
 	sipp -sn uac -s 49721123456786 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 2 -p 5061 &> /dev/null
@@ -100,7 +100,7 @@ if [ "$ret" -eq 1 ] ; then
 fi;
 
 $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('2','1','_test_');"
-../scripts/openserctl fifo reload_blacklist
+../scripts/kamailioctl fifo reload_blacklist
 
 if [ "$ret" -eq 1 ] ; then
 	sipp -sn uac -s 49721123456785 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 2 -p 5061 &> /dev/null
@@ -110,7 +110,7 @@ fi;
 
 # cleanup:
 killall -9 sipp > /dev/null 2>&1
-killall -9 openser > /dev/null 2>&1
+killall -9 kamailio > /dev/null 2>&1
 
 $MYSQL "delete from location where (user_agent = \"ser_test\");"
 $MYSQL "delete from userblacklist where username='49721123456786';"

test/unit/26.cfg

@@ -7,7 +7,7 @@ loadmodule "maxfwd/maxfwd.so"
 loadmodule "carrierroute/carrierroute.so"
 loadmodule "mi_fifo/mi_fifo.so"
 
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 
 avp_aliases="domain=s:10"
 avp_aliases="carrier=s:11"

test/unit/26.sh

@@ -22,7 +22,7 @@
 source include/require
 source include/database
 
-if ! (check_openser && check_module "carrierroute"); then
+if ! (check_kamailio && check_module "carrierroute"); then
 	exit 0
 fi ;
 
@@ -69,7 +69,7 @@ $MYSQL "insert into subscriber (username, cr_preferred_carrier) values ('4972112
 $MYSQL "insert into subscriber (username, cr_preferred_carrier) values ('49721123456785', 3);"
 
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 
 ret=$?
 
@@ -108,7 +108,7 @@ $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_n
 flags, mask, next_domain) values ('5', '3', 'fallback', '49', '127.0.0.1:10000', '486', '0', '0', '2');"
 
 if [ ! "$ret" -eq 0 ] ; then
-	../scripts/openserctl fifo cr_reload_routes
+	../scripts/kamailioctl fifo cr_reload_routes
 	killall sipp &> /dev/null
 	sipp -sf failure_route.xml -bg -i localhost -m 10 -p 10000 &> /dev/null
 	sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null
@@ -116,7 +116,7 @@ if [ ! "$ret" -eq 0 ] ; then
 fi;
 
 
-killall -9 openser
+killall -9 kamailio
 killall -9 sipp
 
 # cleanup database

test/unit/27.sh

@@ -22,7 +22,7 @@
 source include/require
 source include/database
 
-if ! (check_sipp && check_openser && check_module "db_mysql" \
+if ! (check_sipp && check_kamailio && check_module "db_mysql" \
 	&& check_module "presence" && check_module "presence_xml" \
 	&& check_mysql); then
 	exit 0
@@ -30,7 +30,7 @@ fi ;
 
 CFG=presence.cfg
 
-../openser -w . -f $CFG &> /dev/null;
+../kamailio -w . -f $CFG &> /dev/null;
 ret=$?
 sleep 1
 
@@ -47,7 +47,7 @@ fi;
 
 
 #cleanup:
-killall -9 openser &> /dev/null;
+killall -9 kamailio &> /dev/null;
 killall -9 sipp &> /dev/null;
 
 exit $ret;

test/unit/28.cfg

@@ -8,7 +8,7 @@ loadmodule "cpl-c.so"
 loadmodule "mi_fifo.so"
 loadmodule "textops.so"
 
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 modparam("cpl-c","cpl_dtd_file","../modules/cpl-c/cpl-06.dtd")
 
 route {

test/unit/28.sh

@@ -22,20 +22,20 @@
 source include/require
 source include/database
 
-if ! (check_sipp && check_openser && check_module "db_mysql" && check_module "cpl-c" && check_mysql); then
+if ! (check_sipp && check_kamailio && check_module "db_mysql" && check_module "cpl-c" && check_mysql); then
 	exit 0
 fi ;
 
 CFG=28.cfg
 CPL=cpl_ignore.xml
-TMPFILE=`mktemp -t openser-test.XXXXXXXXXX`
+TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX`
 
 
-../openser -w . -f $CFG &> /dev/null;
+../kamailio -w . -f $CFG &> /dev/null;
 ret=$?
 sleep 1
 
-../scripts/openserctl fifo LOAD_CPL sip:[email protected] $CPL
+../scripts/kamailioctl fifo LOAD_CPL sip:[email protected] $CPL
 
 if [ "$ret" -eq 0 ] ; then
 	sipp -m 1 -f 1 127.0.0.1:5060 -sf cpl_test.xml &> /dev/null;
@@ -43,14 +43,14 @@ if [ "$ret" -eq 0 ] ; then
 fi;
 
 if [ "$ret" -eq 0 ] ; then
-  ../scripts/openserctl fifo GET_CPL sip:[email protected] > $TMPFILE 
+  ../scripts/kamailioctl fifo GET_CPL sip:[email protected] > $TMPFILE 
   diff $TMPFILE $CPL 
   ret=$?
 fi; 
 
 if [ "$ret" -eq 0 ] ; then
-  ../scripts/openserctl fifo REMOVE_CPL sip:[email protected]
-  ../scripts/openserctl fifo GET_CPL sip:[email protected] > $TMPFILE
+  ../scripts/kamailioctl fifo REMOVE_CPL sip:[email protected]
+  ../scripts/kamailioctl fifo GET_CPL sip:[email protected] > $TMPFILE
 fi;
 
 diff $TMPFILE $CPL &> /dev/null;
@@ -61,7 +61,7 @@ if [ ! "$ret" -eq 0 ] ; then
 fi;
 
 #cleanup:
-killall -9 openser &> /dev/null;
+killall -9 kamailio &> /dev/null;
 killall -9 sipp &> /dev/null;
 rm $TMPFILE
 

test/unit/29.sh

@@ -21,24 +21,24 @@
 
 source include/require
 
-if ! (check_sipp && check_openser && check_module "db_postgres" && check_module "cpl-c"); then
+if ! (check_sipp && check_kamailio && check_module "db_postgres" && check_module "cpl-c"); then
 	exit 0
 fi ;
 
 CFG=28.cfg
 CPL=cpl_ignore.xml
-TMPFILE=`mktemp -t openser-test.XXXXXXXXXX`
+TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX`
 
 cp $CFG $CFG.tmp
 echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
-echo "modparam(\"cpl-c\", \"db_url\", \"postgres://openser:openserrw@localhost/openser\")" >> $CFG
+echo "modparam(\"cpl-c\", \"db_url\", \"postgres://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG
 
 
-../openser -w . -f $CFG &> /dev/null;
+../kamailio -w . -f $CFG &> /dev/null;
 ret=$?
 sleep 1
 
-../scripts/openserctl fifo LOAD_CPL sip:[email protected] $CPL
+../scripts/kamailioctl fifo LOAD_CPL sip:[email protected] $CPL
 
 if [ "$ret" -eq 0 ] ; then
 	sipp -m 1 -f 1 127.0.0.1:5060 -sf cpl_test.xml &> /dev/null;
@@ -46,14 +46,14 @@ if [ "$ret" -eq 0 ] ; then
 fi;
 
 if [ "$ret" -eq 0 ] ; then
-  ../scripts/openserctl fifo GET_CPL sip:[email protected] > $TMPFILE 
+  ../scripts/kamailioctl fifo GET_CPL sip:[email protected] > $TMPFILE 
   diff $TMPFILE $CPL 
   ret=$?
 fi; 
 
 if [ "$ret" -eq 0 ] ; then
-  ../scripts/openserctl fifo REMOVE_CPL sip:[email protected]
-  ../scripts/openserctl fifo GET_CPL sip:[email protected] > $TMPFILE
+  ../scripts/kamailioctl fifo REMOVE_CPL sip:[email protected]
+  ../scripts/kamailioctl fifo GET_CPL sip:[email protected] > $TMPFILE
 fi;
 
 diff $TMPFILE $CPL &> /dev/null;
@@ -64,7 +64,7 @@ if [ ! "$ret" -eq 0 ] ; then
 fi;
 
 #cleanup:
-killall -9 openser &> /dev/null;
+killall -9 kamailio &> /dev/null;
 killall -9 sipp &> /dev/null;
 rm $TMPFILE
 mv $CFG.tmp $CFG

test/unit/3.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# creates a mysql database with openserdbctl and deletes it again
+# creates a mysql database with kamailiodbctl and deletes it again
 
 # Copyright (C) 2007 1&1 Internet AG
 #
@@ -29,35 +29,35 @@ fi ;
 
 source dbrootpw
 
-tmp_name=""$RANDOM"_openserdb_tmp"
+tmp_name=""$RANDOM"_kamailiodb_tmp"
 
 cd ../scripts
 
 # setup config file
-cp openserctlrc openserctlrc.bak
-sed -i "s/# DBENGINE=MYSQL/DBENGINE=MYSQL/g" openserctlrc
-sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" openserctlrc
-sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" openserctlrc
+cp kamailioctlrc kamailioctlrc.bak
+sed -i "s/# DBENGINE=MYSQL/DBENGINE=MYSQL/g" kamailioctlrc
+sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" kamailioctlrc
+sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" kamailioctlrc
 
-cp openserdbctl openserdbctl.bak
-sed -i "s/TEST=\"false\"/TEST=\"true\"/g" openserdbctl
+cp kamailiodbctl kamailiodbctl.bak
+sed -i "s/TEST=\"false\"/TEST=\"true\"/g" kamailiodbctl
 
 # set the mysql root password
-cp openserdbctl.mysql openserdbctl.mysql.bak
-sed -i "s/#PW=""/PW="$PW"/g" openserdbctl.mysql
+cp kamailiodbctl.mysql kamailiodbctl.mysql.bak
+sed -i "s/#PW=""/PW="$PW"/g" kamailiodbctl.mysql
 
-./openserdbctl create $tmp_name > /dev/null
+./kamailiodbctl create $tmp_name > /dev/null
 ret=$?
 
 if [ "$ret" -eq 0 ] ; then
-	./openserdbctl drop $tmp_name > /dev/null
+	./kamailiodbctl drop $tmp_name > /dev/null
 	ret=$?
 fi ;
 
 # cleanup
-mv openserctlrc.bak openserctlrc
-mv openserdbctl.mysql.bak openserdbctl.mysql
-mv openserdbctl.bak openserdbctl
+mv kamailioctlrc.bak kamailioctlrc
+mv kamailiodbctl.mysql.bak kamailiodbctl.mysql
+mv kamailiodbctl.bak kamailiodbctl
 
 cd ../test
 exit $ret

test/unit/30.sh

@@ -21,7 +21,7 @@
 
 source include/require
 
-if ! (check_sipp && check_openser && check_module "carrierroute"); then
+if ! (check_sipp && check_kamailio && check_module "carrierroute"); then
 	exit 0
 fi ;
 
@@ -34,7 +34,7 @@ cp $CFG $CFG.bak
 echo "modparam(\"carrierroute\", \"config_file\", \"`pwd`/../test/carrierroute-2.cfg\")" >> $CFG
 
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 
 ret=$?
 
@@ -61,7 +61,7 @@ if [ "$ret" -eq 0 ] ; then
 	ret=$?
 fi;
 
-killall -9 openser
+killall -9 kamailio
 killall -9 sipp
 
 cd ../test

test/unit/31.sh

@@ -22,7 +22,7 @@
 source include/require
 source include/database
 
-if ! (check_openser && check_module "db_mysql" && check_mysql); then
+if ! (check_kamailio && check_module "db_mysql" && check_mysql); then
 	exit 0
 fi ;
 
@@ -41,11 +41,11 @@ while [  $COUNTER -lt 139 ]; do
 	$MYSQL "insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER', '$DOMAIN', 'foobar-$COUNTER@$DOMAIN', '___test___');"
 done
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
-killall -9 openser
+killall -9 kamailio
 
 $MYSQL "delete from location where user_agent = '___test___'"
 

test/unit/32.sh

@@ -21,7 +21,7 @@
 
 source include/require
 
-if ! (check_sipp && check_openser && check_module "db_postgres"); then
+if ! (check_sipp && check_kamailio && check_module "db_postgres"); then
 	exit 0
 fi ;
 
@@ -30,7 +30,7 @@ CFG=11.cfg
 cp $CFG $CFG.bak
 
 echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
-echo "modparam(\"usrloc\", \"db_url\", \"postgres://openser:openserrw@localhost/openser\")" >> $CFG
+echo "modparam(\"usrloc\", \"db_url\", \"postgres://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG
 echo "modparam(\"usrloc\", \"fetch_rows\", 13)" >> $CFG
 
 DOMAIN="local"
@@ -38,16 +38,16 @@ DOMAIN="local"
 COUNTER=0
 while [  $COUNTER -lt 139 ]; do
 	COUNTER=$(($COUNTER+1))
-	PGPASSWORD='openserrw' psql -A -t -n -q -h localhost -U openser openser -c "insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER', '$DOMAIN', 'foobar-$COUNTER@$DOMAIN', '___test___');"
+	PGPASSWORD='kamailiorw' psql -A -t -n -q -h localhost -U kamailio kamailio -c "insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER', '$DOMAIN', 'foobar-$COUNTER@$DOMAIN', '___test___');"
 done
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
-killall -9 openser
+killall -9 kamailio
 
-PGPASSWORD='openserrw' psql -A -t -n -q -h localhost -U openser openser -c "delete from location where user_agent = '___test___'"
+PGPASSWORD='kamailiorw' psql -A -t -n -q -h localhost -U kamailio kamailio -c "delete from location where user_agent = '___test___'"
 
 mv $CFG.bak $CFG
 

test/unit/33.cfg

@@ -5,7 +5,7 @@ loadmodule "cfgutils.so"
 loadmodule "xlog.so"
 loadmodule "mi_fifo/mi_fifo.so"
 
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 
 modparam("cfgutils", "initial_probability", 15)
 modparam("cfgutils", "hash_file", "33.cfg")

test/unit/33.sh

@@ -21,7 +21,7 @@
 
 source include/require
 
-if ! (check_netcat && check_openser); then
+if ! (check_netcat && check_kamailio); then
 	exit 0
 fi;
 
@@ -34,19 +34,19 @@ CFG=33.cfg
 
 cp $CFG $CFG.bak
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
 
 if [ $ret -eq 0 ] ; then
-	../scripts/openserctl fifo check_config_hash |grep "The actual config file hash is identical to the stored one." > /dev/null
+	../scripts/kamailioctl fifo check_config_hash |grep "The actual config file hash is identical to the stored one." > /dev/null
 	ret=$?
 fi;
 
 echo " " >> $CFG
 if [ $ret -eq 0 ] ; then
-	../scripts/openserctl fifo check_config_hash |grep "The actual config file hash is identical to the stored one." /dev/null
+	../scripts/kamailioctl fifo check_config_hash |grep "The actual config file hash is identical to the stored one." /dev/null
 	ret=$?
 fi;
 
@@ -56,7 +56,7 @@ if [ ! $ret -eq 0 ] ; then
 fi;
 
 sleep 1
-killall -9 openser &> /dev/null
+killall -9 kamailio &> /dev/null
 ret=$?
 
 if [ $ret -eq 0 ] ; then

test/unit/34.sh

@@ -19,14 +19,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-# Needs a default openser database setup for mysql
+# Needs a default kamailio database setup for mysql
 
 source include/require
 source include/database
 
 CFG=34.cfg
 
-if ! (check_openser && check_module "db_mysql" && check_module "presence" \
+if ! (check_kamailio && check_module "db_mysql" && check_module "presence" \
 		&& check_module "presence_xml" && check_module "pua" \
 		&& check_module "xcap_client" && check_module "rls" \
 		&& check_module "presence_mwi" && check_module "pua_bla" \
@@ -40,11 +40,11 @@ cp $CFG $CFG.bak
 echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 
 # start
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
-killall -9 openser
+killall -9 kamailio
 
 mv $CFG.bak $CFG
 

test/unit/35.cfg

@@ -1,4 +1,4 @@
-# OpenSER config for lookup / registrar testing
+# Kamailio config for lookup / registrar testing
 
 #------------------------Global configuration----------------------------------
 debug=3
@@ -23,9 +23,9 @@ loadmodule "xlog/xlog.so"
 
 
 #-----------------------Module parameters-------------------------------------
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 modparam("usrloc", "db_mode", 3)
-modparam("usrloc|permissions", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("usrloc|permissions", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 
 #-----------------------Routing configuration---------------------------------#
 route{

test/unit/35.sh

@@ -22,7 +22,7 @@
 source include/require
 source include/database
 
-if ! (check_sipp && check_openser); then
+if ! (check_sipp && check_kamailio); then
 	exit 0
 fi ;
 
@@ -39,7 +39,7 @@ $MYSQL "INSERT INTO trusted (src_ip, proto) VALUES (\"127.0.0.1\",\"any\");"
 
 $MYSQL "INSERT INTO address (ip_addr, mask) VALUES ('$IP', '$MASK');"
 
-../openser -w . -f $CFG &> /dev/null
+../kamailio -w . -f $CFG &> /dev/null
 sipp -sn uas -bg -i localhost -m 10 -f 2 -p $UAS &> /dev/null
 sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 10 -f 2 -p $UAC &> /dev/null
 ret=$?
@@ -51,8 +51,8 @@ if [ "$ret" -eq 0 ] ; then
 	MASK=10
 	$MYSQL "INSERT INTO address (ip_addr, mask) VALUES ('$IP', '$MASK');"
 	
-	../scripts/openserctl fifo address_reload
-	#../scripts/openserctl fifo address_dump
+	../scripts/kamailioctl fifo address_reload
+	#../scripts/kamailioctl fifo address_dump
 
 	sipp -sn uas -bg -i localhost -m 10 -f 2 -p $UAS &> /dev/null
 	sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 10 -f 2 -p $UAC &> /dev/null
@@ -63,7 +63,7 @@ fi;
 
 # cleanup
 killall -9 sipp > /dev/null 2>&1
-killall -9 openser > /dev/null 2>&1
+killall -9 kamailio > /dev/null 2>&1
 
 $MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo@localhost:$UAS\") and (user_agent = \"ser_test\"));"
 $MYSQL "DELETE FROM trusted WHERE (src_ip=\"127.0.0.1\");"

test/unit/4.sh

@@ -23,22 +23,22 @@ CFG=4.cfg
 
 # setup config
 echo -e "loadmodule \"../modules/mi_fifo/mi_fifo.so\"" > $CFG
-echo -e "modparam(\"mi_fifo\", \"fifo_name\", \"/tmp/openser_fifo\")" >> $CFG
+echo -e "modparam(\"mi_fifo\", \"fifo_name\", \"/tmp/kamailio_fifo\")" >> $CFG
 
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 cd ../scripts
 
 if [ "$ret" -eq 0 ] ; then
 	sleep 1
-	./openserctl ps > /dev/null
+	./kamailioctl ps > /dev/null
 	ret=$?
 fi ;
 
 cd ../test
 
-killall -9 openser
+killall -9 kamailio
 
 rm -f $CFG
 

test/unit/5.cfg

@@ -1,10 +1,10 @@
 #
 # $Id$
 #
-# OpenSER basic configuration script
+# Kamailio basic configuration script
 #     by Anca Vamanu <[email protected]>
 #
-# Please refer to the Core CookBook at http://www.openser.org/dokuwiki/doku.php
+# Please refer to the Core CookBook at http://www.kamailio.org/dokuwiki/doku.php
 # for a explanation of possible statements, functions and parameters.
 #
 
@@ -45,14 +45,14 @@ children=4
 #tls_verify_client = 1
 #tls_require_client_certificate = 0
 #tls_method = TLSv1
-#tls_certificate = "/usr/local/etc/openser/tls/user/user-cert.pem"
-#tls_private_key = "/usr/local/etc/openser/tls/user/user-privkey.pem"
-#tls_ca_list = "/usr/local/etc/openser/tls/user/user-calist.pem"
+#tls_certificate = "/usr/local/etc/kamailio/tls/user/user-cert.pem"
+#tls_private_key = "/usr/local/etc/kamailio/tls/user/user-privkey.pem"
+#tls_ca_list = "/usr/local/etc/kamailio/tls/user/user-calist.pem"
 
 
 port=5060
 
-/* uncomment and configure the following line if you want openser to 
+/* uncomment and configure the following line if you want kamailio to 
    bind on a specific interface/port/proto (default bind on all available) */
 #listen=udp:192.168.1.2:5060
 
@@ -99,7 +99,7 @@ loadmodule "acc/acc.so"
 
 
 # ----- mi_fifo params -----
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 
 
 # ----- rr params -----
@@ -148,7 +148,7 @@ modparam("usrloc", "db_mode",   0)
    for location entries */
 #modparam("usrloc", "db_mode",   2)
 #modparam("usrloc", "db_url",
-#	"mysql://openser:openser[email protected]/openser_1_3")
+#	"mysql://kamailio:kamaili[email protected]/kamailio_1_3")
 
 
 # ----- auth_db params -----
@@ -157,7 +157,7 @@ modparam("usrloc", "db_mode",   0)
 #modparam("auth_db", "calculate_ha1", yes)
 #modparam("auth_db", "password_column", "password")
 #modparam("auth_db", "db_url",
-#	"mysql://openser:openser[email protected]/openser_1_3")
+#	"mysql://kamailio:kamaili[email protected]/kamailio_1_3")
 #modparam("auth_db", "load_credentials", "")
 
 
@@ -165,14 +165,14 @@ modparam("usrloc", "db_mode",   0)
 /* uncomment the following lines if you want to enable the DB based
    aliases */
 #modparam("alias_db", "db_url",
-#	"mysql://openser:openser[email protected]/openser_1_3")
+#	"mysql://kamailio:kamaili[email protected]/kamailio_1_3")
 
 
 # ----- domain params -----
 /* uncomment the following lines to enable multi-domain detection
    support */
 #modparam("domain", "db_url",
-#	"mysql://openser:openser[email protected]/openser_1_3")
+#	"mysql://kamailio:kamaili[email protected]/kamailio_1_3")
 #modparam("domain", "db_mode", 1)   # Use caching
 
 
@@ -185,7 +185,7 @@ modparam("usrloc", "db_mode",   0)
 # ----- presence params -----
 /* uncomment the following lines if you want to enable presence */
 #modparam("presence|presence_xml", "db_url",
-#	"mysql://openser:openser[email protected]/openser_1_3")
+#	"mysql://kamailio:kamaili[email protected]/kamailio_1_3")
 #modparam("presence_xml", "force_active", 1)
 #modparam("presence", "server_address", "sip:192.168.1.2:5060")
 

test/unit/5.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# loads the openser default config
+# loads the kamailio default config
 
 # Copyright (C) 2007 1&1 Internet AG
 #
@@ -19,15 +19,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-# Needs a default openser database setup for mysql
+# Needs a default kamailio database setup for mysql
 
 CFG=5.cfg
 
 # start
-../openser -w . -f $CFG &> /dev/null
+../kamailio -w . -f $CFG &> /dev/null
 ret=$?
 
 sleep 1
-killall -9 openser
+killall -9 kamailio
 
 exit $ret

test/unit/6.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# checks a configuration with 'openser -c' and 'openser -C'
+# checks a configuration with 'kamailio -c' and 'kamailio -C'
 
 # Copyright (C) 2007 1&1 Internet AG
 #
@@ -22,11 +22,11 @@
 CFG=2.cfg
 
 # start
-../openser -w . -c -f $CFG > /dev/null 2>&1
+../kamailio -w . -c -f $CFG > /dev/null 2>&1
 ret=$?
 
 if [ "$ret" -eq 0 ] ; then
-	../openser -C -f $CFG > /dev/null 2>&1
+	../kamailio -C -f $CFG > /dev/null 2>&1
 	ret=$?
 fi ;
 

test/unit/7.cfg

@@ -1,7 +1,7 @@
 ########################################################################
 # This configuration is autogenerated by sip:wizard
 # (http://www.sipwise.com/wizard) on Fri Nov 09 17:06:52 +0100 2007
-# for OpenSER 1.2
+# for Kamailio 1.2
 #
 # Copyright (C) 2007 Sipwise ([email protected])
 ########################################################################
@@ -29,7 +29,7 @@
 #
 # base:
 #    You have to insert all locally served domains (i.e. 
-#    "openserctl domain add your.domain.com").
+#    "kamailioctl domain add your.domain.com").
 #    
 # nat-mediaproxy:
 #    You have to install mediaproxy 
@@ -50,9 +50,9 @@
 #    caller-uuid for such calls.
 #    
 # offnet-pstn:
-#    You have to add a routing entry for lcr (i.e. "openserctl  lcr 
+#    You have to add a routing entry for lcr (i.e. "kamailioctl  lcr 
 #    addroute '' '' 1 1"). Additionally, you have to add your gateways 
-#    (i.e. "openserctl lcr addgw my-test-gw 1.2.3.4 5060 sip udp 1").
+#    (i.e. "kamailioctl lcr addgw my-test-gw 1.2.3.4 5060 sip udp 1").
 #    
 # ring-timeout:
 #    You have to provision the ring-timeout (AVP ringtimeout as 
@@ -76,7 +76,7 @@
 #    same domain or to other domains are possible.
 #    
 # user-aliases:
-#    You have to add aliases for your users (i.e. "openserctl alias 
+#    You have to add aliases for your users (i.e. "kamailioctl alias 
 #    add 01234567 sip:[email protected]" for usrloc-based aliases or 
 #    make entries into "dbaliases" table for db-based aliases)
 #    
@@ -139,7 +139,7 @@ modparam("usrloc", "socket_column", "socket")
 modparam("usrloc", "use_domain", 0)
 modparam("usrloc", "desc_time_order", 0)
 modparam("usrloc", "timer_interval", 60)
-modparam("usrloc", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("usrloc", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 modparam("usrloc", "db_mode", 1)
 modparam("usrloc", "matching_mode", 0)
 modparam("usrloc", "cseq_delay", 20)
@@ -171,12 +171,12 @@ modparam("xlog", "buf_size", 4096)
 modparam("xlog", "force_color", 0)
 
 loadmodule "mi_fifo/mi_fifo.so"
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 modparam("mi_fifo", "reply_dir", "/tmp/")
 modparam("mi_fifo", "reply_indent", "\t")
 
 loadmodule "domain/domain.so"
-modparam("domain", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("domain", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 modparam("domain", "db_mode", 1)
 modparam("domain", "domain_table", "domain")
 modparam("domain", "domain_col", "domain")
@@ -226,7 +226,7 @@ modparam("auth", "rpid_suffix", ";party=calling;id-type=subscriber;screen=yes")
 modparam("auth", "rpid_avp", "$avp(s:rpid)")
 
 loadmodule "auth_db/auth_db.so"
-modparam("auth_db", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("auth_db", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 modparam("auth_db", "user_column", "username")
 modparam("auth_db", "domain_column", "domain")
 modparam("auth_db", "password_column", "password")
@@ -236,13 +236,13 @@ modparam("auth_db", "use_domain", 0)
 modparam("auth_db", "load_credentials", "$avp(s:caller_uuid)=uuid")
 
 loadmodule "uri_db/uri_db.so"
-modparam("uri_db", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("uri_db", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 modparam("uri_db", "db_table", "subscriber")
 modparam("uri_db", "use_uri_table", 0)
 modparam("uri_db", "use_domain", 0)
 
 loadmodule "avpops/avpops.so"
-modparam("avpops", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("avpops", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 modparam("avpops", "avp_table", "usr_preferences")
 modparam("avpops", "use_domain", 0)
 modparam("avpops", "uuid_column", "uuid")
@@ -261,7 +261,7 @@ modparam("permissions", "default_deny_file", "permissions.deny")
 modparam("permissions", "check_all_branches", 1)
 modparam("permissions", "allow_suffix", ".allow")
 modparam("permissions", "deny_suffix", ".deny")
-modparam("permissions", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("permissions", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 modparam("permissions", "db_mode", 1)
 modparam("permissions", "trusted_table", "trusted")
 modparam("permissions", "source_col", "src_ip")
@@ -271,7 +271,7 @@ modparam("permissions", "tag_col", "tag")
 modparam("permissions", "peer_tag_avp", "$avp(s:peer_uuid)")
 
 loadmodule "lcr/lcr.so"
-modparam("lcr", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("lcr", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 modparam("lcr", "gw_table", "gw")
 modparam("lcr", "gw_name_column", "gw_name")
 modparam("lcr", "ip_addr_column", "ip_addr")
@@ -299,7 +299,7 @@ modparam("uac_redirect", "acc_function", "acc_log_request")
 modparam("uac_redirect", "acc_db_table", "acc")
 
 loadmodule "alias_db/alias_db.so"
-modparam("alias_db", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("alias_db", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 modparam("alias_db", "user_column", "username")
 modparam("alias_db", "domain_column", "domain")
 modparam("alias_db", "alias_user_column", "alias_username")
@@ -323,7 +323,7 @@ modparam("acc", "db_flag", 25)
 modparam("acc", "db_missed_flag", 0)
 modparam("acc", "db_table_acc", "acc")
 modparam("acc", "db_table_missed_calls", "missed_calls")
-modparam("acc", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("acc", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
 modparam("acc", "acc_method_column", "method")
 modparam("acc", "acc_callid_column", "callid")
 modparam("acc", "acc_time_column", "time")

test/unit/7.sh

@@ -21,15 +21,15 @@
 
 # config generated by sipwise wizard
 
-# Needs a default openser database setup for mysql
+# Needs a default kamailio database setup for mysql
 
 CFG=7.cfg
 
 # start
-../openser -w . -f $CFG > /dev/null
+../kamailio -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
-killall -9 openser
+killall -9 kamailio
 
 exit $ret

test/unit/8.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# creates a dbtext database with openserdbctl and deletes it again
+# creates a dbtext database with kamailiodbctl and deletes it again
 
 # Copyright (C) 2007 1&1 Internet AG
 #
@@ -19,30 +19,30 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-tmp_name=""$RANDOM"_openserdb_tmp"
+tmp_name=""$RANDOM"_kamailiodb_tmp"
 
 cd ../scripts
 
 # setup config file
-cp openserctlrc openserctlrc.bak
-sed -i "s/# DBENGINE=MYSQL/DBENGINE=DBTEXT/g" openserctlrc
-sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" openserctlrc
-sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" openserctlrc
+cp kamailioctlrc kamailioctlrc.bak
+sed -i "s/# DBENGINE=MYSQL/DBENGINE=DBTEXT/g" kamailioctlrc
+sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" kamailioctlrc
+sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" kamailioctlrc
 
-cp openserdbctl openserdbctl.bak
-sed -i "s/TEST=\"false\"/TEST=\"true\"/g" openserdbctl
+cp kamailiodbctl kamailiodbctl.bak
+sed -i "s/TEST=\"false\"/TEST=\"true\"/g" kamailiodbctl
 
-./openserdbctl create $tmp_name > /dev/null
+./kamailiodbctl create $tmp_name > /dev/null
 ret=$?
 
 if [ "$ret" -eq 0 ] ; then
-	./openserdbctl drop $tmp_name > /dev/null
+	./kamailiodbctl drop $tmp_name > /dev/null
 	ret=$?
 fi ;
 
 # cleanup
-mv openserctlrc.bak openserctlrc
-mv openserdbctl.bak openserdbctl
+mv kamailioctlrc.bak kamailioctlrc
+mv kamailiodbctl.bak kamailiodbctl
 
 
 cd ../test

test/unit/9.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# test basic db related openserctl functionality for mysql
+# test basic db related kamailioctl functionality for mysql
 
 # Copyright (C) 2007 1&1 Internet AG
 #
@@ -22,28 +22,28 @@
 cd ../scripts
 
 # setup config file
-cp openserctlrc openserctlrc.bak
-cp openserctl openserctl.bak
-sed -i "s/# DBENGINE=MYSQL/DBENGINE=MYSQL/g" openserctlrc
-sed -i "s/TEST=\"false\"/TEST=\"true\"/g" openserctl
+cp kamailioctlrc kamailioctlrc.bak
+cp kamailioctl kamailioctl.bak
+sed -i "s/# DBENGINE=MYSQL/DBENGINE=MYSQL/g" kamailioctlrc
+sed -i "s/TEST=\"false\"/TEST=\"true\"/g" kamailioctl
 
-./openserctl avp list > /dev/null
+./kamailioctl avp list > /dev/null
 
 ret=$?
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl domain showdb > /dev/null
+	./kamailioctl domain showdb > /dev/null
 	ret=$?
 fi ;
 
 if [ "$ret" -eq 0 ] ; then
-	./openserctl lcr show > /dev/null
+	./kamailioctl lcr show > /dev/null
 	ret=$?
 fi ;
 
 # cleanup
-mv openserctlrc.bak openserctlrc
-mv openserctl.bak openserctl
+mv kamailioctlrc.bak kamailioctlrc
+mv kamailioctl.bak kamailioctl
 
 cd ../test
 exit $ret

test/unit/include/database

@@ -1,13 +1,13 @@
 # Copyright (C) 2008 1&1 Internet AG
 #
-# This file is part of openser, a free SIP server.
+# This file is part of kamailio, a free SIP server.
 #
-# openser is free software; you can redistribute it and/or modify
+# kamailio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version
 #
-# openser is distributed in the hope that it will be useful,
+# kamailio is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-MYSQL="mysql openser --show-warnings --batch --user=openser --password=openserrw -e"
+MYSQL="mysql kamailio --show-warnings --batch --user=kamailio --password=kamailiorw -e"
 
 function check_mysql() {
 	$MYSQL "select * from location;"

test/unit/include/require

@@ -1,13 +1,13 @@
 # Copyright (C) 2008 1&1 Internet AG
 #
-# This file is part of openser, a free SIP server.
+# This file is part of kamailio, a free SIP server.
 #
-# openser is free software; you can redistribute it and/or modify
+# kamailio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version
 #
-# openser is distributed in the hope that it will be useful,
+# kamailio is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
@@ -16,9 +16,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-function check_openser() {
-	if ! (test -e ../openser) ; then
-		echo "openser not found, not run"
+function check_kamailio() {
+	if ! (test -e ../kamailio) ; then
+		echo "kamailio not found, not run"
 		return -1
 	fi;
 	return 0

test/unit/presence.cfg

@@ -40,13 +40,13 @@ loadmodule "mi_fifo/mi_fifo.so"
 modparam("rr", "enable_full_lr", 1)
  
 # -- presence params --
-modparam("presence|presence_xml", "db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("presence|presence_xml", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio")
  
 modparam("presence_xml", "force_active", 1)
  
 modparam("presence", "server_address", "sip:10.10.10.10:5060")
 
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo_presence")
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo_presence")
  
 # -------------------------  request routing logic -------------------