kamctl: removed mi related commands

utils/kamctl/Makefile

@@ -47,11 +47,6 @@ install-bin: $(bin_prefix)/$(bin_dir)
 		$(INSTALL_CFG) $(kamctltmpdir)/kamctl.ctlbase \
 			$(modules_prefix)/$(lib_dir)/kamctl/kamctl.ctlbase
 		rm -fr $(kamctltmpdir)/kamctl.ctlbase
-		sed -e "s#/usr/local#$(bin_target)#g" \
-			< kamctl.fifo > $(kamctltmpdir)/kamctl.fifo
-		$(INSTALL_CFG) $(kamctltmpdir)/kamctl.fifo \
-			$(modules_prefix)/$(lib_dir)/kamctl/kamctl.fifo
-		rm -fr $(kamctltmpdir)/kamctl.fifo
 		sed -e "s#/usr/local#$(bin_target)#g" \
 			< kamctl.rpcfifo > $(kamctltmpdir)/kamctl.rpcfifo
 		$(INSTALL_CFG) $(kamctltmpdir)/kamctl.rpcfifo \
@@ -62,16 +57,6 @@ install-bin: $(bin_prefix)/$(bin_dir)
 		$(INSTALL_CFG) $(kamctltmpdir)/kamctl.ser \
 			$(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser
 		rm -fr $(kamctltmpdir)/kamctl.ser
-		sed -e "s#/usr/local#$(bin_target)#g" \
-			< kamctl.ser_mi > $(kamctltmpdir)/kamctl.ser_mi
-		$(INSTALL_CFG) $(kamctltmpdir)/kamctl.ser_mi \
-			$(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser_mi
-		rm -fr $(kamctltmpdir)/kamctl.ser_mi
-		sed -e "s#/usr/local#$(bin_target)#g" \
-			< kamctl.unixsock > $(kamctltmpdir)/kamctl.unixsock
-		$(INSTALL_CFG) $(kamctltmpdir)/kamctl.unixsock \
-			$(modules_prefix)/$(lib_dir)/kamctl/kamctl.unixsock
-		rm -fr $(kamctltmpdir)/kamctl.unixsock
 		sed -e "s#/usr/local#$(bin_target)#g" \
 			< kamctl.sqlbase > $(kamctltmpdir)/kamctl.sqlbase
 		$(INSTALL_CFG) $(kamctltmpdir)/kamctl.sqlbase \

utils/kamctl/kamctl

@@ -176,12 +176,6 @@ if [ -z "$CTLENGINE" ] ; then
 	CTLENGINE="RPCFIFO"
 fi
 case $CTLENGINE in
-	FIFO|fifo)
-		if [ -f "$MYLIBDIR/kamctl.fifo" ]; then
-			. "$MYLIBDIR/kamctl.fifo"
-			CTLENGINELOADED=1
-		fi
-		;;
 	RPCFIFO|rpcfifo)
 		if [ -f "$MYLIBDIR/kamctl.rpcfifo" ]; then
 			. "$MYLIBDIR/kamctl.rpcfifo"
@@ -189,19 +183,6 @@ case $CTLENGINE in
 			CTLENGINETYPE=1
 		fi
 		;;
-	UNIXSOCK|unixsock)
-		if [ -f "$MYLIBDIR/kamctl.unixsock" ]; then
-			. "$MYLIBDIR/kamctl.unixsock"
-			CTLENGINELOADED=1
-		fi
-		;;
-	SER_MI|ser_mi|SERCMD_MI|sercmd_mi|SERCMDMI|sercmdmi)
-		require_kamcmd
-		if [ -f "$MYLIBDIR/kamctl.ser_mi" ]; then
-			. "$MYLIBDIR/kamctl.ser_mi"
-			CTLENGINELOADED=1
-		fi
-		;;
 esac
 
 #### ------------------------------------------------- #####
@@ -2838,13 +2819,13 @@ case $1 in
 		permissions_address "$@"
 		;;
 
-	fifo|mi|rpc|unixsock|ser_mi|sercmd_mi|sercmdmi|kamcmd_mi|kamcmdmi)
+	rpc)
 		require_ctlengine
 		shift
 		$CTLCMD "$@"
 		;;
 
-	fifoprint|miprint|rpcprint)
+	rpcprint)
 		require_ctlengine
 		shift
 		$CTLCMDPRINT "$@"

utils/kamctl/kamctl.fifo

