@@ -1663,9 +1663,9 @@ dialplan() {

 #

 ##### ------------------------------------------------ #####

-### openser_start

+### kamailio_start

 #

-openser_start() {

+kamailio_start() {

 	echo

 	minfo "Starting Kamailio : "

 	if [ -r $PID_FILE ] ; then

@@ -1697,9 +1697,9 @@ openser_start() {

 #

 ##### ------------------------------------------------ #####

-### openser_stop

+### kamailio_stop

 #

-openser_stop() {

+kamailio_stop() {

 	echo

 	minfo "Stopping Kamailio : "

 	if [ -r $PID_FILE ] ; then

@@ -1912,7 +1912,7 @@ $SD_TABLE $CLAUSE ; "

 			# { 

 			#	  if(line==0) print "##  SIP-ID    \tNew-URI   \tDescritpion\n";

 			#	  else {

-			#		  ORS_BAK=ORS;usage_openser_monitor() {

+			#		  ORS_BAK=ORS;usage_kamailio_monitor() {

 			#		  ORS="";

 			#		  print line ") " $1 "@" $2 "\t" $3 "\t\"" $4;

 			#		  for (i=5;i<=NF;++i) print FS $i;

@@ -2516,7 +2516,7 @@ case $1 in

 	monitor|console|moni|con)

 		require_ctlengine

-		$OPENSER_MONITOR "$@"

+		$KAMAILIO_MONITOR "$@"

 		;;

 	online)

@@ -2556,9 +2556,9 @@ case $1 in

 		;;

 	restart)

-		openser_stop

+		kamailio_stop

 		sleep 2

-		openser_start

+		kamailio_start

 		;;

 	rpid)

@@ -2575,11 +2575,11 @@ case $1 in

 		;;

 	start)

-		openser_start

+		kamailio_start

 		;;

 	stop)

-		openser_stop

+		kamailio_stop

 		;;

 	version)

@@ -42,7 +42,7 @@ EOF

 }

 USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_online"

