utils/kamctl: removed the option of executing mi commands

utils/kamctl/kamctl

@@ -246,20 +246,18 @@ require_ctlengine() {
 #
 
 ##
-# wrapper to run MI or RPC command based on configured engine
-# - first parameter is the MI command
-# - second parameter is the RPC command
-# - the rest are the parameters for the MI/RPC command
+# wrapper to run RPC command based on configured engine
+# - first parameter is the RPC command
+# - the rest are the parameters for the RPC command
 ctl_cmd_run () {
-	VCMDMI="$1"
-	shift
 	VCMDRPC="$1"
 	shift
 
 	if [ $CTLENGINETYPE -eq 1 ] ; then
 		$CTLCMD $VCMDRPC $@
 	else
-		$CTLCMD $VCMDMI $@
+		merr "ctl engine not configured"
+		exit 1
 	fi
 }
 
@@ -425,7 +423,7 @@ $CLAUSE;"
 #
 check_ul_alias() {
 	require_ctlengine
-	RES=`ctl_cmd_run ul_show_contact ul.lookup "$ALS_TABLE" "$1@$2"`
+	RES=`ctl_cmd_run ul.lookup "$ALS_TABLE" "$1@$2"`
 	RET="$?"
 	ALIAS_UL_EXISTS=0
 	if [ $RET -ne 0 ] ; then
@@ -951,7 +949,7 @@ $AVP_USER_COLUMN='$OSERUSER' AND $AVP_DOMAIN_COLUMN='$OSERDOMAIN'"
 cisco_restart() {
 	require_ctlengine
 	myhost=`get_my_host`
-	CMDPARAMS="t_uac_dlg tm.t_uac_start NOTIFY $1 . . \"From:sip:daemon@$myhost\r\nTo:<$1>\r\nEvent:check-sync\r\nContact:sip:daemon@$myhost\r\n\""
+	CMDPARAMS="tm.t_uac_start NOTIFY $1 . . \"From:sip:daemon@$myhost\r\nTo:<$1>\r\nEvent:check-sync\r\nContact:sip:daemon@$myhost\r\n\""
 
 	if [ $CTLENGINETYPE -eq 1 ] ; then
 		ctl_cmd_run $CMDPARAMS
@@ -1094,11 +1092,11 @@ domain() {
 	case $1 in
 		reload)
 			require_ctlengine
-			ctl_cmd_run domain_reload domain.reload
+			ctl_cmd_run domain.reload
 			;;
 		show)
 			require_ctlengine
-			ctl_cmd_run domain_dump domain.dump
+			ctl_cmd_run domain.dump
 			;;
 		showdb)
 			require_dbengine
@@ -1225,11 +1223,11 @@ permissions_trusted() {
 	case $1 in
 		reload)
 			require_ctlengine
-			ctl_cmd_run trusted_reload permissions.trustedReload
+			ctl_cmd_run permissions.trustedReload
 			;;
 		dump)
 			require_ctlengine
-			ctl_cmd_run trusted_dump permissions.trustedDump
+			ctl_cmd_run permissions.trustedDump
 			;;
 		show)
 			require_dbengine
@@ -1300,12 +1298,12 @@ permissions_address() {
 	case $1 in
 		reload)
 			require_ctlengine
-			ctl_cmd_run address_reload permissions.addressReload
+			ctl_cmd_run permissions.addressReload
 			;;
 		dump)
 			require_ctlengine
-			ctl_cmd_run address_dump permissions.addressDump
-			ctl_cmd_run subnet_dump permissions.subnetDump
+			ctl_cmd_run permissions.addressDump
+			ctl_cmd_run permissions.subnetDump
 			;;
 		show)
 			require_dbengine
@@ -1389,17 +1387,17 @@ lcr() {
 		reload)
 			merr "command disabled"
 			exit 1
-			ctl_cmd_run lcr.reload lcr.reload
+			ctl_cmd_run lcr.reload
 			;;
 		dump_gws)
 			merr "command disabled"
 			exit 1
-			ctl_cmd_run lcr.dump_gws lcr.dump_gws
+			ctl_cmd_run lcr.dump_gws
 			;;
 		dump_routes)
 			merr "command disabled"
 			exit 1
-			ctl_cmd_run lcr.dump_lcrs lcr.dump_lcrs
+			ctl_cmd_run lcr.dump_lcrs
 			;;
 		eval_weights)
 			shift
@@ -1459,11 +1457,11 @@ cr() {
 			$DBROCMD "$QUERY"
 			;;
 		reload)
-			ctl_cmd_run cr_reload_routes cr.reload_routes
+			ctl_cmd_run cr.reload_routes
 			;;
 
 		dump)
-			ctl_cmd_run cr_dump_routes cr.dump_routes
+			ctl_cmd_run cr.dump_routes
 			;;
 
 		addcn)
@@ -1699,12 +1697,12 @@ dispatcher() {
 			;;
 		reload)
 			require_ctlengine
-			ctl_cmd_run ds_reload dispatcher.reload
+			ctl_cmd_run dispatcher.reload
 			;;
 
 		dump)
 			require_ctlengine
-			ctl_cmd_run ds_list dispatcher.list
+			ctl_cmd_run dispatcher.list
 			;;
 
 		*)
@@ -1723,17 +1721,17 @@ ksr_srv() {
 		sockets)
 			require_ctlengine
 			mecho "list listen sockets"