@@ -1,221 +0,0 @@
-#
-#
-# control tool for maintaining Kamailio
-#
-#===================================================================
-
-##### ----------------------------------------------- #####
-### FIFO specific variables and functions
-#
-
-##### ----------------------------------------------- #####
-### load CTL base
-#
-if [ -f "$MYLIBDIR/kamctl.ctlbase" ]; then
-	. "$MYLIBDIR/kamctl.ctlbase"
-else
-	mwarn "Cannot load CTL core functions '$MYLIBDIR/kamctl.ctlbase' ..."
-	# exit -1
-fi
-
-#
-##### ----------------------------------------------- #####
-### parameters
-#
-if [ -z "$FIFOPATH" ]; then
-	if [ -z "$OSER_FIFO" ]; then
-		FIFOPATH=/var/run/kamailio/kamailio_fifo
-	else
-		FIFOPATH=$OSER_FIFO
-	fi
-fi
-
-#
-##### ----------------------------------------------- #####
-### functions
-#
-usage_fifo() {
-	echo
-	mecho " -- command 'mi' - send raw MI commands"
-	echo
-cat <<EOF
- mi ................................. send raw MI command
- fifo ............................... send raw FIFO (MI) command
-EOF
-}
-USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_fifo"
-
-
-fifo_cmd()
-{
-	mdbg "entering fifo_cmd $*"
-
-	if [ "$#" -lt 1 ]; then
-		merr "fifo_cmd must take at least command name as parameter"
-		exit 1
-	fi
-	name=kamailio_receiver_$$
-	path=$CHROOT_DIR/tmp/$name
-	# delete existing fifo file with same name
-	if test -p $path; then
-		rm -f $path
-	fi
-	if [ ! -w $FIFOPATH ]; then
-		merr "Error opening Kamailio's FIFO $FIFOPATH"
-		merr "Make sure you have the line 'modparam(\"mi_fifo\", \"fifo_name\", \"$FIFOPATH\")' in your config"
-		merr "and also have loaded the mi_fifo module."
-		if [ ! -z $CHROOT_DIR ]; then
-			merr "[chrooted environment] Check that $FIFOPATH is symlinked to ${CHROOT_DIR}${FIFOPATH}"
-		fi
-		exit 2
-	fi
-	if ! test -p $path; then
-		mkfifo $path
-		if [ $? -ne 0 ] ; then
-			merr "error opening read fifo $path"
-			exit 3
-		fi
-		chmod a+w $path
-	fi
-
-	# construct the command now
-	CMD=":$1:$name\n";
-	shift
-	while [ -n "$1" ] ; do
-		CMD="${CMD}${1}\n"
-		shift
-	done
-	CMD="${CMD}\n"
-
-	trap "rm -f $path; kill 0" 2
-
-	# start reader now so that it is ready for replies
-	# immediately after a request was sent out
-	cat < $path | filter_fl &
-
-	# issue FIFO request (printf taken to deal with \n)
-	printf "$CMD" > $FIFOPATH
-
-	# wait for the reader to complete
-	wait
-	rm $path
-
-	mdbg "FIFO command was:\n$CMD"
-}
-
-
-CTLCMD=fifo_cmd
-
-fifo_cmd_print()
-{
-	# construct the command now
-	CMD=":$1:$name\n";
-	shift
-	while [ -n "$1" ] ; do
-		CMD="${CMD}${1}\n"
-		shift
-	done
-	CMD="${CMD}\n"
-
-	minfo "The command is:\n"
-
-	mecho "$CMD"
-}
-
-CTLCMDPRINT=fifo_cmd_print
-
-fifo_kamailio_monitor() {
-	name=kamailio_receiver_$$
-	path=$CHROOT_DIR/tmp/$name
-	# delete existing fifo file with same name
-	if test -p $path; then
-		rm -f $path
-	fi
-	if [ ! -w $FIFOPATH ]; then
-		merr "Error opening Kamailio's FIFO $FIFOPATH"
-		merr "Make sure you have the line 'modparam(\"mi_fifo\", \"fifo_name\", \"$FIFOPATH\")' in your config"
-		merr "and also have loaded the mi_fifo module."
-		exit 1
-	fi
-	if ! test -p $path; then
-		mkfifo $path
-		if [ $? -ne 0 ] ; then
-			merr "monitor - error opening read fifo $path"
-			exit 1
-		fi
-		chmod a+w $path
-	fi
-	trap "rm $path;  clear; echo monitor ^C-ed; exit 1" 2
-	attempt=0
-	if [ "$2" = "" ]; then
-	    loops=-1;
-	else
-	    loops=$2;
-	fi
-	clear
-	while [ $loops -ne $attempt ] ; do
-		attempt=`$EXPR $attempt + 1`
-		#clear
-		tput clear
-
-		# print_stats $name $path $attempt
-		mecho "[cycle #: $attempt; if constant make sure server lives]"
-
-		cat < $path | filter_fl &
-		cat > $FIFOPATH <<EOF
-:version:$name
-
-EOF
-		wait
-
-		cat < $path | filter_fl &
-		cat > $FIFOPATH << EOF
-:uptime:$name
-
-EOF
-		wait
-		echo
-
-		mecho "Transaction Statistics: "
-		cat < $path | filter_fl &
-		cat > $FIFOPATH <<EOF
-:get_statistics:$name
-UAS_transactions
-UAC_transactions
-inuse_transactions
-
-EOF
-		wait
-		echo
-
-		mecho "Stateless Server Statistics: "
-		cat < $path | filter_fl &
-		cat > $FIFOPATH <<EOF
-:get_statistics:$name
-sent_replies
-sent_err_replies
-received_ACKs
-
-EOF
-		wait
-		echo
-
-		mecho "UsrLoc Stats: "
-		cat < $path | filter_fl &
-		cat > $FIFOPATH <<EOF
-:get_statistics:$name
-usrloc:
-
-EOF
-		wait
-
-		if [ $loops -ne $attempt ] ; then
-			sleep $WATCH_PERIOD
-		fi
-	done
-	rm $path
-	exit 0
-}
-
-KAMAILIO_MONITOR=fifo_kamailio_monitor
-

