1 files changed, 9 insertions, 33 deletions
diff --git a/pkg/server/tunnel.go b/pkg/server/tunnel.go
index 8b86ddc..e2fce92 100644
--- a/pkg/server/tunnel.go
+++ b/pkg/server/tunnel.go
@@ -421,10 +421,8 @@ func isOkTunnelName(s string) bool {
 	return s != ""
 }
 
-func tunnelAdd(r *request) {
+func tunnelAdd(r *request, args ...string) {
 	limit := maxQueueLimit
-
-	args := r.args
 	name := ""
 
 	for len(args) > 1 {
@@ -492,11 +490,7 @@ func tunnelAdd(r *request) {
 	log.Println(r.c, r, t, "create")
 }
 
-func tunnelDel(r *request) {
-	r.expect(1)
-
-	id := r.args[0]
-
+func tunnelDel(r *request, id string) {
 	if t, ok := r.c.s.tunnels[id]; !ok {
 		r.Fatal("no such entry")
 	} else {
@@ -505,10 +499,7 @@ func tunnelDel(r *request) {
 	}
 }
 
-func tunnelRename(r *request) {
-	r.expect(2)
-
-	old, new := r.args[0], r.args[1]
+func tunnelRename(r *request, old, new string) {
 	if !isOkTunnelName(new) {
 		r.Fatal("bad name")
 	}
@@ -584,29 +575,14 @@ func showRecent(r *request) {
 	}
 }
 
-func showHooks(r *request) {
-	for _, h := range hook.GetList() {
-		r.Println(h)
-	}
-}
-
-func showSockets(r *request) {
-	for _, s := range socket.GetList() {
-		r.Println(s)
-	}
-}
-
 func init() {
-	newCmd(tunnelAdd, "add")
-	newCmd(tunnelDel, "del")
-
-	newCmd(tunnelRename, "rename")
+	newCmd("add", tunnelAdd, "[name id] [limit N] [single] socket [hook ...] socket")
+	newCmd("del", tunnelDel, "id")
 
-	newCmd(showHooks, "hooks")
-	newCmd(showSockets, "sockets")
+	newCmd("rename", tunnelRename, "old-id new-id")
 
-	newCmd(showTunnels, "show")
+	newCmd("show", showTunnels, "")
 
-	newCmd(showActive, "active")
-	newCmd(showRecent, "recent")
+	newCmd("active", showActive, "")
+	newCmd("recent", showRecent, "")
 }