rapid-tunneling:

 - Removed old unused files
 - Minor bugfixes


git-svn-id: svn+ssh://xorcom/home/svn/debs/components/rapid-tunneling@6488 283159da-0705-0410-b60c-f2062b4bb6ad

1 files changed, 14 insertions, 6 deletions

diff --git a/rtadm b/rtadm
index e1e8746..aadb168 100755
--- a/rtadm
+++ b/rtadm
@@ -18,6 +18,14 @@ create()
 	TUNNEL_PORT=$1
 	COMMENT=$2
 
+	if grep -q "ra-[0-9]\+-$COMMENT-[0-9]\+" $HOME/.ssh/authorized_keys 2>/dev/null; then
+		echo "Comment '$COMMENT' already exists. Aborting." 1>&2
+		exit 1
+	fi
+	if ! [ $TUNNEL_PORT -ge 1024 -a $TUNNEL_PORT -le 65535 ] 2>/dev/null; then
+		echo "Tunnel-port should be an integer in the range 1024-65535. Aborting."
+		exit 1
+	fi
 	rm -rf ~/tmp
 	mkdir ~/tmp
 	key_comment=ra-$TUNNEL_PORT-$COMMENT-`date '+%Y%m%d%H%M%S'`
@@ -115,7 +123,7 @@ usage()
 	exit 1
 }
 
-if [ $# = 0 -o "$1" = "-" -o "$1" = "--help" ]; then
+if [ $# = 0 -o "$1" = "-h" -o "$1" = "--help" ]; then
 	usage
 fi
 
@@ -123,7 +131,7 @@ case "$1" in
 	create)
 		shift
 		[ "$1" = "-e" ] && do_enable=1 && shift
-		[ -z "$1" -o -z "$2" ] && usage
+		[ -z "$1" -o -z "$2" -o -n "$3" ] && usage
 		create "$1" "$2"
 		[ "$do_enable" = 1 ] && enable "$2"
 		;;
@@ -133,22 +141,22 @@ case "$1" in
 		;;
 	enable)
 		shift
-		[ -z "$1" ] && usage
+		[ -z "$1" -o -n "$2" ] && usage
 		enable "$1"
 		;;
 	disable)
 		shift
-		[ -z "$1" ] && usage
+		[ -z "$1" -o -n "$2" ] && usage
 		disable "$1"
 		;;
 	disconnect)
 		shift
-		[ -z "$1" ] && usage
+		[ -z "$1" -o -n "$2" ] && usage
 		disconnect "$1"
 		;;
 	delete)
 		shift
-		[ -z "$1" ] && usage
+		[ -z "$1" -o -n "$2" ] && usage
 		delete "$1"
 		disconnect "$1"
 		;;