utils/kamctl/kamctl.ser_mi

@@ -1,93 +0,0 @@
-#
-#
-# control tool for maintaining Kamailio
-#
-#===================================================================
-
-##### ----------------------------------------------- #####
-### FIFO specific variables and functions
-#
-
-##### ----------------------------------------------- #####
-### load CTL base
-#
-if [ -f "$MYLIBDIR/kamctl.ctlbase" ]; then
-	. "$MYLIBDIR/kamctl.ctlbase"
-else
-	mwarn "Cannot load CTL core functions '$MYLIBDIR/kamctl.ctlbase' ..."
-	# exit -1
-fi
-
-#
-##### ----------------------------------------------- #####
-### parameters
-#
-
-#
-##### ----------------------------------------------- #####
-### functions
-#
-usage_ser_mi() {
-	echo
-	mecho " -- command 'kamcmd_mi'"
-	echo
-cat <<EOF
- kamcmd_mi ............................. send mi command through kamcmd
-EOF
-}
-USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser_mi"
-
-
-ser_mi_cmd()
-{
-	mdbg "entering ser_mi_cmd $*"
-	
-	if [ "$#" -lt 1 ]; then
-		merr "kamcmd_mi must take at least command name as parameter"
-		exit 1
-	fi
-
-	
-	$SERCMD mi "$@"
-}
-
-CTLCMD=ser_mi_cmd
-
-ser_mi_monitor() {
-	trap "rm $path;  clear; echo monitor ^C-ed; exit 1" 2
-	attempt=0
-	if [ "$2" = "" ]; then
-	    loops=-1;
-	else
-	    loops=$2;
-	fi
-	clear
-	while [ $loops -ne $attempt ] ; do
-		attempt=`$EXPR $attempt + 1`
-		#clear
-		tput clear
-		
-		# print_stats $name $path $attempt
-		mecho "[cycle #: $attempt; if constant make sure server lives]"
-
-		$SERCMD mi version
-		$SERCMD mi uptime
-		mecho "Transaction Statistics"
-		$SERCMD mi get_statistics UAS_transactions UAC_transactions inuse_transactions
-
-		mecho "Stateless Server Statistics: "
-		$SERCMD mi get_statistics sent_replies sent_err_replies received_ACKs
-
-		mecho "UsrLoc Stats: "
-		$SERCMD mi get_statistics usrloc
-		if [ $loops -ne $attempt ] ; then
-			sleep $WATCH_PERIOD
-		fi
-	done
-	exit 0
-}
-
-KAMAILIO_MONITOR=ser_mi_monitor
-
-
-

utils/kamctl/kamctl.unixsock

