- markus@cvs.openbsd.org 2002/02/03 17:55:55

[openssh.git] / channels.h

diff --git a/channels.h b/channels.h
index 840268fcf85ac00a516fcfb52ec7992881ca857f..fa43b8ea69dae22c40306f9b7621b14d5659e7a9 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -10,7 +10,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 /*
- * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: channels.h,v 1.53 2001/11/29 21:10:51 stevesk Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.61 2002/02/03 17:55:55 markus Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
@@ -68,8 +68,8 @@ struct Channel {
        int     type;           /* channel type/state */
        int     self;           /* my own channel identifier */
        int     remote_id;      /* channel identifier for remote peer */
-       int     istate;         /* input from channel (state of receive half) */
-       int     ostate;         /* output to channel  (state of transmit half) */
+       u_int   istate;         /* input from channel (state of receive half) */
+       u_int   ostate;         /* output to channel  (state of transmit half) */
        int     flags;          /* close sent/rcvd */
        int     rfd;            /* read fd */
        int     wfd;            /* write fd */
@@ -96,6 +96,7 @@ struct Channel {
        int     local_consumed;
        int     local_maxpacket;
        int     extended_usage;
+       int     single_connection;
 
        char   *ctype;          /* type */
 
@@ -122,16 +123,16 @@ struct Channel {
 #define CHAN_X11_PACKET_DEFAULT        (CHAN_X11_WINDOW_DEFAULT/2)
 
 /* possible input states */
-#define CHAN_INPUT_OPEN                        0x01
-#define CHAN_INPUT_WAIT_DRAIN          0x02
-#define CHAN_INPUT_WAIT_OCLOSE         0x04
-#define CHAN_INPUT_CLOSED              0x08
+#define CHAN_INPUT_OPEN                        0
+#define CHAN_INPUT_WAIT_DRAIN          1
+#define CHAN_INPUT_WAIT_OCLOSE         2
+#define CHAN_INPUT_CLOSED              3
 
 /* possible output states */
-#define CHAN_OUTPUT_OPEN               0x10
-#define CHAN_OUTPUT_WAIT_DRAIN         0x20
-#define CHAN_OUTPUT_WAIT_IEOF          0x40
-#define CHAN_OUTPUT_CLOSED             0x80
+#define CHAN_OUTPUT_OPEN               0
+#define CHAN_OUTPUT_WAIT_DRAIN         1
+#define CHAN_OUTPUT_WAIT_IEOF          2
+#define CHAN_OUTPUT_CLOSED             3
 
 #define CHAN_CLOSE_SENT                        0x01
 #define CHAN_CLOSE_RCVD                        0x02
@@ -156,17 +157,16 @@ int        channel_close_fd(int *);
 
 /* protocol handler */
 
-void    channel_input_channel_request(int, int, void *);
-void    channel_input_close(int, int, void *);
-void    channel_input_close_confirmation(int, int, void *);
-void    channel_input_data(int, int, void *);
-void    channel_input_extended_data(int, int, void *);
-void    channel_input_ieof(int, int, void *);
-void    channel_input_oclose(int, int, void *);
-void    channel_input_open_confirmation(int, int, void *);
-void    channel_input_open_failure(int, int, void *);
-void    channel_input_port_open(int, int, void *);
-void    channel_input_window_adjust(int, int, void *);
+void    channel_input_close(int, u_int32_t, void *);
+void    channel_input_close_confirmation(int, u_int32_t, void *);
+void    channel_input_data(int, u_int32_t, void *);
+void    channel_input_extended_data(int, u_int32_t, void *);
+void    channel_input_ieof(int, u_int32_t, void *);
+void    channel_input_oclose(int, u_int32_t, void *);
+void    channel_input_open_confirmation(int, u_int32_t, void *);
+void    channel_input_open_failure(int, u_int32_t, void *);
+void    channel_input_port_open(int, u_int32_t, void *);
+void    channel_input_window_adjust(int, u_int32_t, void *);
 
 /* file descriptor handling (read/write) */
 
@@ -189,19 +189,16 @@ void     channel_input_port_forward_request(int, int);
 int     channel_connect_to(const char *, u_short);
 int     channel_connect_by_listen_address(u_short);
 void    channel_request_remote_forwarding(u_short, const char *, u_short);
-int     channel_request_local_forwarding(u_short, const char *, u_short, int);
-int
-channel_request_forwarding(const char *, u_short, const char *, u_short, int,
-    int);
+int     channel_setup_local_fwd_listener(u_short, const char *, u_short, int);
+int     channel_setup_remote_fwd_listener(const char *, u_short, int);
 
 /* x11 forwarding */
 
 int     x11_connect_display(void);
-int     x11_create_display_inet(int, int);
-void     x11_input_open(int, int, void *);
-void     x11_request_forwarding(void);
+int     x11_create_display_inet(int, int, int);
+void     x11_input_open(int, u_int32_t, void *);
 void    x11_request_forwarding_with_spoofing(int, const char *, const char *);
-void    deny_input_open(int, int, void *);
+void    deny_input_open(int, u_int32_t, void *);
 
 /* agent forwarding */
 
@@ -209,25 +206,21 @@ void       auth_request_forwarding(void);
 char   *auth_get_socket_name(void);
 void    auth_sock_cleanup_proc(void *);
 int     auth_input_request_forwarding(struct passwd *);
-void    auth_input_open_request(int, int, void *);
+void    auth_input_open_request(int, u_int32_t, void *);
 
 /* channel close */
 
 int     chan_is_dead(Channel *, int);
 void    chan_mark_dead(Channel *);
-void    chan_init_iostates(Channel *);
-void    chan_init(void);
 
-typedef void    chan_event_fn(Channel *);
+/* channel events */
 
-/* for the input state */
-extern chan_event_fn   *chan_rcvd_oclose;
-extern chan_event_fn   *chan_read_failed;
-extern chan_event_fn   *chan_ibuf_empty;
+void    chan_rcvd_oclose(Channel *);
+void    chan_read_failed(Channel *);
+void    chan_ibuf_empty(Channel *);
 
-/* for the output state */
-extern chan_event_fn   *chan_rcvd_ieof;
-extern chan_event_fn   *chan_write_failed;
-extern chan_event_fn   *chan_obuf_empty;
+void    chan_rcvd_ieof(Channel *);
+void    chan_write_failed(Channel *);
+void    chan_obuf_empty(Channel *);
 
 #endif