-usage_openser_monitor() {

+usage_kamailio_monitor() {

 	echo

 	mecho " -- command 'monitor' - show internal status"

 	echo

@@ -50,7 +50,7 @@ cat <<EOF

  monitor ............................ show server's internal status

 EOF

 }

-USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_openser_monitor"

+USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_kamailio_monitor"

 usage_ping() {

 	echo

@@ -15,7 +15,7 @@ fi

 #===================================================================

-openser_bdb() {

+kamailio_bdb() {

 case $1 in

 	reload)

 		shift

@@ -51,7 +51,7 @@ fifo_cmd()

 		merr "fifo_cmd must take at least command name as parameter"

 		exit 1

 	fi

-	name=openser_receiver_$$

+	name=kamailio_receiver_$$

 	path=$CHROOT_DIR/tmp/$name

 	if [ ! -w $OSER_FIFO ]; then

 		merr "Error opening Kamailio's FIFO $OSER_FIFO"

@@ -99,8 +99,8 @@ fifo_cmd()

 CTLCMD=fifo_cmd

-fifo_openser_monitor() {

-	name=openser_receiver_$$

+fifo_kamailio_monitor() {

+	name=kamailio_receiver_$$

 	path=$CHROOT_DIR/tmp/$name

 	if [ ! -w $OSER_FIFO ]; then

 		merr "Error opening Kamailio's FIFO $OSER_FIFO"

@@ -188,5 +188,5 @@ EOF

 	exit 0

 }

-OPENSER_MONITOR=fifo_openser_monitor

+KAMAILIO_MONITOR=fifo_kamailio_monitor

@@ -43,11 +43,11 @@ if [ -z "$SQLPLUS" ] ; then

 	export SQLPLUS

 fi

-if [ -z "$OPENSER_ORASEL" ] ; then

+if [ -z "$KAMAILIO_ORASEL" ] ; then

 	locate_tool kamailio_orasel

 	if [ -n "$TOOLPATH" ] ; then

-		OPENSER_ORASEL="$TOOLPATH"

-		export OPENSER_ORASEL

+		KAMAILIO_ORASEL="$TOOLPATH"

+		export KAMAILIO_ORASEL

 	fi

 fi

@@ -76,7 +76,7 @@ oracle_query() {

 oracle_ro_query() {

 	# if password not yet queried, query it now

 	prompt_oracle_pw ro

-	if [ -z "$OPENSER_ORASEL" ]; then

+	if [ -z "$KAMAILIO_ORASEL" ]; then

 		mdbg "oracle_ro_query: $SQLPLUS $2 -S -L -R 3 $DBROUSER@$DBNAME '$1'"

 		RC=`echo "$SESSOPT $1" | $SQLPLUS $2 -S -L -R 3 ${DBROUSER}/${DBROPW}@${DBNAME}`

 		RE=$?

@@ -91,8 +91,8 @@ oracle_ro_query() {

 		fi

 		return $RE

 	else

-		mdbg "oracle_ro_query: $OPENSER_ORASEL $DBROUSER@$DBNAME $2 -N -e '$1'"

-		$OPENSER_ORASEL ${DBROUSER}/${DBROPW}@${DBNAME} $2 -Ne "$1"

+		mdbg "oracle_ro_query: $KAMAILIO_ORASEL $DBROUSER@$DBNAME $2 -N -e '$1'"

+		$KAMAILIO_ORASEL ${DBROUSER}/${DBROPW}@${DBNAME} $2 -Ne "$1"

 		return $?

 	fi

 }

@@ -100,6 +100,6 @@ oracle_ro_query() {

 DBCMD=oracle_query

 DBROCMD=oracle_ro_query

 DBRAWPARAMS=""

-if [ -n "$OPENSER_ORASEL" ]; then

+if [ -n "$KAMAILIO_ORASEL" ]; then

 DBRAWPARAMS="-B"

 fi

@@ -88,7 +88,7 @@ ser_mi_monitor() {

 	exit 0

 }

-OPENSER_MONITOR=ser_mi_monitor

+KAMAILIO_MONITOR=ser_mi_monitor

@@ -71,7 +71,7 @@ unixsock_cmd()

 CTLCMD=unixsock_cmd

-unixsock_openser_monitor() {

+unixsock_kamailio_monitor() {

 		attempt=0

 		if [ "$2" == "" ]; then

 		    loops=-1;

@@ -114,5 +114,5 @@ unixsock_openser_monitor() {

 }

-OPENSER_MONITOR=unixsock_openser_monitor

+KAMAILIO_MONITOR=unixsock_kamailio_monitor

@@ -135,7 +135,7 @@

 ## in the subscriber table - default '1'

 # STORE_PLAINTEXT_PW=0

-## OPENSER START Options

+## Kamailio START Options

 ## PID file path - default is: /var/run/kamailio.pid

 # PID_FILE=/var/run/kamailio.pid

@@ -128,10 +128,10 @@ fi

 # dump all rows

-openser_dump()  # pars: <database name>

+kamailio_dump()  # pars: <database name>

 {

 	if [ $# -ne 2 ] ; then

-		merr "openser_dump function takes two param"

+		merr "kamailio_dump function takes two param"

 		exit 1

 	fi

 	if [ "$USED_DBENGINE" == "oracle" ]; then

@@ -149,10 +149,10 @@ openser_dump()  # pars: <database name>

 }

-openser_restore() #pars: <database name> <filename>

+kamailio_restore() #pars: <database name> <filename>

 {

 	if [ $# -ne 2 ] ; then

-		merr "openser_restore function takes two params"

+		merr "kamailio_restore function takes two params"

 		exit 1

 	fi

 	if [ "$USED_DBENGINE" == "oracle" ]; then

@@ -181,7 +181,7 @@ case $1 in

 		# create new database

 		minfo "Creating new Database $3...."

 		NO_USER_INIT="yes"

-		openser_create $3

+		kamailio_create $3

 		if [ "$?" -ne 0 ] ; then

 			echo "migrate: creating new database failed"

 			exit 1

@@ -208,20 +208,20 @@ case $1 in

 			exit $?

 		fi

 		tmp_file=`mktemp /tmp/kamdbctl.XXXXXXXXXX` || exit 1

-		openser_dump $DBNAME $tmp_file

+		kamailio_dump $DBNAME $tmp_file

 		ret=$?

 		if [ "$ret" -ne 0 ]; then

 			rm $tmp_file

 			exit $ret

 		fi

 		NO_USER_INIT="yes"

-		openser_create $1

+		kamailio_create $1

 		ret=$?

 		if [ "$ret" -ne 0 ]; then

 			rm $tmp_file

 			exit $ret

 		fi

-		openser_restore $1 $tmp_file

+		kamailio_restore $1 $tmp_file

 		ret=$?

 		rm -f $tmp_file

 		exit $ret

@@ -237,7 +237,7 @@ case $1 in

 			usage

 			exit 1

 		fi

-		openser_dump $DBNAME $1

+		kamailio_dump $DBNAME $1

 		exit $?

 		;;

 	restore)

@@ -251,7 +251,7 @@ case $1 in

 			usage

 			exit 1

 		fi

-		openser_restore $DBNAME $1

+		kamailio_restore $DBNAME $1

 		exit $?

 		;;

 	create)

@@ -261,7 +261,7 @@ case $1 in

 			DBNAME="$1"

 		fi

-		openser_create $DBNAME

+		kamailio_create $DBNAME

 		exit $?

 		;;

 	presence)

@@ -273,14 +273,14 @@ case $1 in

 		exit $?

 		;;

 	drop)

-		# delete openser database

+		# delete kamailio database

 		# create new database structures

 		shift

 		if [ $# -eq 1 ] ; then

 			DBNAME="$1"

 		fi

-		openser_drop $DBNAME

+		kamailio_drop $DBNAME

 		exit $?

 		;;

 	reinit)

@@ -290,17 +290,17 @@ case $1 in

 		if [ $# -eq 1 ] ; then

 			DBNAME="$1"

 		fi

-		openser_drop $DBNAME

+		kamailio_drop $DBNAME

 		ret=$?

 		if [ "$ret" -ne 0 ]; then

 			exit $ret

 		fi

-		openser_create $DBNAME

+		kamailio_create $DBNAME

 		exit $?

 		;;

 	bdb|db_berkeley)

 		shift

-		openser_berkeley "$@"

+		kamailio_berkeley "$@"

 		exit $?

 		;;

 	version)

@@ -118,7 +118,7 @@ EOF

 #

 # 

 #

-openser_berkeley()  # parms: <op> <arg1> <arg2>

+kamailio_berkeley()  # parms: <op> <arg1> <arg2>

 {

 	case $1 in

 		list|ls)

@@ -127,43 +127,43 @@ openser_berkeley()  # parms: <op> <arg1> <arg2>

 			;;

 		cat)

 			shift

-			openser_cat $1 $DB_PATH

+			kamailio_cat $1 $DB_PATH

 			exit $?

 			;;

 		swap)

 			shift

-			openser_swap $1 $DB_PATH

+			kamailio_swap $1 $DB_PATH

 			exit $?

 			;;

 		append)

 			shift

-			openser_append  $1 $2 $DB_PATH

+			kamailio_append  $1 $2 $DB_PATH

 			exit $?

 			;;

 		newappend)

 			shift

-			openser_newappend  $1 $2 $DB_PATH

+			kamailio_newappend  $1 $2 $DB_PATH

 			exit $?

 			;;

 		export)

 			shift

-			openser_export  $1 $DB_PATH

+			kamailio_export  $1 $DB_PATH

 			exit $?

 			;;

 		migrate)

 			shift

-			openser_migrate $1 $DB_PATH

+			kamailio_migrate $1 $DB_PATH

 			exit $?

 			;;

 		import)

 			shift