@@ -1,135 +0,0 @@
-#
-#
-# control tool for maintaining Kamailio
-#
-#===================================================================
-
-##### ----------------------------------------------- #####
-### UNIXSOCK specific variables and functions
-#
-
-##### ----------------------------------------------- #####
-### load CTL base
-#
-if [ -f "$MYLIBDIR/kamctl.ctlbase" ]; then
-	. "$MYLIBDIR/kamctl.ctlbase"
-else
-	mwarn "Cannot load CTL core functions '$MYLIBDIR/kamctl.ctlbase' ..."
-	# exit -1
-fi
-
-#
-##### ----------------------------------------------- #####
-### parameters
-#
-export CHROOT_DIR # needed for kamunix
-if [ -z "$OSER_UNIXSOCK" ]; then
-	OSER_UNIXSOCK=$CHROOT_DIR/tmp/kamailio.sock
-fi
-
-if [ -z "$OSERUNIX" ]; then
-	OSERUNIX=kamunix
-fi
-
-#
-##### ----------------------------------------------- #####
-### functions
-#
-usage_unixsock() {
-	echo
-	mecho " -- command 'unixsock'"
-	echo
-cat <<EOF
- unixsock ........................... send raw unixsock command
-EOF
-}
-USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_unixsock"
-
-
-unixsock_cmd()
-{
-	mdbg "entering unixsock_cmd $*"
-	if [ "$#" -lt 1 ]; then
-		merr "unixsock_cmd must take at least command name as parameter"
-		exit
-	fi
-
-	# construct the command now
-	CMD=":$1:\n";
-	shift
-	while [ -n "$1" ] ; do
-		CMD="${CMD}${1}\n"
-		shift
-	done
-	CMD="${CMD}\n"
-
-	printf "$CMD" | $OSERUNIX $OSER_UNIXSOCK | filter_fl
-
-	mdbg "UNIXSOCK command was:\n$CMD"
-}
-
-CTLCMD=unixsock_cmd
-
-unixsock_cmd_print()
-{
-	# construct the command now
-	CMD=":$1:\n";
-	shift
-	while [ -n "$1" ] ; do
-		CMD="${CMD}${1}\n"
-		shift
-	done
-	CMD="${CMD}\n"
-
-	minfo "The command is:\n"
-
-	mecho "$CMD"
-}
-
-CTLCMDPRINT=unixsock_cmd_print
-
-unixsock_kamailio_monitor() {
-		attempt=0
-		if [ "$2" == "" ]; then
-		    loops=-1;
-		else
-		    loops=$2;
-		fi
-		clear
-		while [ $loops -ne $attempt ] ; do
-			attempt=$(($attempt + 1))
-			#clear
-			tput cup 0 0
-
-			# print_stats $attempt
-			mecho "[cycle #: $attempt; if constant make sure server lives]"
-			unixsock_cmd version
-			unixsock_cmd uptime
-
-			mecho "Transaction Statistics"
-			unixsock_cmd get_statistics UAS_transactions
-			unixsock_cmd get_statistics UAC_transactions
-			unixsock_cmd get_statistics inuse_transactions
-
-			mecho "Stateless Server Statistics"
-			unixsock_cmd get_statistics sent_replies
-			unixsock_cmd get_statistics sent_err_replies
-			unixsock_cmd get_statistics received_ACKs
-
-			mecho "UsrLoc Stats"
-			unixsock_cmd get_statistics registered_users
-			unixsock_cmd get_statistics location-users
-			unixsock_cmd get_statistics location-contacts
-			unixsock_cmd get_statistics location-expires
-
-			if [ $loops -ne $attempt ] ; then
-				sleep $WATCH_PERIOD
-			fi
-				
-		done
-		exit 0
-
-}
-
-KAMAILIO_MONITOR=unixsock_kamailio_monitor
-

utils/kamctl/kamctlrc

@@ -117,16 +117,13 @@
 ## - default: none
 # ALIASES_TYPE="DB"
 
-## control engine: FIFO, RPCFIFO or UNIXSOCK
+## control engine: RPCFIFO
 ## - default RPCFIFO
 # CTLENGINE="RPCFIFO"
 
 ## path to FIFO file for engine RPCFIFO
 # RPCFIFOPATH="/var/run/kamailio/kamailio_rpc_fifo"
 
-## path to FIFO file for engine FIFO
-# FIFOPATH="/var/run/kamailio/kamailio_fifo"
-
 ## check ACL names; default on (1); off (0)
 # VERIFY_ACL=1