* src/gateway_commands.c (gateway_setup_command): Use

DEFINE_COMMAND.
(gateway_accept): Use DEFINE_COMMAND2.

Rev: src/gateway_commands.c:1.11
Rev: src/gateway_commands.h:1.2

src/gateway_commands.c

@@ -142,7 +142,8 @@ gateway_make_connection(struct listen_value *lv,
 }
 
 DEFINE_COMMAND(gateway_init)
-     (struct command *s UNUSED, struct lsh_object *a,
+     (struct command *s UNUSED,
+      struct lsh_object *a,
       struct command_continuation *c,
       struct exception_handler *e)
 {
@@ -153,36 +154,26 @@ DEFINE_COMMAND(gateway_init)
 
 
 /* (gateway_accept main-connection gateway-connection) */
-
-static void
-do_gateway_accept(struct command *s,
-		 struct lsh_object *x,
+DEFINE_COMMAND2(gateway_accept)
+     (struct command_2 *s UNUSED,
+      struct lsh_object *a1,
+      struct lsh_object *a2,
       struct command_continuation *c,
       struct exception_handler *e)
 {
-  CAST(connection_command, self, s);
-  CAST(listen_value, lv, x);
+  CAST(ssh_connection, connection, a1);
+  CAST(listen_value, lv, a2);
 
   struct ssh_connection *gateway = gateway_make_connection(lv, e);
   
   /* Kill gateway connection if the main connection goes down. */
-  REMEMBER_RESOURCE(self->connection->resources, &lv->fd->super);
+  REMEMBER_RESOURCE(connection->resources, &lv->fd->super);
   
-  gateway->chain = self->connection;
+  gateway->chain = connection;
 
   COMMAND_RETURN(c, gateway);
 }
 
-DEFINE_COMMAND_SIMPLE(gateway_accept, a)
-{
-  CAST(ssh_connection, connection, a);
-  NEW(connection_command, self);
-  self->connection = connection;
-  self->super.call = do_gateway_accept;
-
-  return &self->super.super;
-}
-
 
 /* GABA:
    (expr
@@ -208,11 +199,15 @@ make_gateway_setup(struct command *listen)
   return res;
 }
 
-DEFINE_COMMAND_SIMPLE(gateway_setup_command, a)
+DEFINE_COMMAND(gateway_setup_command)
+     (struct command *s UNUSED,
+      struct lsh_object *a,
+      struct command_continuation *c,
+      struct exception_handler *e UNUSED)
 {
   CAST_SUBTYPE(command, listen, a);
   CAST_SUBTYPE(command, res,
 	       gateway_setup(listen));
 
-  return &res->super;
+  COMMAND_RETURN(c, res);
 }

src/gateway_commands.h

@@ -30,13 +30,13 @@
 extern struct command gateway_init;
 #define GATEWAY_INIT (&gateway_init.super)
 
-extern struct command_simple gateway_accept;
+extern struct command_2 gateway_accept;
 #define GATEWAY_ACCEPT (&gateway_accept.super.super)
 
 struct command *
 make_gateway_setup(struct command *listen);
 
-extern struct command_simple gateway_setup_command;
-#define GATEWAY_SETUP (&gateway_setup_command.super.super)
+extern struct command gateway_setup_command;
+#define GATEWAY_SETUP (&gateway_setup_command.super)
 
 #endif /* GATEWAY_COMMANDS_H_INCLUDED */