*** empty log message ***

Rev: src/channel.h:1.23
Rev: src/client.h:1.17

src/channel.h

@@ -9,6 +9,7 @@
 #include "alist.h"
 #include "connection.h"
 #include "parse.h"
+#include "server_pty.h"
 
 #define CLASS_DECLARE
 #include "channel.h.x"
@@ -47,6 +48,13 @@
        (send_window_size simple UINT32)
        (send_max_packet simple UINT32)
 
+       ; pty. This is needed by the server only. FIXME: Does it really
+       ; belong here?
+       (pty object pty_info)
+
+       ; Value of the TERM environment variable.
+       (term string)
+       
        ; FIXME: Perhaps this should be moved to the channel_table, and
        ; a pointer to that table be stored here instead?
        (write object abstract_write)
@@ -86,8 +94,7 @@
 
        ; Reply from SSH_MSG_CHANNEL_REQUEST 
        (channel_success method int)
-       (channel_failure method int)))
-*/
+       (channel_failure method int))) */
 
 #define CHANNEL_RECEIVE(s, t, d) \
 ((s)->receive((s), (t), (d)))
@@ -184,7 +191,7 @@
 #define CHANNEL_OPEN(o, c, a, e, m, d) \
 ((o)->handler((o), (c), (a), (e), (m), (d)))
 
-/* SSH_MSH_CHANNEL_REQUEST */
+/* SSH_MSG_CHANNEL_REQUEST */
 /* CLASS:
    (class
      (name channel_request)

src/client.h

@@ -29,6 +29,8 @@
 #include "io.h"
 #include "keyexchange.h"
 
+struct request_info;
+
 struct fd_callback *
 make_client_callback(struct io_backend *b,
 		     const char *comment,
@@ -52,8 +54,20 @@ struct channel_request *make_handle_exit_signal(int *exit_code);
 struct connection_startup *make_client_startup(struct io_fd *in,
 					       struct io_fd *out,
 					       struct io_fd *err,
-					       int final_request,
-					       struct lsh_string *args,
+					       struct request_info *requests,
 					       int *exit_status);
 
+struct request_info *make_shell_request(struct request_info *next);
+struct request_info *make_pty_request(int fd, int essential, int raw,
+				      struct request_info *next);
+
+#if 0
+struct lsh_object *make_channel_request(int request, struct lsh_string *args);
+
+
+#define request_shell() make_channel_request(ATOM_SHELL, ssh_format(""))
+#define request_pty(term, w, h, wp, hp, modes) \
+make_channel_request(ATOM_PTY_REQ, ssh_format("%z%i%i%i%i%fS", term, w, h, wp, hp, modes))
+#endif
+     
 #endif /* LSH_CLIENT_H_INCLUDED */