-			openser_import  $1 $DB_PATH

+			kamailio_import  $1 $DB_PATH

 			exit $?

 			;;

@@ -182,10 +182,10 @@ esac

 #

 # Export is used as part of a DB migration process to another 

 # major version of berkeley db.

-openser_export()  # parms: <DUMP_DIR> [DB_PATH]

+kamailio_export()  # parms: <DUMP_DIR> [DB_PATH]

 {

 	if [ $# -lt 2  ]; then

-		echo  "openser_dump parms: <DUMP_DIR> [DB_PATH]"

+		echo  "kamailio_dump parms: <DUMP_DIR> [DB_PATH]"

 		exit 1

 	fi

@@ -290,12 +290,12 @@ openser_export()  # parms: <DUMP_DIR> [DB_PATH]

 ##

 # MIGRATE (schema)

 # Examine each plain-txt file in DUMP_DIR

-#  (Assumes that openser_export was already invoked)

+#  (Assumes that kamailio_export was already invoked)

 #

 # Migrate converts data from schema-old to schema-new in place.

 #

 # After this step is complete the IMPORT should be executed.

-openser_migrate()  # parms: <DUMP_DIR> [DB_PATH]

+kamailio_migrate()  # parms: <DUMP_DIR> [DB_PATH]

 {

 	merr "db_berkeley migrate not implemented"

 	exit 1

@@ -308,10 +308,10 @@ openser_migrate()  # parms: <DUMP_DIR> [DB_PATH]

 #

 # import is used as part of DB migrate to another major version of berkeley db.

 # this will over-write anything in DB_PATH

-openser_import()  # parms: <DUMP_DIR> [DB_PATH]

+kamailio_import()  # parms: <DUMP_DIR> [DB_PATH]

 {

 	if [ $# -lt 2  ]; then

-		echo  "openser_dump parms: <DUMP_DIR> [DB_PATH]"

+		echo  "kamailio_dump parms: <DUMP_DIR> [DB_PATH]"

 		exit 1

 	fi

@@ -393,10 +393,10 @@ openser_import()  # parms: <DUMP_DIR> [DB_PATH]

 }

-openser_swap()  # parms: <db> [DB_PATH]

+kamailio_swap()  # parms: <db> [DB_PATH]

 {

 	if [ $# -lt 2  ]; then

-		echo  "openser_swap parms: <db> [DB_PATH]"

+		echo  "kamailio_swap parms: <db> [DB_PATH]"

 		exit 1

 	fi

@@ -412,10 +412,10 @@ openser_swap()  # parms: <db> [DB_PATH]

 # 1. copy DB_PATH/db to DB_PATH/db.new

 # 2. appends contents of newdata to DB_PATH/db.new

 #

-openser_append()  # parms: <db> <newdata> [DB_PATH]

+kamailio_append()  # parms: <db> <newdata> [DB_PATH]

 {

 	if [ $# -lt 3  ]; then

-		echo  "openser_append parms: <db> <newdata> [DB_PATH]"

+		echo  "kamailio_append parms: <db> <newdata> [DB_PATH]"

 		exit 1

 	fi

@@ -441,10 +441,10 @@ openser_append()  # parms: <db> <newdata> [DB_PATH]

 # 3. move /tmp/sc-<processID>/db over to DB_PATH/db.new

 # 4. delete temp DBENV dir /tmp/sc-<processID>

 #

-openser_newappend()  # parms: <db> <newdata> [DB_PATH]

+kamailio_newappend()  # parms: <db> <newdata> [DB_PATH]

 {

 	if [ $# -lt 3  ]; then

-		echo  "openser_append parms: <db> <newdata> [DB_PATH]"

+		echo  "kamailio_append parms: <db> <newdata> [DB_PATH]"

 		exit 1

 	fi

@@ -454,7 +454,7 @@ openser_newappend()  # parms: <db> <newdata> [DB_PATH]

 		rm $DBNEW

 	fi

 	TMPENV=/tmp/sc-$$

-	openser_create $TMPENV

+	kamailio_create $TMPENV

 	cd $OLDPWD

 	$LOAD_CMD -T -t hash -f $2 -h $TMPENV $1

 	mv $TMPENV/$1 $DBNEW

@@ -463,20 +463,20 @@ openser_newappend()  # parms: <db> <newdata> [DB_PATH]

 # cat all rows to STDOUT

-openser_cat()  # pars: <database name> <DB_PATH>

+kamailio_cat()  # pars: <database name> <DB_PATH>

 {

 	if [ $# -ne 2 ] ; then

-		echo  "openser_cat params <db> [DB_PATH]"

+		echo  "kamailio_cat params <db> [DB_PATH]"

 		exit 1

 	fi

 	$DUMP_CMD -p -h $2 $1

 }

-openser_drop()  # pars:  <DB_PATH>

+kamailio_drop()  # pars:  <DB_PATH>

 {

 	if [ $# -ne 1 ] ; then

-		echo "openser_drop function takes one param"

+		echo "kamailio_drop function takes one param"

 		exit 1

 	fi

@@ -519,10 +519,10 @@ openser_drop()  # pars:  <DB_PATH>

 }

-openser_create() # pars: <DB_PATH>

+kamailio_create() # pars: <DB_PATH>

 {

 	if [ $# -ne 1 ] ; then

-		echo "openser_create param [DB_PATH]"

+		echo "kamailio_create param [DB_PATH]"

 		exit 1

 	fi

@@ -551,7 +551,7 @@ openser_create() # pars: <DB_PATH>

 		extra_create $1

 	fi

-} # openser_create

+} # kamailio_create

 presence_create() # pars: <DB_PATH>

@@ -22,10 +22,10 @@ if [ -z "$DB_PATH" ] ; then

 	DB_PATH="/usr/local/etc/kamailio/dbtext"

 fi

-openser_drop()  # pars: <database name>

+kamailio_drop()  # pars: <database name>

 {

 if [ $# -ne 1 ] ; then

-	merr "openser_drop function takes one param"

+	merr "kamailio_drop function takes one param"

 	exit 1

 fi

@@ -35,10 +35,10 @@ minfo "DBTEXT ... erasing all files at: $DB_PATH"

 rm -rf $DB_PATH

 }

-openser_create () # pars: <database name>

+kamailio_create () # pars: <database name>

 {

 if [ $# -ne 1 ] ; then

-	merr "openser_create function takes one param (DB_PATH)"

+	merr "kamailio_create function takes one param (DB_PATH)"

 	exit 1

 fi

@@ -4,7 +4,7 @@

 #

 # History:

 # 2006-04-07  removed gen_ha1 dependency - use md5sum;

-#             separated the serweb from openser tables;

+#             separated the serweb from kamailio tables;

 #             fixed the reinstall functionality (bogdan)

 # 2006-05-16  added ability to specify MD5 from a configuration file

 #             FreeBSD does not have the md5sum function (norm)

@@ -82,10 +82,10 @@ sql_query()

 }

-openser_drop()  # pars: <database name>

+kamailio_drop()  # pars: <database name>

 {

 if [ $# -ne 1 ] ; then

-	merr "openser_drop function takes two params"

+	merr "kamailio_drop function takes two params"

 	exit 1

 fi

@@ -124,10 +124,10 @@ db_charset_test()

 }

-openser_create () # pars: <database name>

+kamailio_create () # pars: <database name>

 {

 if [ $# -ne 1 ] ; then

-	merr "openser_create function takes one param"

+	merr "kamailio_create function takes one param"

 	exit 1

 fi

@@ -181,7 +181,7 @@ if [ "$ANSWER" = "y" ]; then

 	HAS_EXTRA="yes"

 	extra_create $1

 fi

-} # openser_create

+} # kamailio_create

 presence_create () # pars: <database name>

@@ -38,10 +38,10 @@ if [ -z "$SQLPLUS" ] ; then

 	fi

 	export SQLPLUS

 fi

-if [ -z "$OPENSER_ORASEL" ] ; then

-	OPENSER_ORASEL=`which kamailio_orasel 2>/dev/null`

+if [ -z "$KAMAILIO_ORASEL" ] ; then

+	KAMAILIO_ORASEL=`which kamailio_orasel 2>/dev/null`

 	if [ -n "$SQLPLUS" ]; then

-		export OPENSER_ORASEL

+		export KAMAILIO_ORASEL

 	fi

 fi

@@ -78,10 +78,10 @@ oracle_root_cmd()

 }

-openser_drop()  # pars: <database name>

+kamailio_drop()  # pars: <database name>

 {

 if [ $# -ne 1 ] ; then

-	merr "openser_drop function takes one params"

+	merr "kamailio_drop function takes one params"

 	exit 1

 fi

@@ -119,13 +119,13 @@ if [ -n "$DBSYSUSER" ]; then

 fi

 minfo "Scheme '$DBROOTUSER' in database '$1' dropped"

-} #openser_drop

+} #kamailio_drop

-openser_create() # pars: <database name>

+kamailio_create() # pars: <database name>

 {

 if [ $# -ne 1 ] ; then

-	merr "openser_create function takes one param"

+	merr "kamailio_create function takes one param"

 	exit 1

 fi

@@ -220,7 +220,7 @@ get_answer $INSTALL_EXTRA_TABLES "Install tables for $EXTRA_MODULES? (y/n): "

 if [ "$ANSWER" = "y" ]; then

 	extra_create $1

 fi

-} # openser_create

+} # kamailio_create

 presence_create() # pars: <database name>

@@ -281,8 +281,8 @@ oracle_dump()

 	if [ -n "$1" ]; then

 		SUFF="@$1"

 	fi

-	if [ -n "$OPENSER_ORASEL" ]; then

-		$OPENSER_ORASEL ${DBROUSER}/${DBROPW}$SUFF -BLNe \

+	if [ -n "$KAMAILIO_ORASEL" ]; then

+		$KAMAILIO_ORASEL ${DBROUSER}/${DBROPW}$SUFF -BLNe \

 		    "select * from table(dump_tables('$DBROOTUSER'));" >$2

 	else

 		echo "set feed 0 lin 8000 pages 0

@@ -72,10 +72,10 @@ sql_query()

 }

-openser_drop()  # pars: <database name>

+kamailio_drop()  # pars: <database name>

 {

 if [ $# -ne 1 ] ; then

-	merr "openser_drop function takes two params"

+	merr "kamailio_drop function takes two params"

 	exit 1

 fi

@@ -95,13 +95,13 @@ else

 fi

 minfo "Database $1 dropped"

-} #openser_drop

+} #kamailio_drop

-openser_create () # pars: <database name>

+kamailio_create () # pars: <database name>

 {

 if [ $# -ne 1 ] ; then

-	merr "openser_create function takes one param"

+	merr "kamailio_create function takes one param"

 	exit 1

 fi

@@ -172,7 +172,7 @@ get_answer $INSTALL_EXTRA_TABLES "Install tables for $EXTRA_MODULES? (y/n): "

 if [ "$ANSWER" = "y" ]; then

 	extra_create $1

 fi

-} # openser_create

+} # kamailio_create

 presence_create () # pars: <database name>

@@ -31,10 +31,10 @@ sql_query()

 }

-openser_drop()  # pars: <database name>

+kamailio_drop()  # pars: <database name>

 {

 if [ $# -ne 1 ] ; then

-	merr "openser_drop function takes one param"

+	merr "kamailio_drop function takes one param"

 	exit 1

 fi

@@ -44,13 +44,13 @@ if ! rm $1; then

 fi

 minfo "Database $1 dropped"

-} #openser_drop

+} #kamailio_drop

-openser_create () # pars: <database name>

+kamailio_create () # pars: <database name>

 {

 if [ $# -ne 1 ] ; then

-	merr "openser_create function takes one param"

+	merr "kamailio_create function takes one param"

 	exit 1

 fi

@@ -100,7 +100,7 @@ get_answer $INSTALL_EXTRA_TABLES "Install tables for $EXTRA_MODULES? (y/n): "

 if [ "$ANSWER" = "y" ]; then

 	extra_create $1

 fi

-} # openser_create

+} # kamailio_create

 presence_create () # pars: <database name>