-			ctl_cmd_run corex.list_sockets corex.list_sockets
+			ctl_cmd_run corex.list_sockets
 			;;
 		aliases)
 			require_ctlengine
 			mecho "list server aliases"
-			ctl_cmd_run corex.list_aliases corex.list_aliases
+			ctl_cmd_run corex.list_aliases
 			;;
 		rpclist)
 			require_ctlengine
 			mecho "list server rpc commands"
-			ctl_cmd_run system.listMethods system.listMethods
+			ctl_cmd_run system.listMethods
 			;;
 		*)
 			usage_ksr_srv
@@ -1752,7 +1750,7 @@ dialog() {
 		show|list)
 			require_ctlengine
 			mecho "dialog memory records"
-			ctl_cmd_run dlg_list dlg.list
+			ctl_cmd_run dlg.list
 			;;
 		showdb)
 			require_dbengine
@@ -1902,7 +1900,7 @@ dialplan() {
 			;;
 
 		reload)
-			ctl_cmd_run dp_reload dialplan.reload
+			ctl_cmd_run dialplan.reload
 			;;
 
 		*)
@@ -1971,7 +1969,7 @@ kamailio_stop() {
 options_ping() {
 	myhost=`get_my_host`
 	require_ctlengine
-	CMDPARAMS="t_uac_dlg tm.t_uac_start OPTIONS \"$1\" \".\" \".\" \"From:sip:daemon@$myhost"$'\r\n'"To:<$1>"$'\r\n'"Contact:sip:daemon@$myhost"$'\r\n'"\""
+	CMDPARAMS="tm.t_uac_start OPTIONS \"$1\" \".\" \".\" \"From:sip:daemon@$myhost"$'\r\n'"To:<$1>"$'\r\n'"Contact:sip:daemon@$myhost"$'\r\n'"\""
 	if [ $CTLENGINETYPE -eq 1 ] ; then
 		ctl_cmd_run $CMDPARAMS
 	else
@@ -2502,14 +2500,14 @@ usrloc() {
 		show)
 			if [ $# -eq 2 ] ; then
 				if [ "$2" = "--brief" ] ; then
-					ctl_cmd_run ul_dump ul.dump brief
+					ctl_cmd_run ul.dump brief
 				else
 					set_user $2
-					ctl_cmd_run ul_show_contact ul.lookup \
+					ctl_cmd_run ul.lookup \
 						$USRLOC_TABLE "$OSERUSER@$OSERDOMAIN"
 				fi
 			elif [ $# -eq 1 ] ; then
-				ctl_cmd_run ul_dump ul.dump
+				ctl_cmd_run ul.dump
 			else
 				merr "wrong number of params"
 				usage_usrloc
@@ -2569,7 +2567,7 @@ usrloc() {
 				DEFAULT_Q="1.0"
 			fi
 
-			ctl_cmd_run ul_add ul.add "$USRLOC_TABLE" "$OSERUSER@$OSERDOMAIN" "$2" \
+			ctl_cmd_run ul.add "$USRLOC_TABLE" "$OSERUSER@$OSERDOMAIN" "$2" \
 "$UL_EXPIRES" "$DEFAULT_Q" "$UL_PATH" "$UL_FLAGS" "$BR_FLAGS" "$ALL_METHODS"
 			exit $?
 			;;
@@ -2577,7 +2575,7 @@ usrloc() {
 			if [ $# -eq 2 ] ; then
 				shift
 				set_user $1
-				ctl_cmd_run ul_rm ul.rm $USRLOC_TABLE "$OSERUSER@$OSERDOMAIN"
+				ctl_cmd_run ul.rm $USRLOC_TABLE "$OSERUSER@$OSERDOMAIN"
 
 			elif [ $# -eq 3 ] ; then
 				shift
@@ -2588,7 +2586,7 @@ usrloc() {
 					exit 1
 				fi
 
-				ctl_cmd_run ul_rm_contact ul.rm_contact $USRLOC_TABLE "$OSERUSER@$OSERDOMAIN" "$2"
+				ctl_cmd_run ul.rm_contact $USRLOC_TABLE "$OSERUSER@$OSERDOMAIN" "$2"
 
 			else
 				merr "wrong number of params"
@@ -2928,7 +2926,7 @@ case $1 in
 
 	online)
 		require_ctlengine
-		ctl_cmd_run ul_dump ul.dump brief | $EGREP -i aor | $EGREP -v AoRs \
+		ctl_cmd_run ul.dump brief | $EGREP -i aor | $EGREP -v AoRs \
 			| awk '{print $2}' | sed 's/"//g' | sort | sort -mu
 		exit $?
 		;;
@@ -2946,20 +2944,20 @@ case $1 in
 
 	ps)
 		require_ctlengine
-		ctl_cmd_run ps core.psx
+		ctl_cmd_run core.psx
 		;;
 
 	uptime)
 		require_ctlengine
-		ctl_cmd_run uptime core.uptime
+		ctl_cmd_run core.uptime
 		;;
 
 	stats)
 		require_ctlengine
 		if [ "$#" -eq 1 ] ; then
-			ctl_cmd_run get_statistics stats.get_statistics all
+			ctl_cmd_run stats.get_statistics all
 		else
-			ctl_cmd_run get_statistics stats.get_statistics "${2}:"
+			ctl_cmd_run stats.get_statistics "${2}:"
 		fi
 		;;